diff --git a/libraries/io/tr_xaui/hdllib.cfg b/libraries/io/tr_xaui/hdllib.cfg
index eafc2f08b8e4467c621a08b1a7eaf6e23d2d323b..26b8a9d491c3a168c89ba19da5c4fa936af918e4 100644
--- a/libraries/io/tr_xaui/hdllib.cfg
+++ b/libraries/io/tr_xaui/hdllib.cfg
@@ -1,36 +1,26 @@
 hdl_lib_name = tr_xaui
 hdl_library_clause_name = tr_xaui_lib
-hdl_lib_uses = common dp mdio diagnostics tr_nonbonded unb1_board
+hdl_lib_uses = common dp mdio diagnostics tr_nonbonded tech_xaui
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
 build_dir_synth = $HDL_BUILD_DIR
 
+modelsim_search_libraries =
+    altera_ver lpm_ver sgate_ver altera_mf_ver altera_lnsim_ver stratixiv_ver stratixiv_hssi_ver stratixiv_pcie_hip_ver
+    altera     lpm     sgate     altera_mf     altera_lnsim     stratixiv     stratixiv_hssi     stratixiv_pcie_hip
+    
 synth_files =
-    $UNB/Firmware/modules/tr_xaui/src/vhdl/tr_xaui_pkg.vhd
-
-    $UNB/Firmware/modules/tr_xaui/src/ip/megawizard/phy_xaui_0.vhd
-    $UNB/Firmware/modules/tr_xaui/src/ip/megawizard/phy_xaui_1.vhd
-    $UNB/Firmware/modules/tr_xaui/src/ip/megawizard/phy_xaui_2.vhd
-    $UNB/Firmware/modules/tr_xaui/src/ip/megawizard/phy_xaui_soft.vhd
-    $UNB/Firmware/modules/tr_xaui/src/ip/megawizard/reconfig_soft.vhd
-    $UNB/Firmware/modules/tr_xaui/src/ip/megawizard/reconfig.vhd
-
-    $UNB/Firmware/modules/tr_xaui/src/vhdl/phy_xaui.vhd
-    $UNB/Firmware/modules/tr_xaui/src/vhdl/tr_xaui_align_dly.vhd
-    $UNB/Firmware/modules/tr_xaui/src/vhdl/tr_xaui_deframer.vhd
-    $UNB/Firmware/modules/tr_xaui/src/vhdl/tr_xaui_framer.vhd
-
-    $UNB/Firmware/modules/tr_xaui/tb/vhdl/sim_xaui.vhd
-
-    $UNB/Firmware/modules/tr_xaui/src/vhdl/tr_xaui.vhd
-    $UNB/Firmware/modules/tr_xaui/src/vhdl/mms_tr_xaui.vhd
+    tb/vhdl/sim_xaui.vhd
+    
+    src/vhdl/tr_xaui_align_dly.vhd
+    src/vhdl/tr_xaui_deframer.vhd
+    src/vhdl/tr_xaui_framer.vhd
+    
+    src/vhdl/tr_xaui.vhd
+    src/vhdl/mms_tr_xaui.vhd
 
 test_bench_files = 
     $UNB/Firmware/modules/tr_xaui/tb/vhdl/tb_tr_xaui.vhd
-    $UNB/Firmware/modules/tr_xaui/tb/vhdl/tb_tr_xaui_deframer.vhd
-    $UNB/Firmware/modules/tr_xaui/tb/vhdl/tb_tr_xaui_framer.vhd
-
-quartus_qip_files =
-    $UNB/Firmware/modules/tr_xaui/src/ip/megawizard/phy_xaui_soft_qip/phy_xaui_soft.qip
-    $UNB/Firmware/modules/tr_xaui/src/ip/megawizard/generated/phy_xaui_0.qip
+    tb/vhdl/tb_tr_xaui_deframer.vhd
+    tb/vhdl/tb_tr_xaui_framer.vhd