diff --git a/hdl/testbench/orbit_intlk/Manifest.py b/hdl/testbench/orbit_intlk/Manifest.py
deleted file mode 100644
index faffbf43..00000000
--- a/hdl/testbench/orbit_intlk/Manifest.py
+++ /dev/null
@@ -1,32 +0,0 @@
-action = "simulation"
-target = "xilinx"
-syn_device = "xc7a200t"
-sim_tool = "modelsim"
-top_module = "wb_orbit_intlk_tb"
-sim_top = "wb_orbit_intlk_tb"
-
-modules = {
-    "local" : [
-               "../../modules/wb_orbit_intlk/",
-                "../../ip_cores/general-cores",
-                "../../ip_cores/infra-cores",
-                "../../ip_cores/dsp-cores",
-    ]
-}
-
-files = [
-    "wb_orbit_intlk_tb.v",
-    "clk_rst.v",
-]
-
-include_dirs = [
-    ".",
-    "../../sim",
-    "../../sim/regs"
-    "../../ip_cores/general-cores/modules/wishbone/wb_lm32/src",
-    "../../ip_cores/general-cores/modules/wishbone/wb_lm32/platform/generic",
-    "../../ip_cores/general-cores/modules/wishbone/wb_spi_bidir",
-    "../../ip_cores/general-cores/modules/wishbone/wb_spi"
-]
-
-vlog_opt = "+incdir+../../sim/regs +incdir+../../sim  +incdir+."
diff --git a/hdl/testbench/orbit_intlk/modelsim/Manifest.py b/hdl/testbench/orbit_intlk/modelsim/Manifest.py
new file mode 100644
index 00000000..2dd03e65
--- /dev/null
+++ b/hdl/testbench/orbit_intlk/modelsim/Manifest.py
@@ -0,0 +1,32 @@
+action = "simulation"
+target = "xilinx"
+syn_device = "xc7a200t"
+sim_tool = "modelsim"
+top_module = "wb_orbit_intlk_tb"
+sim_top = "wb_orbit_intlk_tb"
+
+modules = {
+    "local" : [
+               "../../../modules/wb_orbit_intlk/",
+               "../../../ip_cores/general-cores",
+               "../../../ip_cores/infra-cores",
+               "../../../ip_cores/dsp-cores",
+    ]
+}
+
+files = [
+    "wb_orbit_intlk_tb.v",
+    "clk_rst.v",
+]
+
+include_dirs = [
+    ".",
+    "../../../sim",
+    "../../../sim/regs"
+    "../../../ip_cores/general-cores/modules/wishbone/wb_lm32/src",
+    "../../../ip_cores/general-cores/modules/wishbone/wb_lm32/platform/generic",
+    "../../../ip_cores/general-cores/modules/wishbone/wb_spi_bidir",
+    "../../../ip_cores/general-cores/modules/wishbone/wb_spi"
+]
+
+vlog_opt = "+incdir+../../../sim/regs +incdir+../../../sim  +incdir+."
diff --git a/hdl/testbench/orbit_intlk/clk_rst.v b/hdl/testbench/orbit_intlk/modelsim/clk_rst.v
similarity index 100%
rename from hdl/testbench/orbit_intlk/clk_rst.v
rename to hdl/testbench/orbit_intlk/modelsim/clk_rst.v
diff --git a/hdl/testbench/orbit_intlk/defines.v b/hdl/testbench/orbit_intlk/modelsim/defines.v
similarity index 100%
rename from hdl/testbench/orbit_intlk/defines.v
rename to hdl/testbench/orbit_intlk/modelsim/defines.v
diff --git a/hdl/testbench/orbit_intlk/run.do b/hdl/testbench/orbit_intlk/modelsim/run.do
similarity index 85%
rename from hdl/testbench/orbit_intlk/run.do
rename to hdl/testbench/orbit_intlk/modelsim/run.do
index d77eb56c..8a949971 100644
--- a/hdl/testbench/orbit_intlk/run.do
+++ b/hdl/testbench/orbit_intlk/modelsim/run.do
@@ -1,4 +1,4 @@
-vlog wb_orbit_intlk_tb.v +incdir+"." +incdir+../../sim +incdir+../../sim/regs
+vlog wb_orbit_intlk_tb.v +incdir+"." +incdir+../../../sim +incdir+../../../sim/regs
 -- make -f Makefile
 -- output log file to file "output.log", set siulation resolution to "fs"
 vsim -l output.log \
diff --git a/hdl/testbench/orbit_intlk/timescale.v b/hdl/testbench/orbit_intlk/modelsim/timescale.v
similarity index 100%
rename from hdl/testbench/orbit_intlk/timescale.v
rename to hdl/testbench/orbit_intlk/modelsim/timescale.v
diff --git a/hdl/testbench/orbit_intlk/wave.do b/hdl/testbench/orbit_intlk/modelsim/wave.do
similarity index 100%
rename from hdl/testbench/orbit_intlk/wave.do
rename to hdl/testbench/orbit_intlk/modelsim/wave.do
diff --git a/hdl/testbench/orbit_intlk/wb_orbit_intlk_tb.v b/hdl/testbench/orbit_intlk/modelsim/wb_orbit_intlk_tb.v
similarity index 100%
rename from hdl/testbench/orbit_intlk/wb_orbit_intlk_tb.v
rename to hdl/testbench/orbit_intlk/modelsim/wb_orbit_intlk_tb.v