diff --git a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_bg/compaan_unb1_dp_offload_bg.vhd b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_bg/compaan_unb1_dp_offload_bg.vhd
index 47a2d9cda9e2dc282766dc79bbd13205ccb4922c..ec82599ad9a2967f35f17db3d73c1abbbccefcf2 100644
--- a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_bg/compaan_unb1_dp_offload_bg.vhd
+++ b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_bg/compaan_unb1_dp_offload_bg.vhd
@@ -24,7 +24,7 @@
 -- . Create a block generator and databuffer in a node. 
 -- Description:
 
-LIBRARY IEEE, unb1_board_lib, compaan_unb1_dp_offload_lib;
+LIBRARY IEEE, unb1_board_lib;
 use IEEE.STD_LOGIC_1164.ALL;
 USE IEEE.NUMERIC_STD.ALL;
 USE unb1_board_lib.unb1_board_pkg.ALL;
@@ -69,7 +69,7 @@ ARCHITECTURE str OF compaan_unb1_dp_offload_bg IS
                                         
 BEGIN
 
-  u_revision : ENTITY compaan_unb1_dp_offload_lib.compaan_unb1_dp_offload 
+  u_revision : ENTITY work.compaan_unb1_dp_offload 
     GENERIC MAP (
       g_design_name  => g_design_name, 
       g_design_note  => g_design_note, 
diff --git a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_bg/hdllib.cfg b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_bg/hdllib.cfg
index 826c5baca93a55facb949a71ee8b231d8ac54da0..92cbbbf0cf00cc58b439a1d3dd04d9419d7a67f9 100644
--- a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_bg/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_bg/hdllib.cfg
@@ -1,7 +1,6 @@
 hdl_lib_name = compaan_unb1_dp_offload_bg
 hdl_library_clause_name = compaan_unb1_dp_offload_bg_lib
-hdl_lib_uses_synth = unb1_board compaan_unb1_dp_offload
-
+hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag ipcore
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
@@ -9,9 +8,19 @@ build_dir_synth = $HDL_BUILD_DIR
 
 synth_top_level_entity =                                                                                                                                                            
                                                                                                                                                                                     
-synth_files = compaan_unb1_dp_offload_bg.vhd
+synth_files = 
+    $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_dp_offload_bg/sopc_compaan_unb1_dp_offload.vhd
+    ../../src/vhdl/pkg_signals.vhd
+    ../../src/vhdl/compaan_design.vhd
+    ../../src/vhdl/mmm_compaan_unb1_dp_offload.vhd
+    ../../src/vhdl/compaan_unb1_dp_offload.vhd
+    compaan_unb1_dp_offload_bg.vhd
 
 test_bench_files = 
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload.vhd
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload_2ins.vhd
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_lb.vhd
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_co.vhd
 
 quartus_copy_files = ../../quartus/sopc_compaan_unb1_dp_offload.sopc .
 
@@ -21,5 +30,4 @@ quartus_qsf_files =
 quartus_tcl_files =
     ../../quartus/compaan_unb1_dp_offload_pins.tcl
     
-quartus_qip_files =
-    $HDL_BUILD_DIR/quartus/compaan_unb1_dp_offload_bg/sopc_compaan_unb1_dp_offload.qip
+quartus_qip_files = $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_dp_offload_bg/sopc_compaan_unb1_dp_offload.qip
diff --git a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_co/compaan_unb1_dp_offload_co.vhd b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_co/compaan_unb1_dp_offload_co.vhd
index e7c9a8b217ba0a73d9418ced2445579711135154..00d50a326ab04379255c9b65f1f564aa93076d6c 100644
--- a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_co/compaan_unb1_dp_offload_co.vhd
+++ b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_co/compaan_unb1_dp_offload_co.vhd
@@ -24,7 +24,7 @@
 -- . Creates image with compaan functionality
 -- Description:
 
-LIBRARY IEEE, unb1_board_lib, compaan_unb1_dp_offload_lib;
+LIBRARY IEEE, unb1_board_lib;
 use IEEE.STD_LOGIC_1164.ALL;
 USE IEEE.NUMERIC_STD.ALL;
 USE unb1_board_lib.unb1_board_pkg.ALL;
@@ -69,7 +69,7 @@ ARCHITECTURE str OF compaan_unb1_dp_offload_co IS
                                         
 BEGIN
 
-  u_revision : ENTITY compaan_unb1_dp_offload_lib.compaan_unb1_dp_offload 
+  u_revision : ENTITY work.compaan_unb1_dp_offload 
     GENERIC MAP (
       g_design_name  => g_design_name, 
       g_design_note  => g_design_note, 
diff --git a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_co/hdllib.cfg b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_co/hdllib.cfg
index 5220d0968828a5f977ce75fd236202cf98ae2e6f..361d4df70de44c40ccf6322a8834ed17c3ec73a7 100644
--- a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_co/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_co/hdllib.cfg
@@ -1,7 +1,6 @@
 hdl_lib_name = compaan_unb1_dp_offload_co
 hdl_library_clause_name = compaan_unb1_dp_offload_co_lib
-hdl_lib_uses_synth = unb1_board compaan_unb1_dp_offload
-
+hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag ipcore
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
@@ -9,9 +8,19 @@ build_dir_synth = $HDL_BUILD_DIR
 
 synth_top_level_entity =                                                                                                                                                            
                                                                                                                                                                                     
-synth_files = compaan_unb1_dp_offload_co.vhd
+synth_files = 
+    $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_dp_offload_co/sopc_compaan_unb1_dp_offload.vhd
+    ../../src/vhdl/pkg_signals.vhd
+    ../../src/vhdl/compaan_design.vhd
+    ../../src/vhdl/mmm_compaan_unb1_dp_offload.vhd
+    ../../src/vhdl/compaan_unb1_dp_offload.vhd
+    compaan_unb1_dp_offload_co.vhd
 
 test_bench_files = 
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload.vhd
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload_2ins.vhd
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_lb.vhd
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_co.vhd
 
 quartus_copy_files = ../../quartus/sopc_compaan_unb1_dp_offload.sopc .
 
@@ -21,5 +30,4 @@ quartus_qsf_files =
 quartus_tcl_files =
     ../../quartus/compaan_unb1_dp_offload_pins.tcl
     
-quartus_qip_files =
-    $HDL_BUILD_DIR/quartus/compaan_unb1_dp_offload_co/sopc_compaan_unb1_dp_offload.qip
+quartus_qip_files = $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_dp_offload_co/sopc_compaan_unb1_dp_offload.qip
diff --git a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_lb/compaan_unb1_dp_offload_lb.vhd b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_lb/compaan_unb1_dp_offload_lb.vhd
index 216a2b30ce0d423bcd22e493c7da82e93c82ee50..dad9c5ab14a21d15958222cfab9bc7136cad1fde 100644
--- a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_lb/compaan_unb1_dp_offload_lb.vhd
+++ b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_lb/compaan_unb1_dp_offload_lb.vhd
@@ -25,7 +25,7 @@
 --   Loopback. 
 -- Description:
 
-LIBRARY IEEE, unb1_board_lib, compaan_unb1_dp_offload_lib;
+LIBRARY IEEE, unb1_board_lib;
 use IEEE.STD_LOGIC_1164.ALL;
 USE IEEE.NUMERIC_STD.ALL;
 USE unb1_board_lib.unb1_board_pkg.ALL;
@@ -70,7 +70,7 @@ ARCHITECTURE str OF compaan_unb1_dp_offload_lb IS
                                         
 BEGIN
 
-  u_revision : ENTITY compaan_unb1_dp_offload_lib.compaan_unb1_dp_offload 
+  u_revision : ENTITY work.compaan_unb1_dp_offload 
     GENERIC MAP (
       g_design_name  => g_design_name, 
       g_design_note  => g_design_note, 
diff --git a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_lb/hdllib.cfg b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_lb/hdllib.cfg
index 7ba575e424287ac15370d99deb081ea5ac7c4359..a607ba9d3b584312061c129ce0a81a13395ec423 100644
--- a/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_lb/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_dp_offload/revisions/compaan_unb1_dp_offload_lb/hdllib.cfg
@@ -1,7 +1,6 @@
 hdl_lib_name = compaan_unb1_dp_offload_lb
 hdl_library_clause_name = compaan_unb1_dp_offload_lb_lib
-hdl_lib_uses_synth = unb1_board compaan_unb1_dp_offload
-
+hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag ipcore
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
@@ -9,9 +8,19 @@ build_dir_synth = $HDL_BUILD_DIR
 
 synth_top_level_entity =                                                                                                                                                            
                                                                                                                                                                                     
-synth_files = compaan_unb1_dp_offload_lb.vhd
+synth_files = 
+    $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_dp_offload_lb/sopc_compaan_unb1_dp_offload.vhd
+    ../../src/vhdl/pkg_signals.vhd
+    ../../src/vhdl/compaan_design.vhd
+    ../../src/vhdl/mmm_compaan_unb1_dp_offload.vhd
+    ../../src/vhdl/compaan_unb1_dp_offload.vhd
+    compaan_unb1_dp_offload_lb.vhd
 
 test_bench_files = 
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload.vhd
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload_2ins.vhd
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_lb.vhd
+    ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_co.vhd
 
 quartus_copy_files = ../../quartus/sopc_compaan_unb1_dp_offload.sopc .
 
@@ -21,5 +30,4 @@ quartus_qsf_files =
 quartus_tcl_files =
     ../../quartus/compaan_unb1_dp_offload_pins.tcl
     
-quartus_qip_files =
-    $HDL_BUILD_DIR/quartus/compaan_unb1_dp_offload_lb/sopc_compaan_unb1_dp_offload.qip
+quartus_qip_files = $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_dp_offload_lb/sopc_compaan_unb1_dp_offload.qip