diff --git a/database/zynq7/mapping/devices.yaml b/database/zynq7/mapping/devices.yaml
deleted file mode 100644
index f780df42..00000000
--- a/database/zynq7/mapping/devices.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# device to fabric mapping
-"xc7z020s":
-  fabric: "xc7z020s"
-"xc7z010s":
-  fabric: "xc7z010s"
diff --git a/database/artix7/mapping/devices.yaml b/settings/artix7/devices.yaml
similarity index 87%
rename from database/artix7/mapping/devices.yaml
rename to settings/artix7/devices.yaml
index 59c1efd0..afd0c798 100644
--- a/database/artix7/mapping/devices.yaml
+++ b/settings/artix7/devices.yaml
@@ -6,4 +6,4 @@
 "xc7a50t":
   fabric: "xc7a50t"
 "xc7a35t":
-  fabric: "xc7a35t"
+  fabric: "xc7a50t"
diff --git a/database/kintex7/mapping/devices.yaml b/settings/kintex7/devices.yaml
similarity index 100%
rename from database/kintex7/mapping/devices.yaml
rename to settings/kintex7/devices.yaml
diff --git a/settings/zynq7/devices.yaml b/settings/zynq7/devices.yaml
new file mode 100644
index 00000000..e252aecb
--- /dev/null
+++ b/settings/zynq7/devices.yaml
@@ -0,0 +1,5 @@
+# device to fabric mapping
+"xc7z020":
+  fabric: "xc7z020"
+"xc7z010":
+  fabric: "xc7z010"