diff --git a/ansible-centos72-aio.cfg b/1601-centos72-aio.cfg
similarity index 92%
copy from ansible-centos72-aio.cfg
copy to 1601-centos72-aio.cfg
index fedc6c0..a199816 100644
--- a/ansible-centos72-aio.cfg
+++ b/1601-centos72-aio.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/centos72-aio/
+hostfile = ~/.ansible/inventory/aws/1601-centos72-aio/
 forks = 50
 remote_user = centos
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-centos72-aio.cfg b/1601-centos72-dc1.cfg
similarity index 92%
rename from ansible-centos72-aio.cfg
rename to 1601-centos72-dc1.cfg
index fedc6c0..b7e822b 100644
--- a/ansible-centos72-aio.cfg
+++ b/1601-centos72-dc1.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/centos72-aio/
+hostfile = ~/.ansible/inventory/aws/1601-centos72-dc1/
 forks = 50
 remote_user = centos
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-oraclelinux68-dc2.cfg b/1601-oraclelinux68-aio.cfg
similarity index 92%
copy from ansible-oraclelinux68-dc2.cfg
copy to 1601-oraclelinux68-aio.cfg
index 084a1df..618590e 100644
--- a/ansible-oraclelinux68-dc2.cfg
+++ b/1601-oraclelinux68-aio.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc2/
+hostfile = ~/.ansible/inventory/aws/1601-oraclelinux68-aio/
 forks = 50
 remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-oraclelinux68-dc2-public-roles.cfg b/1601-oraclelinux68-dc1-2-ms-public-roles.cfg
similarity index 91%
copy from ansible-oraclelinux68-dc2-public-roles.cfg
copy to 1601-oraclelinux68-dc1-2-ms-public-roles.cfg
index d86650d..cec9db4 100644
--- a/ansible-oraclelinux68-dc2-public-roles.cfg
+++ b/1601-oraclelinux68-dc1-2-ms-public-roles.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc2/
+hostfile = ~/.ansible/inventory/aws/1601-oraclelinux68-dc1-2-ms/
 forks = 50
 remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-oraclelinux68-dc2-public-roles.cfg b/1601-oraclelinux68-dc1-public-roles.cfg
similarity index 92%
copy from ansible-oraclelinux68-dc2-public-roles.cfg
copy to 1601-oraclelinux68-dc1-public-roles.cfg
index d86650d..ec7f1a9 100644
--- a/ansible-oraclelinux68-dc2-public-roles.cfg
+++ b/1601-oraclelinux68-dc1-public-roles.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc2/
+hostfile = ~/.ansible/inventory/aws/1601-oraclelinux68-dc1/
 forks = 50
 remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-oraclelinux68-dc2.cfg b/1601-oraclelinux68-dc1.cfg
similarity index 92%
copy from ansible-oraclelinux68-dc2.cfg
copy to 1601-oraclelinux68-dc1.cfg
index 084a1df..74f86df 100644
--- a/ansible-oraclelinux68-dc2.cfg
+++ b/1601-oraclelinux68-dc1.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc2/
+hostfile = ~/.ansible/inventory/aws/1601-oraclelinux68-dc1/
 forks = 50
 remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-oraclelinux68-dc2-public-roles.cfg b/1601-oraclelinux68-dc2-2-ms-public-roles.cfg
similarity index 91%
copy from ansible-oraclelinux68-dc2-public-roles.cfg
copy to 1601-oraclelinux68-dc2-2-ms-public-roles.cfg
index d86650d..e0e4b00 100644
--- a/ansible-oraclelinux68-dc2-public-roles.cfg
+++ b/1601-oraclelinux68-dc2-2-ms-public-roles.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc2/
+hostfile = ~/.ansible/inventory/aws/1601-oraclelinux68-dc2-2-ms/
 forks = 50
 remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-oraclelinux68-dc2-public-roles.cfg b/1601-oraclelinux68-dc2-public-roles.cfg
similarity index 92%
rename from ansible-oraclelinux68-dc2-public-roles.cfg
rename to 1601-oraclelinux68-dc2-public-roles.cfg
index d86650d..2d5fa85 100644
--- a/ansible-oraclelinux68-dc2-public-roles.cfg
+++ b/1601-oraclelinux68-dc2-public-roles.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc2/
+hostfile = ~/.ansible/inventory/aws/1601-oraclelinux68-dc2/
 forks = 50
 remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-oraclelinux68-dc2.cfg b/1601-oraclelinux68-dc2.cfg
similarity index 92%
rename from ansible-oraclelinux68-dc2.cfg
rename to 1601-oraclelinux68-dc2.cfg
index 084a1df..caaf21e 100644
--- a/ansible-oraclelinux68-dc2.cfg
+++ b/1601-oraclelinux68-dc2.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc2/
+hostfile = ~/.ansible/inventory/aws/1601-oraclelinux68-dc2/
 forks = 50
 remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-oraclelinux68-dc2-public-roles.cfg b/1609-oraclelinux68-dc1-public-roles.cfg
similarity index 92%
copy from ansible-oraclelinux68-dc2-public-roles.cfg
copy to 1609-oraclelinux68-dc1-public-roles.cfg
index d86650d..0de6262 100644
--- a/ansible-oraclelinux68-dc2-public-roles.cfg
+++ b/1609-oraclelinux68-dc1-public-roles.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc2/
+hostfile = ~/.ansible/inventory/aws/1609-oraclelinux68-dc3/
 forks = 50
 remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-oraclelinux68-dc2-public-roles.cfg b/1609-oraclelinux68-dc2-public-roles.cfg
similarity index 92%
copy from ansible-oraclelinux68-dc2-public-roles.cfg
copy to 1609-oraclelinux68-dc2-public-roles.cfg
index d86650d..0de6262 100644
--- a/ansible-oraclelinux68-dc2-public-roles.cfg
+++ b/1609-oraclelinux68-dc2-public-roles.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc2/
+hostfile = ~/.ansible/inventory/aws/1609-oraclelinux68-dc3/
 forks = 50
 remote_user = ec2-user
 private_key_file = ~/.ssh/id_rsa
diff --git a/ansible-centos72-dc1.cfg b/ansible-centos72-dc1.cfg
deleted file mode 100644
index 459a088..0000000
--- a/ansible-centos72-dc1.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-[defaults]
-host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/centos72-dc1/
-forks = 50
-remote_user = centos
-private_key_file = ~/.ssh/id_rsa
-roles_path = ~/apigee-workspace/opdk-workspace/archives/apigee-opdk-playbooks
-log_path = ~/.ansible/tmp/ansible.log
-retry_files_enabled = False
-executable = /bin/bash
-gathering = smart
-fact_caching = jsonfile
-fact_caching_connection = ~/.ansible/tmp/cache
-
-# library = ~/.ansible/library/
-
-# 2 hour timeout
-fact_caching_timeout = 7200
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
diff --git a/ansible-oraclelinux68-aio.cfg b/ansible-oraclelinux68-aio.cfg
deleted file mode 100644
index 80366a9..0000000
--- a/ansible-oraclelinux68-aio.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[defaults]
-host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-aio/
-forks = 50
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-roles_path = ~/apigee-workspace/opdk-workspace/archives/apigee-opdk-playbooks
-log_path = ~/.ansible/tmp/ansible.log
-retry_files_enabled = False
-executable = /bin/bash
-gathering = smart
-fact_caching = jsonfile
-fact_caching_connection = ~/.ansible/tmp/cache
-local_tmp = ~/.ansible/tmp
-module_name = shell
-
-# library = ~/.ansible/library/
-
-# 2 hour timeout
-fact_caching_timeout = 7200
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
diff --git a/ansible-oraclelinux68-dc1-public-roles.cfg b/ansible-oraclelinux68-dc1-public-roles.cfg
deleted file mode 100644
index 3f424ee..0000000
--- a/ansible-oraclelinux68-dc1-public-roles.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[defaults]
-host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc1/
-forks = 50
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-roles_path = ~/.ansible/roles
-log_path = ~/.ansible/tmp/ansible.log
-retry_files_enabled = False
-executable = /bin/bash
-gathering = smart
-fact_caching = jsonfile
-fact_caching_connection = ~/.ansible/tmp/cache
-local_tmp = ~/.ansible/tmp
-module_name = shell
-
-# library = ~/.ansible/library/
-
-# 2 hour timeout
-fact_caching_timeout = 7200
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
diff --git a/ansible-oraclelinux68-dc1.cfg b/ansible-oraclelinux68-dc1.cfg
deleted file mode 100644
index ee4830e..0000000
--- a/ansible-oraclelinux68-dc1.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[defaults]
-host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc1/
-forks = 50
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-roles_path = ~/apigee-workspace/opdk-workspace/archives/apigee-opdk-playbooks
-log_path = ~/.ansible/tmp/ansible.log
-retry_files_enabled = False
-executable = /bin/bash
-gathering = smart
-fact_caching = jsonfile
-fact_caching_connection = ~/.ansible/tmp/cache
-local_tmp = ~/.ansible/tmp
-module_name = shell
-
-# library = ~/.ansible/library/
-
-# 2 hour timeout
-fact_caching_timeout = 7200
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
diff --git a/ansible-oraclelinux68-dc3-public-roles.cfg b/ansible-oraclelinux68-dc3-public-roles.cfg
deleted file mode 100644
index 459b779..0000000
--- a/ansible-oraclelinux68-dc3-public-roles.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[defaults]
-host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc3/
-forks = 50
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-roles_path = ~/.ansible/roles
-log_path = ~/.ansible/tmp/ansible.log
-retry_files_enabled = False
-executable = /bin/bash
-gathering = smart
-fact_caching = jsonfile
-fact_caching_connection = ~/.ansible/tmp/cache
-local_tmp = ~/.ansible/tmp
-module_name = shell
-
-# library = ~/.ansible/library/
-
-# 2 hour timeout
-fact_caching_timeout = 7200
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
diff --git a/ansible-oraclelinux68-dc4-public-roles.cfg b/ansible-oraclelinux68-dc4-public-roles.cfg
deleted file mode 100644
index 459b779..0000000
--- a/ansible-oraclelinux68-dc4-public-roles.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[defaults]
-host_key_checking = false
-hostfile = ~/.ansible/inventory/aws/oraclelinux68-dc3/
-forks = 50
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-roles_path = ~/.ansible/roles
-log_path = ~/.ansible/tmp/ansible.log
-retry_files_enabled = False
-executable = /bin/bash
-gathering = smart
-fact_caching = jsonfile
-fact_caching_connection = ~/.ansible/tmp/cache
-local_tmp = ~/.ansible/tmp
-module_name = shell
-
-# library = ~/.ansible/library/
-
-# 2 hour timeout
-fact_caching_timeout = 7200
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
diff --git a/ansible-vagrant-aio.cfg b/vagrant-aio.cfg
similarity index 94%
rename from ansible-vagrant-aio.cfg
rename to vagrant-aio.cfg
index fd3f12e..e8e12d5 100644
--- a/ansible-vagrant-aio.cfg
+++ b/vagrant-aio.cfg
@@ -1,6 +1,6 @@
 [defaults]
 host_key_checking = false
-# hostfile = inventory/vagrant
+hostfile = ~/.ansible/inventory/vagrant
 forks = 50
 remote_user = vagrant
 private_key_file = ~/.vagrant.d/insecure_private_key