diff --git a/edge-1601-dc1-dc2/inventory-dc1 b/edge-1601-dc1-dc2/inventory-dc1
deleted file mode 120000
index 6224813..0000000
--- a/edge-1601-dc1-dc2/inventory-dc1
+++ /dev/null
@@ -1 +0,0 @@
-../edge-1601-dc1/inventory
\ No newline at end of file
diff --git a/edge-1601-dc1-dc2/inventory-dc1 b/edge-1601-dc1-dc2/inventory-dc1
new file mode 100644
index 0000000..0ff1818
--- /dev/null
+++ b/edge-1601-dc1-dc2/inventory-dc1
@@ -0,0 +1,84 @@
+[tag_Name_dc1_n1]
+[tag_Name_dc1_n2]
+[tag_Name_dc1_n3]
+[tag_Name_dc1_n4]
+[tag_Name_dc1_n5]
+[tag_Name_dc1_n6]
+[tag_Name_dc1_n7]
+[tag_Name_dc1_n8]
+[tag_Name_dc1_n9]
+[tag_Name_dc1_n10]
+
+[planet:children]
+dc-1
+
+[dc-1:children]
+tag_Name_dc1_n1
+tag_Name_dc1_n2
+tag_Name_dc1_n3
+tag_Name_dc1_n4
+tag_Name_dc1_n5
+tag_Name_dc1_n6
+tag_Name_dc1_n7
+tag_Name_dc1_n8
+tag_Name_dc1_n9
+tag_Name_dc1_n10
+
+[ds:children]
+dc-1-ds
+
+[dc-1-ds:children]
+tag_Name_dc1_n2
+tag_Name_dc1_n3
+tag_Name_dc1_n4
+
+[ms:children]
+dc-1-ms
+
+[dc-1-ms:children]
+tag_Name_dc1_n1
+
+[ui:children]
+dc-1-ui
+
+[dc-1-ui:children]
+tag_Name_dc1_n1
+
+[ldap:children]
+dc-1-ldap
+
+[dc-1-ldap:children]
+tag_Name_dc1_n1
+
+[rmp:children]
+dc-1-rmp
+
+[dc-1-rmp:children]
+tag_Name_dc1_n5
+tag_Name_dc1_n6
+
+[qpid:children]
+dc-1-qpid
+
+[dc-1-qpid:children]
+tag_Name_dc1_n7
+tag_Name_dc1_n8
+
+[pg:children]
+dc-1-pg
+
+[dc-1-pg:children]
+dc-1-pgmaster
+dc-1-pgstandby
+
+[pgmaster:children]
+dc-1-pgmaster
+
+[dc-1-pgmaster:children]
+tag_Name_dc1_n9
+
+[pgstandby:children]
+dc-1-pgstandby
+
+[dc-1-pgstandby:children]
+tag_Name_dc1_n10
diff --git a/edge-1601-dc1-dc2/inventory-dc2 b/edge-1601-dc1-dc2/inventory-dc2
deleted file mode 120000
index d7c20ce..0000000
--- a/edge-1601-dc1-dc2/inventory-dc2
+++ /dev/null
@@ -1 +0,0 @@
-../edge-1601-dc2/inventory
\ No newline at end of file
diff --git a/edge-1601-dc1-dc2/inventory-dc2 b/edge-1601-dc1-dc2/inventory-dc2
new file mode 100644
index 0000000..8ba4f5b
--- /dev/null
+++ b/edge-1601-dc1-dc2/inventory-dc2
@@ -0,0 +1,87 @@
+[tag_Name_dc2_n1]
+[tag_Name_dc2_n2]
+[tag_Name_dc2_n3]
+[tag_Name_dc2_n4]
+[tag_Name_dc2_n5]
+[tag_Name_dc2_n6]
+[tag_Name_dc2_n7]
+[tag_Name_dc2_n8]
+[tag_Name_dc2_n9]
+[tag_Name_dc2_n10]
+
+[planet:children]
+dc-2
+
+[dc-2:children]
+tag_Name_dc2_n1
+tag_Name_dc2_n2
+tag_Name_dc2_n3
+tag_Name_dc2_n4
+tag_Name_dc2_n5
+tag_Name_dc2_n6
+tag_Name_dc2_n7
+tag_Name_dc2_n8
+tag_Name_dc2_n9
+tag_Name_dc2_n10
+
+[ds:children]
+dc-2-ds
+
+[dc-2-ds:children]
+tag_Name_dc2_n2
+tag_Name_dc2_n3
+tag_Name_dc2_n4
+
+[tag_Name_dc2_n4:vars]
+zk_observer = true
+
+[ms:children]
+dc-2-ms
+
+[dc-2-ms:children]
+tag_Name_dc2_n1
+
+[ui:children]
+dc-2-ui
+
+[dc-2-ui:children]
+tag_Name_dc2_n1
+
+[ldap:children]
+dc-2-ldap
+
+[dc-2-ldap:children]
+tag_Name_dc2_n1
+
+[rmp:children]
+dc-2-rmp
+
+[dc-2-rmp:children]
+tag_Name_dc2_n5
+tag_Name_dc2_n6
+
+[qpid:children]
+dc-2-qpid
+
+[dc-2-qpid:children]
+tag_Name_dc2_n7
+tag_Name_dc2_n8
+
+[pg:children]
+dc-2-pg
+
+[dc-2-pg:children]
+dc-2-pgmaster
+dc-2-pgstandby
+
+[pgmaster:children]
+dc-2-pgmaster
+
+[dc-2-pgmaster:children]
+tag_Name_dc2_n9
+
+[pgstandby:children]
+dc-2-pgstandby
+
+[dc-2-pgstandby:children]
+tag_Name_dc2_n10
diff --git a/edge-1601-dc1/inventory b/edge-1601-dc1/inventory
index 7381108..d17a89b 100644
--- a/edge-1601-dc1/inventory
+++ b/edge-1601-dc1/inventory
@@ -8,17 +8,6 @@
 [tag_Name_dc1_n8]
 [tag_Name_dc1_n9]
 [tag_Name_dc1_n10]
-[tag_Name_dc1_n11]
-[tag_Name_dc1_n12]
-[tag_Name_dc1_n13]
-[tag_Name_dc1_n14]
-[tag_Name_dc1_n15]
-[tag_Name_dc1_n16]
-[tag_Name_dc1_n17]
-[tag_Name_dc1_n18]
-[tag_Name_dc1_n19]
-[tag_Name_dc1_n20]
-[tag_Name_dc1_n21]
 
 [planet:children]
 dc-1
@@ -29,78 +18,46 @@
 tag_Name_dc1_n3
 tag_Name_dc1_n4
 tag_Name_dc1_n5
-tag_Name_dc1_n6
-tag_Name_dc1_n7
-tag_Name_dc1_n8
-tag_Name_dc1_n9
-tag_Name_dc1_n10
-tag_Name_dc1_n11
-tag_Name_dc1_n12
-tag_Name_dc1_n13
-tag_Name_dc1_n14
-tag_Name_dc1_n15
-tag_Name_dc1_n16
-tag_Name_dc1_n17
-tag_Name_dc1_n18
-tag_Name_dc1_n19
-tag_Name_dc1_n20
-tag_Name_dc1_n21
 
 [ds:children]
 dc-1-ds
 
-[tag_Name_dc1_n3:vars]
-zk_observer=true
-
 [dc-1-ds:children]
+tag_Name_dc1_n2
 tag_Name_dc1_n3
 tag_Name_dc1_n4
-tag_Name_dc1_n5
-tag_Name_dc1_n6
-tag_Name_dc1_n7
-tag_Name_dc1_n8
-tag_Name_dc1_n9
-tag_Name_dc1_n10
 
 [ms:children]
 dc-1-ms
 
 [dc-1-ms:children]
 tag_Name_dc1_n1
-tag_Name_dc1_n2
 
 [ui:children]
 dc-1-ui
 
 [dc-1-ui:children]
 tag_Name_dc1_n1
-tag_Name_dc1_n2
 
 [ldap:children]
 dc-1-ldap
 
 [dc-1-ldap:children]
 tag_Name_dc1_n1
-tag_Name_dc1_n2
 
 [rmp:children]
 dc-1-rmp
 
 [dc-1-rmp:children]
-tag_Name_dc1_n11
-tag_Name_dc1_n12
-tag_Name_dc1_n13
-tag_Name_dc1_n14
-tag_Name_dc1_n15
-tag_Name_dc1_n16
-tag_Name_dc1_n17
+tag_Name_dc1_n5
+tag_Name_dc1_n6
 
 [qpid:children]
 dc-1-qpid
 
 [dc-1-qpid:children]
-tag_Name_dc1_n18
-tag_Name_dc1_n19
+tag_Name_dc1_n7
+tag_Name_dc1_n8
 
 [pg:children]
 dc-1-pg
@@ -113,10 +70,10 @@
 dc-1-pgmaster
 
 [dc-1-pgmaster:children]
-tag_Name_dc1_n20
+tag_Name_dc1_n9
 
 [pgstandby:children]
 dc-1-pgstandby
 
 [dc-1-pgstandby:children]
-tag_Name_dc1_n21
+tag_Name_dc1_n10
diff --git a/edge-1601-dc2/inventory b/edge-1601-dc2/inventory
index 4d8b08b..b79d9df 100644
--- a/edge-1601-dc2/inventory
+++ b/edge-1601-dc2/inventory
@@ -8,22 +8,11 @@
 [tag_Name_dc2_n8]
 [tag_Name_dc2_n9]
 [tag_Name_dc2_n10]
-[tag_Name_dc2_n11]
-[tag_Name_dc2_n12]
-[tag_Name_dc2_n13]
-[tag_Name_dc2_n14]
-[tag_Name_dc2_n15]
-[tag_Name_dc2_n16]
-[tag_Name_dc2_n17]
-[tag_Name_dc2_n18]
-[tag_Name_dc2_n19]
-[tag_Name_dc2_n20]
-[tag_Name_dc2_n21]
 
 [planet:children]
-dc-2
+dc-1
 
-[dc-2:children]
+[dc-1:children]
 tag_Name_dc2_n1
 tag_Name_dc2_n2
 tag_Name_dc2_n3
@@ -34,87 +23,62 @@
 tag_Name_dc2_n8
 tag_Name_dc2_n9
 tag_Name_dc2_n10
-tag_Name_dc2_n11
-tag_Name_dc2_n12
-tag_Name_dc2_n13
-tag_Name_dc2_n14
-tag_Name_dc2_n15
-tag_Name_dc2_n16
-tag_Name_dc2_n17
-tag_Name_dc2_n18
-tag_Name_dc2_n19
-tag_Name_dc2_n20
-tag_Name_dc2_n21
 
 [ds:children]
-dc-2-ds
+dc-1-ds
 
-[dc-2-ds:children]
+[dc-1-ds:children]
+tag_Name_dc2_n2
 tag_Name_dc2_n3
 tag_Name_dc2_n4
-tag_Name_dc2_n5
-tag_Name_dc2_n6
-tag_Name_dc2_n7
-tag_Name_dc2_n8
-tag_Name_dc2_n9
-tag_Name_dc2_n10
 
 [ms:children]
-dc-2-ms
+dc-1-ms
 
-[dc-2-ms:children]
+[dc-1-ms:children]
 tag_Name_dc2_n1
-tag_Name_dc2_n2
 
 [ui:children]
-dc-2-ui
+dc-1-ui
 
-[dc-2-ui:children]
+[dc-1-ui:children]
 tag_Name_dc2_n1
-tag_Name_dc2_n2
 
 [ldap:children]
-dc-2-ldap
+dc-1-ldap
 
-[dc-2-ldap:children]
+[dc-1-ldap:children]
 tag_Name_dc2_n1
-tag_Name_dc2_n2
 
 [rmp:children]
-dc-2-rmp
+dc-1-rmp
 
-[dc-2-rmp:children]
-tag_Name_dc2_n11
-tag_Name_dc2_n12
-tag_Name_dc2_n13
-tag_Name_dc2_n14
-tag_Name_dc2_n15
-tag_Name_dc2_n16
-tag_Name_dc2_n17
+[dc-1-rmp:children]
+tag_Name_dc2_n5
+tag_Name_dc2_n6
 
 [qpid:children]
-dc-2-qpid
+dc-1-qpid
 
-[dc-2-qpid:children]
-tag_Name_dc2_n18
-tag_Name_dc2_n19
+[dc-1-qpid:children]
+tag_Name_dc2_n7
+tag_Name_dc2_n8
 
 [pg:children]
-dc-2-pg
+dc-1-pg
 
-[dc-2-pg:children]
-dc-2-pgmaster
-dc-2-pgstandby
+[dc-1-pg:children]
+dc-1-pgmaster
+dc-1-pgstandby
 
 [pgmaster:children]
-dc-2-pgmaster
+dc-1-pgmaster
 
-[dc-2-pgmaster:children]
-tag_Name_dc2_n20
+[dc-1-pgmaster:children]
+tag_Name_dc2_n9
 
 [pgstandby:children]
-dc-2-pgstandby
+dc-1-pgstandby
 
-[dc-2-pgstandby:children]
-tag_Name_dc2_n21
-
+[dc-1-pgstandby:children]
+tag_Name_dc2_n10
diff --git a/edge-1601-dc3-dc4/inventory-dc3 b/edge-1601-dc3-dc4/inventory-dc3
index 9126bc1..0b97282 100644
--- a/edge-1601-dc3-dc4/inventory-dc3
+++ b/edge-1601-dc3-dc4/inventory-dc3
@@ -3,11 +3,6 @@
 [tag_Name_dc3_n3]
 [tag_Name_dc3_n4]
 [tag_Name_dc3_n5]
-[tag_Name_dc3_n6]
-[tag_Name_dc3_n7]
-[tag_Name_dc3_n8]
-[tag_Name_dc3_n9]
-[tag_Name_dc3_n10]
 
 [planet:children]
 dc-1
@@ -18,51 +13,46 @@
 tag_Name_dc3_n3
 tag_Name_dc3_n4
 tag_Name_dc3_n5
-tag_Name_dc3_n6
-tag_Name_dc3_n7
-tag_Name_dc3_n8
-tag_Name_dc3_n9
-tag_Name_dc3_n10
 
 [ds:children]
 dc-1-ds
 
 [dc-1-ds:children]
-tag_Name_dc3_n1
 tag_Name_dc3_n2
 tag_Name_dc3_n3
+tag_Name_dc3_n4
 
 [ms:children]
 dc-1-ms
 
 [dc-1-ms:children]
-tag_Name_dc3_n4
+tag_Name_dc3_n1
 
 [ui:children]
 dc-1-ui
 
 [dc-1-ui:children]
-tag_Name_dc3_n4
+tag_Name_dc3_n1
 
 [ldap:children]
 dc-1-ldap
 
 [dc-1-ldap:children]
-tag_Name_dc3_n4
+tag_Name_dc3_n1
 
 [rmp:children]
 dc-1-rmp
 
 [dc-1-rmp:children]
-tag_Name_dc3_n5
-tag_Name_dc3_n6
+tag_Name_dc3_n3
+tag_Name_dc3_n4
 
 [qpid:children]
 dc-1-qpid
 
 [dc-1-qpid:children]
-tag_Name_dc3_n7
-tag_Name_dc3_n8
+tag_Name_dc3_n4
+tag_Name_dc3_n5
 
 [pg:children]
 dc-1-pg
@@ -75,10 +65,10 @@
 dc-1-pgmaster
 
 [dc-1-pgmaster:children]
-tag_Name_dc3_n9
+tag_Name_dc3_n4
 
 [pgstandby:children]
 dc-1-pgstandby
 
 [dc-1-pgstandby:children]
-tag_Name_dc3_n10
+tag_Name_dc3_n5
diff --git a/edge-1601-dc3-dc4/inventory-dc4 b/edge-1601-dc3-dc4/inventory-dc4
index 9d31984..93b42da 100644
--- a/edge-1601-dc3-dc4/inventory-dc4
+++ b/edge-1601-dc3-dc4/inventory-dc4
@@ -3,11 +3,6 @@
 [tag_Name_dc4_n3]
 [tag_Name_dc4_n4]
 [tag_Name_dc4_n5]
-[tag_Name_dc4_n6]
-[tag_Name_dc4_n7]
-[tag_Name_dc4_n8]
-[tag_Name_dc4_n9]
-[tag_Name_dc4_n10]
 
 [planet:children]
 dc-2
@@ -18,54 +13,46 @@
 tag_Name_dc4_n3
 tag_Name_dc4_n4
 tag_Name_dc4_n5
-tag_Name_dc4_n6
-tag_Name_dc4_n7
-tag_Name_dc4_n8
-tag_Name_dc4_n9
-tag_Name_dc4_n10
 
 [ds:children]
 dc-2-ds
 
 [dc-2-ds:children]
-tag_Name_dc4_n1
 tag_Name_dc4_n2
 tag_Name_dc4_n3
-
-[tag_Name_dc4_n3:vars]
-zk_observer=true
+tag_Name_dc4_n4
 
 [ms:children]
 dc-2-ms
 
 [dc-2-ms:children]
-tag_Name_dc4_n4
+tag_Name_dc4_n1
 
 [ui:children]
 dc-2-ui
 
 [dc-2-ui:children]
-tag_Name_dc4_n4
+tag_Name_dc4_n1
 
 [ldap:children]
 dc-2-ldap
 
 [dc-2-ldap:children]
-tag_Name_dc4_n4
+tag_Name_dc4_n1
 
 [rmp:children]
 dc-2-rmp
 
 [dc-2-rmp:children]
-tag_Name_dc4_n5
-tag_Name_dc4_n6
+tag_Name_dc4_n3
+tag_Name_dc4_n4
 
 [qpid:children]
 dc-2-qpid
 
 [dc-2-qpid:children]
-tag_Name_dc4_n7
-tag_Name_dc4_n8
+tag_Name_dc4_n4
+tag_Name_dc4_n5
 
 [pg:children]
 dc-2-pg
@@ -78,10 +65,10 @@
 dc-2-pgmaster
 
 [dc-2-pgmaster:children]
-tag_Name_dc4_n9
+tag_Name_dc4_n4
 
 [pgstandby:children]
 dc-2-pgstandby
 
 [dc-2-pgstandby:children]
-tag_Name_dc4_n10
+tag_Name_dc4_n5
diff --git a/edge-1601-dc3/inventory b/edge-1601-dc3/inventory
index 9126bc1..0b97282 100644
--- a/edge-1601-dc3/inventory
+++ b/edge-1601-dc3/inventory
@@ -3,11 +3,6 @@
 [tag_Name_dc3_n3]
 [tag_Name_dc3_n4]
 [tag_Name_dc3_n5]
-[tag_Name_dc3_n6]
-[tag_Name_dc3_n7]
-[tag_Name_dc3_n8]
-[tag_Name_dc3_n9]
-[tag_Name_dc3_n10]
 
 [planet:children]
 dc-1
@@ -18,51 +13,46 @@
 tag_Name_dc3_n3
 tag_Name_dc3_n4
 tag_Name_dc3_n5
-tag_Name_dc3_n6
-tag_Name_dc3_n7
-tag_Name_dc3_n8
-tag_Name_dc3_n9
-tag_Name_dc3_n10
 
 [ds:children]
 dc-1-ds
 
 [dc-1-ds:children]
-tag_Name_dc3_n1
 tag_Name_dc3_n2
 tag_Name_dc3_n3
+tag_Name_dc3_n4
 
 [ms:children]
 dc-1-ms
 
 [dc-1-ms:children]
-tag_Name_dc3_n4
+tag_Name_dc3_n1
 
 [ui:children]
 dc-1-ui
 
 [dc-1-ui:children]
-tag_Name_dc3_n4
+tag_Name_dc3_n1
 
 [ldap:children]
 dc-1-ldap
 
 [dc-1-ldap:children]
-tag_Name_dc3_n4
+tag_Name_dc3_n1
 
 [rmp:children]
 dc-1-rmp
 
 [dc-1-rmp:children]
-tag_Name_dc3_n5
-tag_Name_dc3_n6
+tag_Name_dc3_n3
+tag_Name_dc3_n4
 
 [qpid:children]
 dc-1-qpid
 
 [dc-1-qpid:children]
-tag_Name_dc3_n7
-tag_Name_dc3_n8
+tag_Name_dc3_n4
+tag_Name_dc3_n5
 
 [pg:children]
 dc-1-pg
@@ -75,10 +65,10 @@
 dc-1-pgmaster
 
 [dc-1-pgmaster:children]
-tag_Name_dc3_n9
+tag_Name_dc3_n4
 
 [pgstandby:children]
 dc-1-pgstandby
 
 [dc-1-pgstandby:children]
-tag_Name_dc3_n10
+tag_Name_dc3_n5
diff --git a/edge-1601-dc4/inventory b/edge-1601-dc4/inventory
index bb1dd57..0b97282 100644
--- a/edge-1601-dc4/inventory
+++ b/edge-1601-dc4/inventory
@@ -1,68 +1,58 @@
-[tag_Name_dc4_n1]
-[tag_Name_dc4_n2]
-[tag_Name_dc4_n3]
-[tag_Name_dc4_n4]
-[tag_Name_dc4_n5]
-[tag_Name_dc4_n6]
-[tag_Name_dc4_n7]
-[tag_Name_dc4_n8]
-[tag_Name_dc4_n9]
-[tag_Name_dc4_n10]
+[tag_Name_dc3_n1]
+[tag_Name_dc3_n2]
+[tag_Name_dc3_n3]
+[tag_Name_dc3_n4]
+[tag_Name_dc3_n5]
 
 [planet:children]
 dc-1
 
 [dc-1:children]
-tag_Name_dc4_n1
-tag_Name_dc4_n2
-tag_Name_dc4_n3
-tag_Name_dc4_n4
-tag_Name_dc4_n5
-tag_Name_dc4_n6
-tag_Name_dc4_n7
-tag_Name_dc4_n8
-tag_Name_dc4_n9
-tag_Name_dc4_n10
+tag_Name_dc3_n1
+tag_Name_dc3_n2
+tag_Name_dc3_n3
+tag_Name_dc3_n4
+tag_Name_dc3_n5
 
 [ds:children]
 dc-1-ds
 
 [dc-1-ds:children]
-tag_Name_dc4_n1
-tag_Name_dc4_n2
-tag_Name_dc4_n3
+tag_Name_dc3_n2
+tag_Name_dc3_n3
+tag_Name_dc3_n4
 
 [ms:children]
 dc-1-ms
 
 [dc-1-ms:children]
-tag_Name_dc4_n4
+tag_Name_dc3_n1
 
 [ui:children]
 dc-1-ui
 
 [dc-1-ui:children]
-tag_Name_dc4_n4
+tag_Name_dc3_n1
 
 [ldap:children]
 dc-1-ldap
 
 [dc-1-ldap:children]
-tag_Name_dc4_n4
+tag_Name_dc3_n1
 
 [rmp:children]
 dc-1-rmp
 
 [dc-1-rmp:children]
-tag_Name_dc4_n5
-tag_Name_dc4_n6
+tag_Name_dc3_n3
+tag_Name_dc3_n4
 
 [qpid:children]
 dc-1-qpid
 
 [dc-1-qpid:children]
-tag_Name_dc4_n7
-tag_Name_dc4_n8
+tag_Name_dc3_n4
+tag_Name_dc3_n5
 
 [pg:children]
 dc-1-pg
@@ -75,10 +65,10 @@
 dc-1-pgmaster
 
 [dc-1-pgmaster:children]
-tag_Name_dc4_n9
+tag_Name_dc3_n4
 
 [pgstandby:children]
 dc-1-pgstandby
 
 [dc-1-pgstandby:children]
-tag_Name_dc4_n10
+tag_Name_dc3_n5