diff --git a/libraries/io/tr_nonbonded/hdllib.cfg b/libraries/io/tr_nonbonded/hdllib.cfg
index ba0d2b460a9f83b6cee65ddb618023ae8bb1356b..271cf5a32cc8bcbecf7012b8f9c5343e09309e03 100644
--- a/libraries/io/tr_nonbonded/hdllib.cfg
+++ b/libraries/io/tr_nonbonded/hdllib.cfg
@@ -6,13 +6,13 @@ build_sim_dir = $HDL_BUILD_DIR
 build_synth_dir = 
 
 synth_files =
+    $UNB/Firmware/modules/tr_nonbonded/tb/vhdl/serializer.vhd
+    $UNB/Firmware/modules/tr_nonbonded/tb/vhdl/deserializer.vhd
+    $UNB/Firmware/modules/tr_nonbonded/tb/vhdl/sim_gx.vhd
     src/vhdl/tr_nonbonded.vhd
-    $UNB/Firmware/modules/tr_nonbonded/src/vhdl/src/vhdl/tr_nonbonded_reg.vhd
-    $UNB/Firmware/modules/tr_nonbonded/src/vhdl/src/vhdl/mms_tr_nonbonded.vhd
+    $UNB/Firmware/modules/tr_nonbonded/src/vhdl/tr_nonbonded_reg.vhd
+    $UNB/Firmware/modules/tr_nonbonded/src/vhdl/mms_tr_nonbonded.vhd
 
 test_bench_files = 
-    $UNB/Firmware/modules/tr_nonbonded/src/vhdl/tb/vhdl/serializer.vhd
-    $UNB/Firmware/modules/tr_nonbonded/src/vhdl/tb/vhdl/deserializer.vhd
-    $UNB/Firmware/modules/tr_nonbonded/src/vhdl/tb/vhdl/tb_serdes.vhd
-    $UNB/Firmware/modules/tr_nonbonded/src/vhdl/tb/vhdl/sim_gx.vhd
-    $UNB/Firmware/modules/tr_nonbonded/src/vhdl/tb/vhdl/tb_tr_nonbonded.vhd
+    $UNB/Firmware/modules/tr_nonbonded/tb/vhdl/tb_serdes.vhd
+    $UNB/Firmware/modules/tr_nonbonded/tb/vhdl/tb_tr_nonbonded.vhd