diff --git a/installer/check_vars/tasks/check_docker.yml b/installer/roles/check_vars/tasks/check_docker.yml
similarity index 100%
rename from installer/check_vars/tasks/check_docker.yml
rename to installer/roles/check_vars/tasks/check_docker.yml
diff --git a/installer/check_vars/tasks/check_openshift.yml b/installer/roles/check_vars/tasks/check_openshift.yml
similarity index 100%
rename from installer/check_vars/tasks/check_openshift.yml
rename to installer/roles/check_vars/tasks/check_openshift.yml
diff --git a/installer/check_vars/tasks/main.yml b/installer/roles/check_vars/tasks/main.yml
similarity index 100%
rename from installer/check_vars/tasks/main.yml
rename to installer/roles/check_vars/tasks/main.yml
diff --git a/installer/image_build/files/Dockerfile.sdist b/installer/roles/image_build/files/Dockerfile.sdist
similarity index 100%
rename from installer/image_build/files/Dockerfile.sdist
rename to installer/roles/image_build/files/Dockerfile.sdist
diff --git a/installer/image_build/files/RPM-GPG-KEY-ansible-release b/installer/roles/image_build/files/RPM-GPG-KEY-ansible-release
similarity index 100%
rename from installer/image_build/files/RPM-GPG-KEY-ansible-release
rename to installer/roles/image_build/files/RPM-GPG-KEY-ansible-release
diff --git a/installer/image_build/files/ansible.repo b/installer/roles/image_build/files/ansible.repo
similarity index 100%
rename from installer/image_build/files/ansible.repo
rename to installer/roles/image_build/files/ansible.repo
diff --git a/installer/image_build/files/launch_awx.sh b/installer/roles/image_build/files/launch_awx.sh
similarity index 100%
rename from installer/image_build/files/launch_awx.sh
rename to installer/roles/image_build/files/launch_awx.sh
diff --git a/installer/image_build/files/launch_awx_task.sh b/installer/roles/image_build/files/launch_awx_task.sh
similarity index 100%
rename from installer/image_build/files/launch_awx_task.sh
rename to installer/roles/image_build/files/launch_awx_task.sh
diff --git a/installer/image_build/files/nginx.conf b/installer/roles/image_build/files/nginx.conf
similarity index 100%
rename from installer/image_build/files/nginx.conf
rename to installer/roles/image_build/files/nginx.conf
diff --git a/installer/image_build/files/settings.py b/installer/roles/image_build/files/settings.py
similarity index 100%
rename from installer/image_build/files/settings.py
rename to installer/roles/image_build/files/settings.py
diff --git a/installer/image_build/files/supervisor.conf b/installer/roles/image_build/files/supervisor.conf
similarity index 100%
rename from installer/image_build/files/supervisor.conf
rename to installer/roles/image_build/files/supervisor.conf
diff --git a/installer/image_build/files/supervisor_task.conf b/installer/roles/image_build/files/supervisor_task.conf
similarity index 100%
rename from installer/image_build/files/supervisor_task.conf
rename to installer/roles/image_build/files/supervisor_task.conf
diff --git a/installer/image_build/tasks/main.yml b/installer/roles/image_build/tasks/main.yml
similarity index 100%
rename from installer/image_build/tasks/main.yml
rename to installer/roles/image_build/tasks/main.yml
diff --git a/installer/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2
similarity index 100%
rename from installer/image_build/templates/Dockerfile.j2
rename to installer/roles/image_build/templates/Dockerfile.j2
diff --git a/installer/image_build/templates/Dockerfile.task.j2 b/installer/roles/image_build/templates/Dockerfile.task.j2
similarity index 100%
rename from installer/image_build/templates/Dockerfile.task.j2
rename to installer/roles/image_build/templates/Dockerfile.task.j2
diff --git a/installer/image_push/tasks/main.yml b/installer/roles/image_push/tasks/main.yml
similarity index 100%
rename from installer/image_push/tasks/main.yml
rename to installer/roles/image_push/tasks/main.yml
diff --git a/installer/kubernetes/defaults/main.yml b/installer/roles/kubernetes/defaults/main.yml
similarity index 100%
rename from installer/kubernetes/defaults/main.yml
rename to installer/roles/kubernetes/defaults/main.yml
diff --git a/installer/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml
similarity index 100%
rename from installer/kubernetes/tasks/main.yml
rename to installer/roles/kubernetes/tasks/main.yml
diff --git a/installer/kubernetes/templates/configmap.yml.j2 b/installer/roles/kubernetes/templates/configmap.yml.j2
similarity index 100%
rename from installer/kubernetes/templates/configmap.yml.j2
rename to installer/roles/kubernetes/templates/configmap.yml.j2
diff --git a/installer/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2
similarity index 100%
rename from installer/kubernetes/templates/deployment.yml.j2
rename to installer/roles/kubernetes/templates/deployment.yml.j2
diff --git a/installer/kubernetes/templates/etcd.yml.j2 b/installer/roles/kubernetes/templates/etcd.yml.j2
similarity index 100%
rename from installer/kubernetes/templates/etcd.yml.j2
rename to installer/roles/kubernetes/templates/etcd.yml.j2
diff --git a/installer/local_docker/tasks/compose.yml b/installer/roles/local_docker/tasks/compose.yml
similarity index 100%
rename from installer/local_docker/tasks/compose.yml
rename to installer/roles/local_docker/tasks/compose.yml
diff --git a/installer/local_docker/tasks/main.yml b/installer/roles/local_docker/tasks/main.yml
similarity index 100%
rename from installer/local_docker/tasks/main.yml
rename to installer/roles/local_docker/tasks/main.yml
diff --git a/installer/local_docker/tasks/set_image.yml b/installer/roles/local_docker/tasks/set_image.yml
similarity index 100%
rename from installer/local_docker/tasks/set_image.yml
rename to installer/roles/local_docker/tasks/set_image.yml
diff --git a/installer/local_docker/tasks/standalone.yml b/installer/roles/local_docker/tasks/standalone.yml
similarity index 100%
rename from installer/local_docker/tasks/standalone.yml
rename to installer/roles/local_docker/tasks/standalone.yml
diff --git a/installer/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2
similarity index 100%
rename from installer/local_docker/templates/docker-compose.yml.j2
rename to installer/roles/local_docker/templates/docker-compose.yml.j2
diff --git a/installer/openshift/config/namespace.yml b/installer/roles/openshift/config/namespace.yml
similarity index 100%
rename from installer/openshift/config/namespace.yml
rename to installer/roles/openshift/config/namespace.yml
diff --git a/installer/openshift/defaults/main.yml b/installer/roles/openshift/defaults/main.yml
similarity index 100%
rename from installer/openshift/defaults/main.yml
rename to installer/roles/openshift/defaults/main.yml
diff --git a/installer/openshift/tasks/main.yml b/installer/roles/openshift/tasks/main.yml
similarity index 100%
rename from installer/openshift/tasks/main.yml
rename to installer/roles/openshift/tasks/main.yml
diff --git a/installer/openshift/templates/configmap.yml.j2 b/installer/roles/openshift/templates/configmap.yml.j2
similarity index 100%
rename from installer/openshift/templates/configmap.yml.j2
rename to installer/roles/openshift/templates/configmap.yml.j2
diff --git a/installer/openshift/templates/deployment.yml.j2 b/installer/roles/openshift/templates/deployment.yml.j2
similarity index 100%
rename from installer/openshift/templates/deployment.yml.j2
rename to installer/roles/openshift/templates/deployment.yml.j2
diff --git a/installer/openshift/templates/etcd.yml.j2 b/installer/roles/openshift/templates/etcd.yml.j2
similarity index 100%
rename from installer/openshift/templates/etcd.yml.j2
rename to installer/roles/openshift/templates/etcd.yml.j2