diff --git a/constants/hdl/simulation_constants.v b/constants/hdl/simulation_constants.v
deleted file mode 100644
index 988a049..0000000
--- a/constants/hdl/simulation_constants.v
+++ /dev/null
@@ -1 +0,0 @@
-`define TARGET_CLEAN
diff --git a/constants/hdl/xilinx_constants.v b/constants/hdl/xilinx_constants.v
deleted file mode 100644
index f034a1d..0000000
--- a/constants/hdl/xilinx_constants.v
+++ /dev/null
@@ -1 +0,0 @@
-`define TARGET_XILINX
diff --git a/elink/dv/elink.cmd b/elink/dv/elink.cmd
index ed857a3..7fde2c2 100644
--- a/elink/dv/elink.cmd
+++ b/elink/dv/elink.cmd
@@ -1,5 +1,5 @@
-../../constants/hdl/simulation_constants.v
-../../elink/hdl/elink_regmap.v
+../hdl/constants.v
+../hdl/elink_regmap.v
 dv_elink_tb.v
 -y .
 -y ../../elink/hdl
diff --git a/elink/hdl/constants.v b/elink/hdl/constants.v
new file mode 100644
index 0000000..d87d709
--- /dev/null
+++ b/elink/hdl/constants.v
@@ -0,0 +1,3 @@
+//These constants are mutually exclusive
+`define TARGET_CLEAN
+//`define TARGET_XILINX
diff --git a/elink/constraints/elink_clocks.xdc b/elink/syn/xilinx/elink_clocks.xdc
similarity index 100%
rename from elink/constraints/elink_clocks.xdc
rename to elink/syn/xilinx/elink_clocks.xdc