diff --git a/aws/1601-oraclelinux68-baas/inventory b/aws/1601-oraclelinux68-baas/inventory
deleted file mode 100644
index 668e8e2..0000000
--- a/aws/1601-oraclelinux68-baas/inventory
+++ /dev/null
@@ -1,61 +0,0 @@
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n1]
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n2]
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n3]
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n4]
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n5]
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n6]
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n7]
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n8]
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n9]
-[tag_Name_cfrias_1601_baas_oraclelinux68_1_n10]
-
-[planet:children]
-dc-1
-
-[dc-1:children]
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n1
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n2
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n3
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n4
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n5
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n6
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n7
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n8
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n9
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n10
-
-[elastic:children]
-dc-1-elastic
-
-[dc-1-elastic:children]
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n1
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n2
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n3
-
-[baas:children]
-dc-1-baas
-
-[dc-1-baas:children]
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n4
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n5
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n6
-
-[portal:children]
-dc-1-portal
-
-[dc-1-portal:children]
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n7
-
-[cassandra:children]
-dc-1-cassandra
-
-[dc-1-ds:children]
-dc-1-cassandra
-
-[ds:children]
-dc-1-cassandra
-
-[dc-1-cassandra:children]
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n8
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n9
-tag_Name_cfrias_1601_baas_oraclelinux68_1_n10
diff --git a/aws/1601-oraclelinux68-baas/ec2.py b/baas-1601-dc1/ec2.py
similarity index 100%
rename from aws/1601-oraclelinux68-baas/ec2.py
rename to baas-1601-dc1/ec2.py
diff --git a/baas-1601-dc1/inventory b/baas-1601-dc1/inventory
new file mode 100644
index 0000000..aff749c
--- /dev/null
+++ b/baas-1601-dc1/inventory
@@ -0,0 +1,61 @@
+[tag_Name_baas_1601_dc1_n1]
+[tag_Name_baas_1601_dc1_n2]
+[tag_Name_baas_1601_dc1_n3]
+[tag_Name_baas_1601_dc1_n4]
+[tag_Name_baas_1601_dc1_n5]
+[tag_Name_baas_1601_dc1_n6]
+[tag_Name_baas_1601_dc1_n7]
+[tag_Name_baas_1601_dc1_n8]
+[tag_Name_baas_1601_dc1_n9]
+[tag_Name_baas_1601_dc1_n10]
+
+[planet:children]
+dc-1
+
+[dc-1:children]
+tag_Name_baas_1601_dc1_n1
+tag_Name_baas_1601_dc1_n2
+tag_Name_baas_1601_dc1_n3
+tag_Name_baas_1601_dc1_n4
+tag_Name_baas_1601_dc1_n5
+tag_Name_baas_1601_dc1_n6
+tag_Name_baas_1601_dc1_n7
+tag_Name_baas_1601_dc1_n8
+tag_Name_baas_1601_dc1_n9
+tag_Name_baas_1601_dc1_n10
+
+[elastic:children]
+dc-1-elastic
+
+[dc-1-elastic:children]
+tag_Name_baas_1601_dc1_n1
+tag_Name_baas_1601_dc1_n2
+tag_Name_baas_1601_dc1_n3
+
+[baas:children]
+dc-1-baas
+
+[dc-1-baas:children]
+tag_Name_baas_1601_dc1_n4
+tag_Name_baas_1601_dc1_n5
+tag_Name_baas_1601_dc1_n6
+
+[portal:children]
+dc-1-portal
+
+[dc-1-portal:children]
+tag_Name_baas_1601_dc1_n7
+
+[ds:children]
+dc-1-ds
+
+[dc-1-ds:children]
+dc-1-cassandra
+
+[cassandra:children]
+dc-1-cassandra
+
+[dc-1-cassandra:children]
+tag_Name_baas_1601_dc1_n8
+tag_Name_baas_1601_dc1_n9
+tag_Name_baas_1601_dc1_n10