--- a/.hgignore
+++ b/.hgignore
@@ -10,9 +10,9 @@ venv/
 \.pyo$
 \.swp$
 \.t.err$
 ~$
 \.vagrant/*
 \.dockerstate$
 \.vctnode$
 \.testtimes$
-autoland-ansible/secrets/
+ansible/secrets/

rename from autoland-ansible/ansible.cfg
rename to ansible/ansible.cfg

rename from autoland-ansible/autoland-ec2-provision.yml
rename to ansible/autoland-ec2-provision.yml

rename from autoland-ansible/autoland-seed-secrets.yml
rename to ansible/autoland-seed-secrets.yml

rename from autoland-ansible/host_vars/autoland-dev.allizom.org.yml
rename to ansible/host_vars/autoland-dev.allizom.org.yml

rename from autoland-ansible/hosts_autoland_dev
rename to ansible/hosts_autoland_dev

rename from autoland-ansible/roles/apache/files/httpd.conf
rename to ansible/roles/apache/files/httpd.conf

rename from autoland-ansible/roles/apache/handlers/main.yml
rename to ansible/roles/apache/handlers/main.yml

rename from autoland-ansible/roles/apache/meta/main.yml
rename to ansible/roles/apache/meta/main.yml

rename from autoland-ansible/roles/apache/tasks/main.yml
rename to ansible/roles/apache/tasks/main.yml

rename from autoland-ansible/roles/apache/tasks/packages.yml
rename to ansible/roles/apache/tasks/packages.yml

rename from autoland-ansible/roles/autoland/defaults/main.yml
rename to ansible/roles/autoland/defaults/main.yml

rename from autoland-ansible/roles/autoland/files/peep.py
rename to ansible/roles/autoland/files/peep.py

rename from autoland-ansible/roles/autoland/handlers/main.yml
rename to ansible/roles/autoland/handlers/main.yml

rename from autoland-ansible/roles/autoland/meta/main.yml
rename to ansible/roles/autoland/meta/main.yml

rename from autoland-ansible/roles/autoland/tasks/main.yml
rename to ansible/roles/autoland/tasks/main.yml

rename from autoland-ansible/roles/autoland/tasks/packages.yml
rename to ansible/roles/autoland/tasks/packages.yml

rename from autoland-ansible/roles/autoland/tasks/repos.yml
rename to ansible/roles/autoland/tasks/repos.yml

rename from autoland-ansible/roles/autoland/tasks/ssh.yml
rename to ansible/roles/autoland/tasks/ssh.yml

rename from autoland-ansible/roles/autoland/templates/config.json.j2
rename to ansible/roles/autoland/templates/config.json.j2

rename from autoland-ansible/roles/autoland/templates/ssh_config.j2
rename to ansible/roles/autoland/templates/ssh_config.j2

rename from autoland-ansible/roles/common/defaults/main.yml
rename to ansible/roles/common/defaults/main.yml

rename from autoland-ansible/roles/common/meta/main.yml
rename to ansible/roles/common/meta/main.yml

rename from autoland-ansible/roles/common/tasks/custom_packages.yml
rename to ansible/roles/common/tasks/custom_packages.yml

rename from autoland-ansible/roles/common/tasks/main.yml
rename to ansible/roles/common/tasks/main.yml

rename from autoland-ansible/roles/common/tasks/yum_epel_update.yml
rename to ansible/roles/common/tasks/yum_epel_update.yml

rename from autoland-ansible/roles/nrpe/files/nrpe.cfg
rename to ansible/roles/nrpe/files/nrpe.cfg

rename from autoland-ansible/roles/nrpe/files/nrpe_commands.cfg
rename to ansible/roles/nrpe/files/nrpe_commands.cfg

rename from autoland-ansible/roles/nrpe/files/plugins/README.md
rename to ansible/roles/nrpe/files/plugins/README.md

rename from autoland-ansible/roles/nrpe/handlers/main.yml
rename to ansible/roles/nrpe/handlers/main.yml

rename from autoland-ansible/roles/nrpe/meta/main.yml
rename to ansible/roles/nrpe/meta/main.yml

rename from autoland-ansible/roles/nrpe/tasks/main.yml
rename to ansible/roles/nrpe/tasks/main.yml

rename from autoland-ansible/roles/nrpe/tasks/packages.yml
rename to ansible/roles/nrpe/tasks/packages.yml

rename from autoland-ansible/roles/seed_secrets/meta/main.yml
rename to ansible/roles/seed_secrets/meta/main.yml

rename from autoland-ansible/roles/seed_secrets/tasks/main.yml
rename to ansible/roles/seed_secrets/tasks/main.yml