diff --git a/CHANGELOG.md b/roles/os_hardening/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to roles/os_hardening/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/roles/os_hardening/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to roles/os_hardening/CONTRIBUTING.md
diff --git a/README.md b/roles/os_hardening/README.md
similarity index 100%
rename from README.md
rename to roles/os_hardening/README.md
diff --git a/defaults/main.yml b/roles/os_hardening/defaults/main.yml
similarity index 100%
rename from defaults/main.yml
rename to roles/os_hardening/defaults/main.yml
diff --git a/handlers/main.yml b/roles/os_hardening/handlers/main.yml
similarity index 100%
rename from handlers/main.yml
rename to roles/os_hardening/handlers/main.yml
diff --git a/meta/main.yml b/roles/os_hardening/meta/main.yml
similarity index 100%
rename from meta/main.yml
rename to roles/os_hardening/meta/main.yml
diff --git a/tasks/apt.yml b/roles/os_hardening/tasks/apt.yml
similarity index 100%
rename from tasks/apt.yml
rename to roles/os_hardening/tasks/apt.yml
diff --git a/tasks/auditd.yml b/roles/os_hardening/tasks/auditd.yml
similarity index 100%
rename from tasks/auditd.yml
rename to roles/os_hardening/tasks/auditd.yml
diff --git a/tasks/hardening.yml b/roles/os_hardening/tasks/hardening.yml
similarity index 100%
rename from tasks/hardening.yml
rename to roles/os_hardening/tasks/hardening.yml
diff --git a/tasks/limits.yml b/roles/os_hardening/tasks/limits.yml
similarity index 100%
rename from tasks/limits.yml
rename to roles/os_hardening/tasks/limits.yml
diff --git a/tasks/login_defs.yml b/roles/os_hardening/tasks/login_defs.yml
similarity index 100%
rename from tasks/login_defs.yml
rename to roles/os_hardening/tasks/login_defs.yml
diff --git a/tasks/main.yml b/roles/os_hardening/tasks/main.yml
similarity index 100%
rename from tasks/main.yml
rename to roles/os_hardening/tasks/main.yml
diff --git a/tasks/minimize_access.yml b/roles/os_hardening/tasks/minimize_access.yml
similarity index 100%
rename from tasks/minimize_access.yml
rename to roles/os_hardening/tasks/minimize_access.yml
diff --git a/tasks/modprobe.yml b/roles/os_hardening/tasks/modprobe.yml
similarity index 100%
rename from tasks/modprobe.yml
rename to roles/os_hardening/tasks/modprobe.yml
diff --git a/tasks/pam.yml b/roles/os_hardening/tasks/pam.yml
similarity index 100%
rename from tasks/pam.yml
rename to roles/os_hardening/tasks/pam.yml
diff --git a/tasks/profile.yml b/roles/os_hardening/tasks/profile.yml
similarity index 100%
rename from tasks/profile.yml
rename to roles/os_hardening/tasks/profile.yml
diff --git a/tasks/rhosts.yml b/roles/os_hardening/tasks/rhosts.yml
similarity index 100%
rename from tasks/rhosts.yml
rename to roles/os_hardening/tasks/rhosts.yml
diff --git a/tasks/securetty.yml b/roles/os_hardening/tasks/securetty.yml
similarity index 100%
rename from tasks/securetty.yml
rename to roles/os_hardening/tasks/securetty.yml
diff --git a/tasks/selinux.yml b/roles/os_hardening/tasks/selinux.yml
similarity index 100%
rename from tasks/selinux.yml
rename to roles/os_hardening/tasks/selinux.yml
diff --git a/tasks/suid_sgid.yml b/roles/os_hardening/tasks/suid_sgid.yml
similarity index 100%
rename from tasks/suid_sgid.yml
rename to roles/os_hardening/tasks/suid_sgid.yml
diff --git a/tasks/sysctl.yml b/roles/os_hardening/tasks/sysctl.yml
similarity index 100%
rename from tasks/sysctl.yml
rename to roles/os_hardening/tasks/sysctl.yml
diff --git a/tasks/user_accounts.yml b/roles/os_hardening/tasks/user_accounts.yml
similarity index 100%
rename from tasks/user_accounts.yml
rename to roles/os_hardening/tasks/user_accounts.yml
diff --git a/tasks/yum.yml b/roles/os_hardening/tasks/yum.yml
similarity index 100%
rename from tasks/yum.yml
rename to roles/os_hardening/tasks/yum.yml
diff --git a/templates/etc/audit/auditd.conf.j2 b/roles/os_hardening/templates/etc/audit/auditd.conf.j2
similarity index 100%
rename from templates/etc/audit/auditd.conf.j2
rename to roles/os_hardening/templates/etc/audit/auditd.conf.j2
diff --git a/templates/etc/default/ufw.j2 b/roles/os_hardening/templates/etc/default/ufw.j2
similarity index 100%
rename from templates/etc/default/ufw.j2
rename to roles/os_hardening/templates/etc/default/ufw.j2
diff --git a/templates/etc/initramfs-tools/modules.j2 b/roles/os_hardening/templates/etc/initramfs-tools/modules.j2
similarity index 100%
rename from templates/etc/initramfs-tools/modules.j2
rename to roles/os_hardening/templates/etc/initramfs-tools/modules.j2
diff --git a/templates/etc/libuser.conf.j2 b/roles/os_hardening/templates/etc/libuser.conf.j2
similarity index 100%
rename from templates/etc/libuser.conf.j2
rename to roles/os_hardening/templates/etc/libuser.conf.j2
diff --git a/templates/etc/login.defs.j2 b/roles/os_hardening/templates/etc/login.defs.j2
similarity index 100%
rename from templates/etc/login.defs.j2
rename to roles/os_hardening/templates/etc/login.defs.j2
diff --git a/templates/etc/modprobe.d/modprobe.j2 b/roles/os_hardening/templates/etc/modprobe.d/modprobe.j2
similarity index 100%
rename from templates/etc/modprobe.d/modprobe.j2
rename to roles/os_hardening/templates/etc/modprobe.d/modprobe.j2
diff --git a/templates/etc/pam.d/rhel_system_auth.j2 b/roles/os_hardening/templates/etc/pam.d/rhel_system_auth.j2
similarity index 100%
rename from templates/etc/pam.d/rhel_system_auth.j2
rename to roles/os_hardening/templates/etc/pam.d/rhel_system_auth.j2
diff --git a/templates/etc/profile.d/profile.conf.j2 b/roles/os_hardening/templates/etc/profile.d/profile.conf.j2
similarity index 100%
rename from templates/etc/profile.d/profile.conf.j2
rename to roles/os_hardening/templates/etc/profile.d/profile.conf.j2
diff --git a/templates/etc/securetty.j2 b/roles/os_hardening/templates/etc/securetty.j2
similarity index 100%
rename from templates/etc/securetty.j2
rename to roles/os_hardening/templates/etc/securetty.j2
diff --git a/templates/etc/sysconfig/rhel_sysconfig_init.j2 b/roles/os_hardening/templates/etc/sysconfig/rhel_sysconfig_init.j2
similarity index 100%
rename from templates/etc/sysconfig/rhel_sysconfig_init.j2
rename to roles/os_hardening/templates/etc/sysconfig/rhel_sysconfig_init.j2
diff --git a/templates/usr/share/pam-configs/pam_passwdqd.j2 b/roles/os_hardening/templates/usr/share/pam-configs/pam_passwdqd.j2
similarity index 100%
rename from templates/usr/share/pam-configs/pam_passwdqd.j2
rename to roles/os_hardening/templates/usr/share/pam-configs/pam_passwdqd.j2
diff --git a/templates/usr/share/pam-configs/pam_tally2.j2 b/roles/os_hardening/templates/usr/share/pam-configs/pam_tally2.j2
similarity index 100%
rename from templates/usr/share/pam-configs/pam_tally2.j2
rename to roles/os_hardening/templates/usr/share/pam-configs/pam_tally2.j2
diff --git a/tests/test.yml b/roles/os_hardening/tests/test.yml
similarity index 100%
rename from tests/test.yml
rename to roles/os_hardening/tests/test.yml
diff --git a/vars/Amazon.yml b/roles/os_hardening/vars/Amazon.yml
similarity index 100%
rename from vars/Amazon.yml
rename to roles/os_hardening/vars/Amazon.yml
diff --git a/vars/Archlinux.yml b/roles/os_hardening/vars/Archlinux.yml
similarity index 100%
rename from vars/Archlinux.yml
rename to roles/os_hardening/vars/Archlinux.yml
diff --git a/vars/Debian.yml b/roles/os_hardening/vars/Debian.yml
similarity index 100%
rename from vars/Debian.yml
rename to roles/os_hardening/vars/Debian.yml
diff --git a/vars/Fedora.yml b/roles/os_hardening/vars/Fedora.yml
similarity index 100%
rename from vars/Fedora.yml
rename to roles/os_hardening/vars/Fedora.yml
diff --git a/vars/Oracle Linux.yml b/roles/os_hardening/vars/Oracle Linux.yml
similarity index 100%
rename from vars/Oracle Linux.yml
rename to roles/os_hardening/vars/Oracle Linux.yml
diff --git a/vars/RedHat-6.yml b/roles/os_hardening/vars/RedHat-6.yml
similarity index 100%
rename from vars/RedHat-6.yml
rename to roles/os_hardening/vars/RedHat-6.yml
diff --git a/vars/RedHat.yml b/roles/os_hardening/vars/RedHat.yml
similarity index 100%
rename from vars/RedHat.yml
rename to roles/os_hardening/vars/RedHat.yml
diff --git a/vars/Suse.yml b/roles/os_hardening/vars/Suse.yml
similarity index 100%
rename from vars/Suse.yml
rename to roles/os_hardening/vars/Suse.yml
diff --git a/vars/main.yml b/roles/os_hardening/vars/main.yml
similarity index 100%
rename from vars/main.yml
rename to roles/os_hardening/vars/main.yml