diff --git a/.gitignore b/.gitignore
index 26ba6eed..f9585e4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
 /env/
 /build/
+/database/
 .Xil
-# Ignore database directories _except_ for their settings
-database/*/*
-!database/*/settings.sh
 **/specimen_*
 **/output
 run.ok
diff --git a/README.md b/README.md
index e4821424..e883f326 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ correctly build and install pyjson5. After this, run either option 1 or 2 again.
 Always make sure to set the environment for the device you are working on before
 running any other commands:
 
-    source database/artix7/settings.sh
+    source settings/artix7.sh
 
 ### Step 7: ###
 (Option 1, recommended) - Download a current stable version (you can use the
diff --git a/database/artix7/settings.sh b/database/artix7/settings.sh
index df3e244f..d5bf6312 100644
--- a/database/artix7/settings.sh
+++ b/database/artix7/settings.sh
@@ -1,26 +1 @@
-export XRAY_DATABASE="artix7"
-export XRAY_PART="xc7a50tfgg484-1"
-export XRAY_ROI_FRAMES="0x00000000:0xffffffff"
-
-# All CLB's in part, all BRAM's in part, all DSP's in part.
-# tcl queries IOB => don't bother adding
-export XRAY_ROI_TILEGRID="SLICE_X0Y0:SLICE_X65Y99 SLICE_X0Y100:SLICE_X57Y149 RAMB18_X0Y0:RAMB18_X1Y59 RAMB36_X0Y0:RAMB36_X1Y29 RAMB18_X2Y0:RAMB18_X2Y39 RAMB36_X2Y0:RAMB36_X2Y19 DSP48_X0Y0:DSP48_X1Y59"
-
-# These settings must remain in sync
-export XRAY_ROI="SLICE_X0Y100:SLICE_X35Y149 RAMB18_X0Y40:RAMB18_X0Y59 RAMB36_X0Y20:RAMB36_X0Y29 DSP48_X0Y40:DSP48_X0Y59 IOB_X0Y100:IOB_X0Y149"
-# Most of CMT X0Y2.
-export XRAY_ROI_GRID_X1="0"
-export XRAY_ROI_GRID_X2="58"
-# Include VBRK / VTERM
-export XRAY_ROI_GRID_Y1="0"
-export XRAY_ROI_GRID_Y2="52"
-
-export XRAY_PIN_00="E22"
-export XRAY_PIN_01="D22"
-export XRAY_PIN_02="E21"
-export XRAY_PIN_03="D21"
-export XRAY_PIN_04="G21"
-export XRAY_PIN_05="G22"
-export XRAY_PIN_06="F21"
-
-source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
+source $(dirname ${BASH_SOURCE[0]})/../../settings/artix7.sh
diff --git a/database/kintex7/settings.sh b/database/kintex7/settings.sh
index 98b481e1..aead0cac 100644
--- a/database/kintex7/settings.sh
+++ b/database/kintex7/settings.sh
@@ -1,26 +1 @@
-export XRAY_DATABASE="kintex7"
-export XRAY_PART="xc7k70tfbg676-2"
-export XRAY_ROI_FRAMES="0x00000000:0xffffffff"
-
-# FIXME: make entire part
-export XRAY_ROI_TILEGRID="SLICE_X0Y50:SLICE_X19Y99 DSP48_X0Y20:DSP48_X0Y39 RAMB18_X0Y20:RAMB18_X0Y39 RAMB36_X0Y10:RAMB36_X0Y19"
-
-# These settings must remain in sync
-export XRAY_ROI="SLICE_X0Y50:SLICE_X19Y99 DSP48_X0Y20:DSP48_X0Y39 RAMB18_X0Y20:RAMB18_X0Y39 RAMB36_X0Y10:RAMB36_X0Y19 IOB_X0Y50:IOB_X0Y99"
-# Part of CMT X0Y1
-export XRAY_ROI_GRID_X1="0"
-export XRAY_ROI_GRID_X2="38"
-# Include VBRK / VTERM
-export XRAY_ROI_GRID_Y1="104"
-export XRAY_ROI_GRID_Y2="156"
-
-# Choose the first N High Range I/Os
-export XRAY_PIN_00="K25"
-export XRAY_PIN_01="K26"
-export XRAY_PIN_02="L24"
-export XRAY_PIN_03="L25"
-export XRAY_PIN_04="M19"
-export XRAY_PIN_05="M20"
-export XRAY_PIN_06="M21"
-
-source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
+source $(dirname ${BASH_SOURCE[0]})/../../settings/kintex7.sh
diff --git a/database/zynq7/settings.sh b/database/zynq7/settings.sh
index 765b4657..96e1614c 100644
--- a/database/zynq7/settings.sh
+++ b/database/zynq7/settings.sh
@@ -1,26 +1 @@
-export XRAY_DATABASE="zynq7"
-export XRAY_PART="xc7z010clg400-1"
-export XRAY_ROI_FRAMES="0x00000000:0xffffffff"
-
-# All CLB's in part, all BRAM's in part, all DSP's in part.
-export XRAY_ROI_TILEGRID="SLICE_X0Y0:SLICE_X43Y99 RAMB18_X0Y0:RAMB18_X2Y39 RAMB36_X0Y0:RAMB36_X2Y19 DSP48_X0Y0:DSP48_X1Y39"
-
-# These settings must remain in sync
-export XRAY_ROI="SLICE_X22Y50:SLICE_X43Y99 RAMB18_X1Y20:RAMB18_X2Y39 RAMB36_X1Y10:RAMB36_X2Y19 IOB_X0Y50:IOB_X0Y99"
-
-# Most of CMT X0Y2.
-export XRAY_ROI_GRID_X1="83"
-export XRAY_ROI_GRID_X2="127"
-# Include VBRK / VTERM
-export XRAY_ROI_GRID_Y1="0"
-export XRAY_ROI_GRID_Y2="51"
-
-export XRAY_PIN_00="L14"
-export XRAY_PIN_01="L15"
-export XRAY_PIN_02="M14"
-export XRAY_PIN_03="M15"
-export XRAY_PIN_04="K16"
-export XRAY_PIN_05="J16"
-export XRAY_PIN_06="J15"
-
-source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
+source $(dirname ${BASH_SOURCE[0]})/../../settings/zynq7.sh
diff --git a/settings/artix7.sh b/settings/artix7.sh
new file mode 100644
index 00000000..b6d90a2f
--- /dev/null
+++ b/settings/artix7.sh
@@ -0,0 +1,26 @@
+export XRAY_DATABASE="artix7"
+export XRAY_PART="xc7a50tfgg484-1"
+export XRAY_ROI_FRAMES="0x00000000:0xffffffff"
+
+# All CLB's in part, all BRAM's in part, all DSP's in part.
+# tcl queries IOB => don't bother adding
+export XRAY_ROI_TILEGRID="SLICE_X0Y0:SLICE_X65Y99 SLICE_X0Y100:SLICE_X57Y149 RAMB18_X0Y0:RAMB18_X1Y59 RAMB36_X0Y0:RAMB36_X1Y29 RAMB18_X2Y0:RAMB18_X2Y39 RAMB36_X2Y0:RAMB36_X2Y19 DSP48_X0Y0:DSP48_X1Y59"
+
+# These settings must remain in sync
+export XRAY_ROI="SLICE_X0Y100:SLICE_X35Y149 RAMB18_X0Y40:RAMB18_X0Y59 RAMB36_X0Y20:RAMB36_X0Y29 DSP48_X0Y40:DSP48_X0Y59 IOB_X0Y100:IOB_X0Y149"
+# Most of CMT X0Y2.
+export XRAY_ROI_GRID_X1="0"
+export XRAY_ROI_GRID_X2="58"
+# Include VBRK / VTERM
+export XRAY_ROI_GRID_Y1="0"
+export XRAY_ROI_GRID_Y2="52"
+
+export XRAY_PIN_00="E22"
+export XRAY_PIN_01="D22"
+export XRAY_PIN_02="E21"
+export XRAY_PIN_03="D21"
+export XRAY_PIN_04="G21"
+export XRAY_PIN_05="G22"
+export XRAY_PIN_06="F21"
+
+source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh
diff --git a/settings/kintex7.sh b/settings/kintex7.sh
new file mode 100644
index 00000000..acd366a3
--- /dev/null
+++ b/settings/kintex7.sh
@@ -0,0 +1,26 @@
+export XRAY_DATABASE="kintex7"
+export XRAY_PART="xc7k70tfbg676-2"
+export XRAY_ROI_FRAMES="0x00000000:0xffffffff"
+
+# FIXME: make entire part
+export XRAY_ROI_TILEGRID="SLICE_X0Y50:SLICE_X19Y99 DSP48_X0Y20:DSP48_X0Y39 RAMB18_X0Y20:RAMB18_X0Y39 RAMB36_X0Y10:RAMB36_X0Y19"
+
+# These settings must remain in sync
+export XRAY_ROI="SLICE_X0Y50:SLICE_X19Y99 DSP48_X0Y20:DSP48_X0Y39 RAMB18_X0Y20:RAMB18_X0Y39 RAMB36_X0Y10:RAMB36_X0Y19 IOB_X0Y50:IOB_X0Y99"
+# Part of CMT X0Y1
+export XRAY_ROI_GRID_X1="0"
+export XRAY_ROI_GRID_X2="38"
+# Include VBRK / VTERM
+export XRAY_ROI_GRID_Y1="104"
+export XRAY_ROI_GRID_Y2="156"
+
+# Choose the first N High Range I/Os
+export XRAY_PIN_00="K25"
+export XRAY_PIN_01="K26"
+export XRAY_PIN_02="L24"
+export XRAY_PIN_03="L25"
+export XRAY_PIN_04="M19"
+export XRAY_PIN_05="M20"
+export XRAY_PIN_06="M21"
+
+source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh
diff --git a/settings/zynq7.sh b/settings/zynq7.sh
new file mode 100644
index 00000000..fa4d3a26
--- /dev/null
+++ b/settings/zynq7.sh
@@ -0,0 +1,26 @@
+export XRAY_DATABASE="zynq7"
+export XRAY_PART="xc7z010clg400-1"
+export XRAY_ROI_FRAMES="0x00000000:0xffffffff"
+
+# All CLB's in part, all BRAM's in part, all DSP's in part.
+export XRAY_ROI_TILEGRID="SLICE_X0Y0:SLICE_X43Y99 RAMB18_X0Y0:RAMB18_X2Y39 RAMB36_X0Y0:RAMB36_X2Y19 DSP48_X0Y0:DSP48_X1Y39"
+
+# These settings must remain in sync
+export XRAY_ROI="SLICE_X22Y50:SLICE_X43Y99 RAMB18_X1Y20:RAMB18_X2Y39 RAMB36_X1Y10:RAMB36_X2Y19 IOB_X0Y50:IOB_X0Y99"
+
+# Most of CMT X0Y2.
+export XRAY_ROI_GRID_X1="83"
+export XRAY_ROI_GRID_X2="127"
+# Include VBRK / VTERM
+export XRAY_ROI_GRID_Y1="0"
+export XRAY_ROI_GRID_Y2="51"
+
+export XRAY_PIN_00="L14"
+export XRAY_PIN_01="L15"
+export XRAY_PIN_02="M14"
+export XRAY_PIN_03="M15"
+export XRAY_PIN_04="K16"
+export XRAY_PIN_05="J16"
+export XRAY_PIN_06="J15"
+
+source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh