diff --git a/Gemfile b/benchmark/Gemfile
similarity index 100%
rename from Gemfile
rename to benchmark/Gemfile
diff --git a/Rakefile b/benchmark/Rakefile
similarity index 100%
rename from Rakefile
rename to benchmark/Rakefile
diff --git a/controls/1_1_filesystem_configuration.rb b/benchmark/controls/1_1_filesystem_configuration.rb
similarity index 100%
rename from controls/1_1_filesystem_configuration.rb
rename to benchmark/controls/1_1_filesystem_configuration.rb
diff --git a/controls/1_2_configure_software_updates.rb b/benchmark/controls/1_2_configure_software_updates.rb
similarity index 100%
rename from controls/1_2_configure_software_updates.rb
rename to benchmark/controls/1_2_configure_software_updates.rb
diff --git a/controls/1_3_filesystem_integrity_checking.rb b/benchmark/controls/1_3_filesystem_integrity_checking.rb
similarity index 100%
rename from controls/1_3_filesystem_integrity_checking.rb
rename to benchmark/controls/1_3_filesystem_integrity_checking.rb
diff --git a/controls/1_4_secure_boot_settings.rb b/benchmark/controls/1_4_secure_boot_settings.rb
similarity index 100%
rename from controls/1_4_secure_boot_settings.rb
rename to benchmark/controls/1_4_secure_boot_settings.rb
diff --git a/controls/1_5_additional_process_hardening.rb b/benchmark/controls/1_5_additional_process_hardening.rb
similarity index 100%
rename from controls/1_5_additional_process_hardening.rb
rename to benchmark/controls/1_5_additional_process_hardening.rb
diff --git a/controls/1_6_mandatory_access_control.rb b/benchmark/controls/1_6_mandatory_access_control.rb
similarity index 100%
rename from controls/1_6_mandatory_access_control.rb
rename to benchmark/controls/1_6_mandatory_access_control.rb
diff --git a/controls/1_7_warning_banners.rb b/benchmark/controls/1_7_warning_banners.rb
similarity index 100%
rename from controls/1_7_warning_banners.rb
rename to benchmark/controls/1_7_warning_banners.rb
diff --git a/controls/1_8_ensure_patches.rb b/benchmark/controls/1_8_ensure_patches.rb
similarity index 100%
rename from controls/1_8_ensure_patches.rb
rename to benchmark/controls/1_8_ensure_patches.rb
diff --git a/controls/2_1_inetd_services.rb b/benchmark/controls/2_1_inetd_services.rb
similarity index 100%
rename from controls/2_1_inetd_services.rb
rename to benchmark/controls/2_1_inetd_services.rb
diff --git a/controls/2_2_special_purpose_services.rb b/benchmark/controls/2_2_special_purpose_services.rb
similarity index 100%
rename from controls/2_2_special_purpose_services.rb
rename to benchmark/controls/2_2_special_purpose_services.rb
diff --git a/controls/2_3_service_clients.rb b/benchmark/controls/2_3_service_clients.rb
similarity index 100%
rename from controls/2_3_service_clients.rb
rename to benchmark/controls/2_3_service_clients.rb
diff --git a/controls/3_1_network_parameters_host_only.rb b/benchmark/controls/3_1_network_parameters_host_only.rb
similarity index 100%
rename from controls/3_1_network_parameters_host_only.rb
rename to benchmark/controls/3_1_network_parameters_host_only.rb
diff --git a/controls/3_2_network_parameters_host_and_router.rb b/benchmark/controls/3_2_network_parameters_host_and_router.rb
similarity index 100%
rename from controls/3_2_network_parameters_host_and_router.rb
rename to benchmark/controls/3_2_network_parameters_host_and_router.rb
diff --git a/controls/3_3_tcp_wrappers.rb b/benchmark/controls/3_3_tcp_wrappers.rb
similarity index 100%
rename from controls/3_3_tcp_wrappers.rb
rename to benchmark/controls/3_3_tcp_wrappers.rb
diff --git a/controls/3_4_uncommon_network_protocols.rb b/benchmark/controls/3_4_uncommon_network_protocols.rb
similarity index 100%
rename from controls/3_4_uncommon_network_protocols.rb
rename to benchmark/controls/3_4_uncommon_network_protocols.rb
diff --git a/controls/3_5_firewall_configuration.rb b/benchmark/controls/3_5_firewall_configuration.rb
similarity index 100%
rename from controls/3_5_firewall_configuration.rb
rename to benchmark/controls/3_5_firewall_configuration.rb
diff --git a/controls/3_6_wireless_interfaces.rb b/benchmark/controls/3_6_wireless_interfaces.rb
similarity index 100%
rename from controls/3_6_wireless_interfaces.rb
rename to benchmark/controls/3_6_wireless_interfaces.rb
diff --git a/controls/3_7_disable_ipv6.rb b/benchmark/controls/3_7_disable_ipv6.rb
similarity index 100%
rename from controls/3_7_disable_ipv6.rb
rename to benchmark/controls/3_7_disable_ipv6.rb
diff --git a/controls/4_1_configure_system_accounting_auditd.rb b/benchmark/controls/4_1_configure_system_accounting_auditd.rb
similarity index 100%
rename from controls/4_1_configure_system_accounting_auditd.rb
rename to benchmark/controls/4_1_configure_system_accounting_auditd.rb
diff --git a/controls/4_2_configure_logging.rb b/benchmark/controls/4_2_configure_logging.rb
similarity index 100%
rename from controls/4_2_configure_logging.rb
rename to benchmark/controls/4_2_configure_logging.rb
diff --git a/controls/5_1_configure_cron.rb b/benchmark/controls/5_1_configure_cron.rb
similarity index 100%
rename from controls/5_1_configure_cron.rb
rename to benchmark/controls/5_1_configure_cron.rb
diff --git a/controls/5_2_ssh_server_configuration.rb b/benchmark/controls/5_2_ssh_server_configuration.rb
similarity index 100%
rename from controls/5_2_ssh_server_configuration.rb
rename to benchmark/controls/5_2_ssh_server_configuration.rb
diff --git a/controls/5_3_configure_pam.rb b/benchmark/controls/5_3_configure_pam.rb
similarity index 100%
rename from controls/5_3_configure_pam.rb
rename to benchmark/controls/5_3_configure_pam.rb
diff --git a/controls/5_4_user_accounts_and_environments.rb b/benchmark/controls/5_4_user_accounts_and_environments.rb
similarity index 100%
rename from controls/5_4_user_accounts_and_environments.rb
rename to benchmark/controls/5_4_user_accounts_and_environments.rb
diff --git a/controls/6_1_system_file_permissions.rb b/benchmark/controls/6_1_system_file_permissions.rb
similarity index 100%
rename from controls/6_1_system_file_permissions.rb
rename to benchmark/controls/6_1_system_file_permissions.rb
diff --git a/controls/6_2_user_and_group_settings.rb b/benchmark/controls/6_2_user_and_group_settings.rb
similarity index 100%
rename from controls/6_2_user_and_group_settings.rb
rename to benchmark/controls/6_2_user_and_group_settings.rb
diff --git a/inspec.yml b/benchmark/inspec.yml
similarity index 100%
rename from inspec.yml
rename to benchmark/inspec.yml
diff --git a/libraries/grubconf.rb b/benchmark/libraries/grubconf.rb
similarity index 100%
rename from libraries/grubconf.rb
rename to benchmark/libraries/grubconf.rb