From b232c8c75b5b0dff9e4d46b7272671869c8836a0 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Tue, 19 Apr 2016 10:31:51 +0000
Subject: [PATCH] Added [section headers].

---
 .../designs/aartfaac_bn_sdo/hdllib.cfg        |  23 +-
 .../designs/aartfaac_fn_sdo/hdllib.cfg        |  19 +-
 .../aartfaac/libraries/rsp_serdes/hdllib.cfg  |   7 +-
 .../libraries/rsp_terminal/hdllib.cfg         |   6 +
 .../aartfaac/systems/aartfaac_sdo/hdllib.cfg  |  14 +-
 .../apertif_unb1_bn_filterbank/hdllib.cfg     |   8 +-
 .../apertif_unb1_cor_mesh_ref/hdllib.cfg      |   8 +-
 .../apertif_unb1_correlator/hdllib.cfg        |  25 +-
 .../apertif_unb1_correlator_filter/hdllib.cfg |  23 +-
 .../apertif_unb1_correlator_full/hdllib.cfg   |  23 +-
 .../apertif_unb1_correlator_lite/hdllib.cfg   |  25 +-
 .../hdllib.cfg                                |  23 +-
 .../hdllib.cfg                                |  23 +-
 .../hdllib.cfg                                |  23 +-
 .../hdllib.cfg                                |  23 +-
 .../hdllib.cfg                                |  25 +-
 .../apertif_unb1_correlator_simple/hdllib.cfg |  23 +-
 .../hdllib.cfg                                |  20 +-
 .../hdllib.cfg                                |  16 +-
 .../hdllib.cfg                                |  22 +-
 .../hdllib.cfg                                |  23 +-
 .../hdllib.cfg                                |  22 +-
 .../designs/apertif_unb1_fn_bf_emu/hdllib.cfg |  15 +-
 .../apertif/libraries/apertif/hdllib.cfg      |   7 +
 applications/apertif/matlab/corner_turn.m     |  19 +-
 .../apertif/matlab/delay_tracking_pfb.m       | 123 ++++---
 applications/apertif/matlab/pfir.m            |   5 +-
 applications/apertif/matlab/two_pfb.m         | 341 +++++++++++++-----
 applications/apertif/matlab/wg.m              |   2 +
 .../apertif/systems/apertif_bf_xc/hdllib.cfg  |   8 +-
 .../apertif/systems/apertif_bg_xc/hdllib.cfg  |  13 +-
 .../designs/arts_unb1_bg_offload/hdllib.cfg   |  22 +-
 .../arts_unb1_sc1/src/generated/hdllib.cfg    |  19 +-
 .../arts_unb1_sc1_bf_offload/hdllib.cfg       |  21 +-
 .../arts_unb2_sc1/src/generated/hdllib.cfg    |  21 +-
 .../src/generated/hdllib.cfg                  |  21 +-
 .../designs/compaan_unb1_10g/hdllib.cfg       |  12 +-
 .../compaan_unb1_10g_blockgen/hdllib.cfg      |  15 +-
 .../compaan_unb1_10g_compaan/hdllib.cfg       |  12 +-
 .../compaan_unb1_10g_loopback/hdllib.cfg      |  12 +-
 .../designs/compaan_unb1_10g_app/hdllib.cfg   |   9 +-
 .../designs/compaan_unb1_10g_bg_db/hdllib.cfg |   9 +-
 .../compaan_unb1_dp_offload/hdllib.cfg        |   8 +-
 .../compaan_unb1_dp_offload_bg/hdllib.cfg     |  12 +-
 .../compaan_unb1_dp_offload_co/hdllib.cfg     |  13 +-
 .../compaan_unb1_dp_offload_lb/hdllib.cfg     |  12 +-
 applications/compaan/libraries/hdllib.cfg     |   8 +-
 .../common/altera/hdllib.cfg                  |  10 +-
 .../common/common/hdllib.cfg                  |  10 +-
 .../common/const_connector/hdllib.cfg         |  10 +-
 .../common/extern_connector/hdllib.cfg        |  10 +-
 .../compaandesign_com/common/fifo/hdllib.cfg  |  10 +-
 .../common/hwnode/hdllib.cfg                  |  10 +-
 .../common/wire_connector/hdllib.cfg          |  10 +-
 .../ipcore2rtl/functions/hdllib.cfg           |   9 +-
 .../ipcore2rtl/hwn_nd_1/hdllib.cfg            |  10 +-
 .../ipcore2rtl/hwn_nd_2/hdllib.cfg            |  10 +-
 .../ipcore2rtl/hwn_nd_3/hdllib.cfg            |  10 +-
 .../ipcore2rtl/register_rf/hdllib.cfg         |  10 +-
 .../compaan/libraries/vhdl_altera/hdllib.cfg  |  12 +-
 .../designs/dig_receiver_bn/hdllib.cfg        |  19 +-
 .../designs/dig_receiver_fn/hdllib.cfg        |  19 +-
 .../libraries/common_OA/hdllib.cfg            |  10 +-
 .../dig_receiver/libraries/dbbc/hdllib.cfg    |   9 +-
 .../libraries/digital_receiver/hdllib.cfg     |  11 +-
 .../dig_receiver/libraries/dr_mesh/hdllib.cfg |  10 +-
 .../libraries/fft_module_n/hdllib.cfg         |  10 +-
 .../libraries/polyfilt/hdllib.cfg             |  10 +-
 .../libraries/test_generator/hdllib.cfg       |  12 +-
 .../libraries/udp_packetizer/hdllib.cfg       |  10 +-
 .../libraries/vdif_formatter/hdllib.cfg       |  10 +-
 applications/rfidb/designs/rfidb/hdllib.cfg   |  27 +-
 .../rfidb/librairies/detector/hdllib.cfg      |   7 +-
 .../designs/stagiair_unb1_wave_gen/hdllib.cfg |   6 +-
 .../stagiair/libraries/wave_gen/hdllib.cfg    |   6 +-
 .../designs/unb1_bn_capture/hdllib.cfg        |  17 +-
 .../designs/unb1_bn_terminal_bg/hdllib.cfg    |  15 +-
 boards/uniboard1/designs/unb1_ddr3/hdllib.cfg |   4 +
 .../unb1_ddr3_reorder_dual_rank/hdllib.cfg    |  17 +-
 .../unb1_ddr3_reorder_single_rank/hdllib.cfg  |  16 +-
 .../designs/unb1_ddr3_transpose/hdllib.cfg    |  14 +-
 .../designs/unb1_fn_terminal_db/hdllib.cfg    |   8 +-
 .../uniboard1/designs/unb1_minimal/hdllib.cfg |   7 +-
 .../unb1_minimal_mm_arbiter/hdllib.cfg        |   6 +-
 .../revisions/unb1_minimal_qsys/hdllib.cfg    |   3 +-
 .../unb1_minimal_qsys_wo_pll/hdllib.cfg       |   6 +-
 .../revisions/unb1_minimal_sopc/hdllib.cfg    |   6 +-
 .../unb1_terminal_bg_mesh_db/hdllib.cfg       |   8 +-
 boards/uniboard1/designs/unb1_test/hdllib.cfg |   7 +-
 .../revisions/unb1_test_10GbE/hdllib.cfg      |  10 +-
 .../unb1_test_10GbE_tx_only/hdllib.cfg        |  10 +-
 .../revisions/unb1_test_1GbE/hdllib.cfg       |  10 +-
 .../revisions/unb1_test_all/hdllib.cfg        |  15 +-
 .../revisions/unb1_test_ddr/hdllib.cfg        |  15 +-
 .../unb1_test_ddr_16g_MB_I/hdllib.cfg         |  17 +-
 .../unb1_test_ddr_16g_MB_II/hdllib.cfg        |  16 +-
 .../unb1_test_ddr_16g_MB_I_II/hdllib.cfg      |  13 +-
 .../revisions/unb1_test_ddr_MB_I/hdllib.cfg   |  16 +-
 .../revisions/unb1_test_ddr_MB_II/hdllib.cfg  |  17 +-
 .../unb1_test_ddr_MB_I_II/hdllib.cfg          |  12 +-
 .../designs/unb1_tr_10GbE/hdllib.cfg          |  23 +-
 .../uniboard1/libraries/unb1_board/hdllib.cfg |   8 +-
 boards/uniboard2/designs/unb2_led/hdllib.cfg  |   6 +-
 .../uniboard2/designs/unb2_minimal/hdllib.cfg |   8 +-
 boards/uniboard2/designs/unb2_test/hdllib.cfg |   7 +-
 .../revisions/unb2_test_10GbE/hdllib.cfg      |  11 +-
 .../revisions/unb2_test_1GbE/hdllib.cfg       |  10 +-
 .../revisions/unb2_test_all/hdllib.cfg        |   9 +-
 .../revisions/unb2_test_ddr_MB_I/hdllib.cfg   |  10 +-
 .../revisions/unb2_test_ddr_MB_II/hdllib.cfg  |   8 +-
 .../unb2_test_ddr_MB_I_II/hdllib.cfg          |   8 +-
 .../uniboard2/libraries/unb2_board/hdllib.cfg |   7 +-
 .../libraries/unb2_board_10gbe/hdllib.cfg     |   7 +-
 .../designs/unb2a_heater/hdllib.cfg           |   8 +-
 .../designs/unb2a_minimal/hdllib.cfg          |   8 +-
 .../uniboard2a/designs/unb2a_test/hdllib.cfg  |   7 +-
 .../revisions/unb2a_test_10GbE/hdllib.cfg     |   7 +-
 .../revisions/unb2a_test_1GbE/hdllib.cfg      |  10 +-
 .../revisions/unb2a_test_all/hdllib.cfg       |  11 +-
 .../revisions/unb2a_test_ddr_MB_I/hdllib.cfg  |  10 +-
 .../revisions/unb2a_test_ddr_MB_II/hdllib.cfg |   8 +-
 .../unb2a_test_ddr_MB_I_II/hdllib.cfg         |   8 +-
 .../libraries/unb2a_board/hdllib.cfg          |   7 +-
 .../libraries/unb2a_board_10gbe/hdllib.cfg    |   7 +-
 libraries/base/common/hdllib.cfg              |   8 +-
 libraries/base/common_mult/hdllib.cfg         |   8 +-
 libraries/base/diag/hdllib.cfg                |   7 +-
 libraries/base/diagnostics/hdllib.cfg         |   8 +-
 .../dp/designs/unb1_dp_offload/hdllib.cfg     |  23 +-
 libraries/base/dp/hdllib.cfg                  |   9 +-
 libraries/base/mm/hdllib.cfg                  |   8 +-
 libraries/base/reorder/hdllib.cfg             |  13 +-
 libraries/base/sens/hdllib.cfg                |   7 +-
 libraries/base/ss/hdllib.cfg                  |   8 +-
 libraries/base/tst/hdllib.cfg                 |   8 +-
 libraries/base/uth/hdllib.cfg                 |   8 +-
 libraries/base/util/hdllib.cfg                |   8 +-
 .../dsp/bf/designs/unb1_fn_bf/hdllib.cfg      |   9 +-
 libraries/dsp/bf/hdllib.cfg                   |   8 +-
 .../designs/unb1_correlator/hdllib.cfg        |  16 +-
 libraries/dsp/correlator/hdllib.cfg           |  11 +-
 libraries/dsp/fft/hdllib.cfg                  |   8 +-
 libraries/dsp/filter/hdllib.cfg               |   7 +-
 libraries/dsp/rTwoSDF/hdllib.cfg              |  10 +-
 libraries/dsp/st/hdllib.cfg                   |   7 +-
 libraries/dsp/wpfb/hdllib.cfg                 |   7 +-
 libraries/external/easics/hdllib.cfg          |   9 +-
 libraries/external/numonyx_m25p128/hdllib.cfg |   8 +-
 libraries/io/aduh/hdllib.cfg                  |   7 +-
 libraries/io/ddr/hdllib.cfg                   |  13 +-
 libraries/io/ddr3/hdllib.cfg                  |  14 +-
 libraries/io/epcs/hdllib.cfg                  |   8 +-
 libraries/io/eth/hdllib.cfg                   |   6 +-
 libraries/io/fpga_sense/hdllib.cfg            |   7 +-
 libraries/io/i2c/hdllib.cfg                   |   6 +-
 libraries/io/mac_10g/hdllib.cfg               |   8 +-
 libraries/io/mdio/hdllib.cfg                  |   8 +-
 libraries/io/ppsh/hdllib.cfg                  |   8 +-
 libraries/io/remu/hdllib.cfg                  |   8 +-
 libraries/io/tr_10GbE/hdllib.cfg              |   7 +-
 libraries/io/tr_nonbonded/hdllib.cfg          |   8 +-
 libraries/io/tr_xaui/hdllib.cfg               |   9 +-
 libraries/technology/10gbase_r/hdllib.cfg     |  57 +--
 libraries/technology/clkbuf/hdllib.cfg        |   8 +-
 libraries/technology/ddr/hdllib.cfg           |   7 +-
 libraries/technology/eth_10g/hdllib.cfg       |   7 +-
 libraries/technology/fifo/hdllib.cfg          |   7 +-
 libraries/technology/flash/hdllib.cfg         |   8 +-
 .../technology/fpga_temp_sens/hdllib.cfg      |   8 +-
 .../technology/fpga_voltage_sens/hdllib.cfg   |   8 +-
 .../technology/fractional_pll/hdllib.cfg      |   8 +-
 libraries/technology/hdllib.cfg               |   8 +-
 libraries/technology/iobuf/hdllib.cfg         |   8 +-
 .../ip_arria10/clkbuf_global/hdllib.cfg       |  11 +-
 .../ip_arria10/complex_mult/hdllib.cfg        |  11 +-
 .../ip_arria10/complex_mult_rtl/hdllib.cfg    |   8 +-
 .../technology/ip_arria10/ddio/hdllib.cfg     |  11 +-
 .../ip_arria10/ddr4_4g_1600/hdllib.cfg        |  11 +-
 .../ip_arria10/ddr4_4g_2000/hdllib.cfg        |  11 +-
 .../ip_arria10/ddr4_8g_2400/hdllib.cfg        |  11 +-
 .../ip_arria10/ddr4_mem_model_141/hdllib.cfg  |  12 +-
 .../technology/ip_arria10/fifo/hdllib.cfg     |   8 +-
 .../ip_arria10/flash/asmi_parallel/hdllib.cfg |  11 +-
 .../ip_arria10/flash/remote_update/hdllib.cfg |  11 +-
 .../fractional_pll_clk125/hdllib.cfg          |  11 +-
 .../fractional_pll_clk200/hdllib.cfg          |  11 +-
 .../technology/ip_arria10/mac_10g/hdllib.cfg  |  11 +-
 .../technology/ip_arria10/mult/hdllib.cfg     |   8 +-
 .../ip_arria10/phy_10gbase_r/hdllib.cfg       |  11 +-
 .../ip_arria10/phy_10gbase_r_12/hdllib.cfg    |  11 +-
 .../ip_arria10/phy_10gbase_r_24/hdllib.cfg    |  11 +-
 .../ip_arria10/phy_10gbase_r_4/hdllib.cfg     |  11 +-
 .../ip_arria10/phy_10gbase_r_48/hdllib.cfg    |  11 +-
 .../ip_arria10/pll_clk125/hdllib.cfg          |  11 +-
 .../ip_arria10/pll_clk200/hdllib.cfg          |  11 +-
 .../ip_arria10/pll_clk25/hdllib.cfg           |  11 +-
 .../pll_xgmii_mac_clocks/hdllib.cfg           |  11 +-
 .../technology/ip_arria10/ram/hdllib.cfg      |   8 +-
 .../ip_arria10/temp_sense/hdllib.cfg          |  11 +-
 .../ip_arria10/transceiver_pll_10g/hdllib.cfg |  11 +-
 .../transceiver_reset_controller_1/hdllib.cfg |  11 +-
 .../hdllib.cfg                                |  11 +-
 .../hdllib.cfg                                |  11 +-
 .../transceiver_reset_controller_4/hdllib.cfg |  11 +-
 .../hdllib.cfg                                |  11 +-
 .../ip_arria10/tse_sgmii_gx/hdllib.cfg        |  11 +-
 .../ip_arria10/tse_sgmii_lvds/hdllib.cfg      |  11 +-
 .../ip_arria10/voltage_sense/hdllib.cfg       |  11 +-
 .../clkbuf_global/hdllib.cfg                  |  11 +-
 .../ip_arria10_e3sge3/complex_mult/hdllib.cfg |  11 +-
 .../ip_arria10_e3sge3/ddio/hdllib.cfg         |  11 +-
 .../ip_arria10_e3sge3/ddr4_4g_1600/hdllib.cfg |  11 +-
 .../ip_arria10_e3sge3/ddr4_4g_2000/hdllib.cfg |  11 +-
 .../ip_arria10_e3sge3/ddr4_8g_1600/hdllib.cfg |  11 +-
 .../ip_arria10_e3sge3/ddr4_8g_2400/hdllib.cfg |  11 +-
 .../ip_arria10_e3sge3/fifo/hdllib.cfg         |   8 +-
 .../flash/asmi_parallel/hdllib.cfg            |  11 +-
 .../flash/remote_update/hdllib.cfg            |  11 +-
 .../fractional_pll_clk125/hdllib.cfg          |  11 +-
 .../fractional_pll_clk200/hdllib.cfg          |  11 +-
 .../ip_arria10_e3sge3/mac_10g/hdllib.cfg      |  11 +-
 .../ip_arria10_e3sge3/mult_add4/hdllib.cfg    |   9 +-
 .../phy_10gbase_r/hdllib.cfg                  |  11 +-
 .../phy_10gbase_r_12/hdllib.cfg               |  11 +-
 .../phy_10gbase_r_24/hdllib.cfg               |  11 +-
 .../phy_10gbase_r_4/hdllib.cfg                |  11 +-
 .../phy_10gbase_r_48/hdllib.cfg               |  11 +-
 .../ip_arria10_e3sge3/pll_clk125/hdllib.cfg   |  11 +-
 .../ip_arria10_e3sge3/pll_clk200/hdllib.cfg   |  11 +-
 .../ip_arria10_e3sge3/pll_clk25/hdllib.cfg    |  11 +-
 .../pll_xgmii_mac_clocks/hdllib.cfg           |  11 +-
 .../ip_arria10_e3sge3/ram/hdllib.cfg          |   8 +-
 .../ip_arria10_e3sge3/temp_sense/hdllib.cfg   |  11 +-
 .../transceiver_pll_10g/hdllib.cfg            |  11 +-
 .../transceiver_reset_controller_1/hdllib.cfg |  11 +-
 .../hdllib.cfg                                |  11 +-
 .../hdllib.cfg                                |  11 +-
 .../transceiver_reset_controller_4/hdllib.cfg |  11 +-
 .../hdllib.cfg                                |  11 +-
 .../ip_arria10_e3sge3/tse_sgmii_gx/hdllib.cfg |  11 +-
 .../tse_sgmii_lvds/hdllib.cfg                 |  11 +-
 .../voltage_sense/hdllib.cfg                  |  11 +-
 .../technology/ip_stratixiv/ddio/hdllib.cfg   |   8 +-
 .../ip_stratixiv/ddr3_mem_model/hdllib.cfg    |  12 +-
 .../ddr3_uphy_16g_dual_rank_800/hdllib.cfg    |  11 +-
 .../ddr3_uphy_4g_800_master/hdllib.cfg        |  11 +-
 .../ddr3_uphy_4g_800_slave/hdllib.cfg         |  11 +-
 .../hdllib.cfg                                |  11 +-
 .../hdllib.cfg                                |  11 +-
 .../technology/ip_stratixiv/fifo/hdllib.cfg   |   8 +-
 .../technology/ip_stratixiv/flash/hdllib.cfg  |   7 +-
 .../ip_stratixiv/mac_10g/hdllib.cfg           |  11 +-
 .../technology/ip_stratixiv/mult/hdllib.cfg   |   8 +-
 .../ip_stratixiv_phy_xaui_0.vhd               |   2 +-
 .../mentor/msim_setup.tcl                     |   2 +-
 .../ip_stratixiv_phy_xaui_soft.vhd            |   2 +-
 .../mentor/msim_setup.tcl                     |   2 +-
 .../ip_stratixiv/phy_xaui/hdllib.cfg          |  13 +-
 .../technology/ip_stratixiv/pll/hdllib.cfg    |   8 +-
 .../ip_stratixiv/pll_clk25/hdllib.cfg         |   8 +-
 .../technology/ip_stratixiv/ram/hdllib.cfg    |   8 +-
 .../ip_stratixiv/transceiver/hdllib.cfg       |   8 +-
 .../ip_stratixiv/tse_sgmii_gx/hdllib.cfg      |   6 +-
 .../ip_stratixiv/tse_sgmii_lvds/hdllib.cfg    |   6 +-
 libraries/technology/ip_virtex4/hdllib.cfg    |   4 +-
 libraries/technology/mac_10g/hdllib.cfg       |   6 +-
 libraries/technology/memory/hdllib.cfg        |   8 +-
 libraries/technology/mult/hdllib.cfg          |   8 +-
 libraries/technology/pll/hdllib.cfg           |   8 +-
 libraries/technology/transceiver/hdllib.cfg   |   8 +-
 libraries/technology/tse/hdllib.cfg           |  15 +-
 libraries/technology/xaui/hdllib.cfg          |  15 +-
 272 files changed, 2348 insertions(+), 1100 deletions(-)

diff --git a/applications/aartfaac/designs/aartfaac_bn_sdo/hdllib.cfg b/applications/aartfaac/designs/aartfaac_bn_sdo/hdllib.cfg
index 7d0c561600..d55c7bbfb8 100644
--- a/applications/aartfaac/designs/aartfaac_bn_sdo/hdllib.cfg
+++ b/applications/aartfaac/designs/aartfaac_bn_sdo/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = aartfaac_bn_sdo
 hdl_library_clause_name = aartfaac_bn_sdo_lib
 hdl_lib_uses_synth = unb1_board rsp_terminal ss
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    src/quartus/sopc_aartfaac_bn_sdo.sopc .
-    src/hex/ hex
-
-modelsim_copy_files = 
-    src/hex/ hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/aartfaac_bn_sdo/sopc_aartfaac_bn_sdo.vhd
     src/vhdl/mmm_aartfaac_bn_sdo.vhd
@@ -23,6 +13,19 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_aartfaac_bn_sdo.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    src/hex/ hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    src/quartus/sopc_aartfaac_bn_sdo.sopc .
+    src/hex/ hex
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/aartfaac/designs/aartfaac_fn_sdo/hdllib.cfg b/applications/aartfaac/designs/aartfaac_fn_sdo/hdllib.cfg
index 67c77bf83a..53620291b8 100644
--- a/applications/aartfaac/designs/aartfaac_fn_sdo/hdllib.cfg
+++ b/applications/aartfaac/designs/aartfaac_fn_sdo/hdllib.cfg
@@ -2,16 +2,8 @@ hdl_lib_name = aartfaac_fn_sdo
 hdl_library_clause_name = aartfaac_fn_sdo_lib
 hdl_lib_uses_synth = unb1_board tr_xaui tr_10GbE tr_nonbonded
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    src/quartus/sopc_aartfaac_fn_sdo.sopc .
-
-modelsim_copy_files = 
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/aartfaac_fn_sdo/sopc_aartfaac_fn_sdo.vhd
     src/vhdl/mmm_aartfaac_fn_sdo.vhd
@@ -19,6 +11,17 @@ synth_files =
     
 test_bench_files = 
  
+ 
+[modelsim_project_file]
+modelsim_copy_files = 
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    src/quartus/sopc_aartfaac_fn_sdo.sopc .
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/aartfaac/libraries/rsp_serdes/hdllib.cfg b/applications/aartfaac/libraries/rsp_serdes/hdllib.cfg
index 6b32076dd5..2279be2925 100644
--- a/applications/aartfaac/libraries/rsp_serdes/hdllib.cfg
+++ b/applications/aartfaac/libraries/rsp_serdes/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = rsp_serdes
 hdl_library_clause_name = rsp_serdes_lib
 hdl_lib_uses_synth =  
 hdl_lib_uses_sim = common dp
-
 hdl_lib_technology = 
 
 synth_files =
@@ -11,3 +10,9 @@ synth_files =
 test_bench_files = 
     $SVN/Aartfaac/trunk/Firmware/modules/rsp_serdes/tb/vhdl/tb_rsp_serdes.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/aartfaac/libraries/rsp_terminal/hdllib.cfg b/applications/aartfaac/libraries/rsp_terminal/hdllib.cfg
index 647500e0a0..b185aeb6e3 100644
--- a/applications/aartfaac/libraries/rsp_terminal/hdllib.cfg
+++ b/applications/aartfaac/libraries/rsp_terminal/hdllib.cfg
@@ -18,5 +18,11 @@ test_bench_files =
     $SVN/Aartfaac/trunk/Firmware/modules/rsp_terminal/tb/vhdl/tb_rsp_terminal.vhd
     $SVN/Aartfaac/trunk/Firmware/modules/rsp_terminal/tb/vhdl/tb_tb_rsp_terminal.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =                                                                                                                                               
      $SVN/Aartfaac/trunk/Firmware/modules/rsp_terminal/src/hex/ hex
+
+
+[quartus_project_file]
+
diff --git a/applications/aartfaac/systems/aartfaac_sdo/hdllib.cfg b/applications/aartfaac/systems/aartfaac_sdo/hdllib.cfg
index 22b951949d..8b347b977e 100644
--- a/applications/aartfaac/systems/aartfaac_sdo/hdllib.cfg
+++ b/applications/aartfaac/systems/aartfaac_sdo/hdllib.cfg
@@ -5,17 +5,19 @@ hdl_lib_uses_sim = aartfaac_bn_sdo aartfaac_fn_sdo
 
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-
-modelsim_copy_files = 
-
 synth_files =
     
 test_bench_files = 
      tb/vhdl/tb_aartfaac_sdo.vhd
 
+
+[modelsim_project_file] 
+modelsim_copy_files = 
+
+
+[quartus_project_file] 
+synth_top_level_entity =
+quartus_copy_files =
 quartus_qsf_files =    
 quartus_tcl_files =    
 quartus_vhdl_files = 
diff --git a/applications/apertif/designs/apertif_unb1_bn_filterbank/hdllib.cfg b/applications/apertif/designs/apertif_unb1_bn_filterbank/hdllib.cfg
index 8f9b5b52c3..cb4aa78ebe 100644
--- a/applications/apertif/designs/apertif_unb1_bn_filterbank/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_bn_filterbank/hdllib.cfg
@@ -3,8 +3,6 @@ hdl_library_clause_name = apertif_unb1_bn_filterbank_lib
 hdl_lib_uses_synth = common technology tech_mac_10g tr_10GbE mm i2c unb1_board bf wpfb aduh reorder
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-                                                                                         
 synth_files =    
     $RADIOHDL/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_pkg.vhd
     $RADIOHDL/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_input.vhd
@@ -18,10 +16,16 @@ synth_files =
 test_bench_files =                                                                      
     tb/vhdl/tb_apertif_unb1_bn_filterbank.vhd                                       
 
+
+[modelsim_project_file]
 modelsim_copy_files = src/hex hex
                       $RADIOHDL/libraries/io/i2c/tb/data data
                       $RADIOHDL/libraries/base/diag/src/data data
 
+
+[quartus_project_file]
+synth_top_level_entity =
+                                                                                         
 quartus_copy_files = quartus/sopc_apertif_unb1_bn_filterbank.sopc .
                      src/hex hex
                      $RADIOHDL/libraries/io/i2c/tb/data data
diff --git a/applications/apertif/designs/apertif_unb1_cor_mesh_ref/hdllib.cfg b/applications/apertif/designs/apertif_unb1_cor_mesh_ref/hdllib.cfg
index 8c1aaf2e4e..ae598d2140 100644
--- a/applications/apertif/designs/apertif_unb1_cor_mesh_ref/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_cor_mesh_ref/hdllib.cfg
@@ -3,8 +3,6 @@ hdl_library_clause_name = apertif_unb1_cor_mesh_ref_lib
 hdl_lib_uses_synth = common technology mm i2c unb1_board diag eth tech_tse reorder apertif
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
 synth_files =   
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_cor_mesh_ref/qsys_apertif_unb1_cor_mesh_ref/synthesis/qsys_apertif_unb1_cor_mesh_ref.v
     src/vhdl/mmm_apertif_unb1_cor_mesh_ref.vhd
@@ -13,9 +11,15 @@ synth_files =
     
 test_bench_files = 
     tb/vhdl/tb_apertif_unb1_cor_mesh_ref.vhd
+    
 
+[modelsim_project_file]
 modelsim_copy_files = src/hex hex                                                   
 
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = quartus/qsys_apertif_unb1_cor_mesh_ref.qsys .
                      src/hex hex                                                   
 quartus_qsf_files = 
diff --git a/applications/apertif/designs/apertif_unb1_correlator/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/hdllib.cfg
index 9f6ed50ebe..f7c3b817e0 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/hdllib.cfg
@@ -2,19 +2,8 @@ hdl_lib_name = apertif_unb1_correlator
 hdl_library_clause_name = apertif_unb1_correlator_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    quartus/qsys_apertif_unb1_correlator.qsys .
-    quartus/sopc_apertif_unb1_correlator.sopc .
-    src/hex/ hex
-
-modelsim_copy_files = 
-    src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator/sopc_apertif_unb1_correlator.vhd
@@ -25,6 +14,20 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_apertif_unb1_correlator.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    quartus/qsys_apertif_unb1_correlator.qsys .
+    quartus/sopc_apertif_unb1_correlator.sopc .
+    src/hex/ hex
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_filter/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_filter/hdllib.cfg
index 283a945ea4..a58dc6689f 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_filter/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_filter/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = apertif_unb1_correlator_filter
 hdl_library_clause_name = apertif_unb1_correlator_filter_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    ../../quartus/qsys_apertif_unb1_correlator.qsys .
-    ../../src/hex/ hex
-
-modelsim_copy_files = 
-    ../../src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator_filter/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
@@ -30,6 +20,19 @@ synth_files =
 test_bench_files = 
     tb_apertif_unb1_correlator_filter.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    ../../quartus/qsys_apertif_unb1_correlator.qsys .
+    ../../src/hex/ hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_full/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_full/hdllib.cfg
index 2bee6a247b..0e41ff9d56 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_full/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_full/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = apertif_unb1_correlator_full
 hdl_library_clause_name = apertif_unb1_correlator_full_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    ../../quartus/qsys_apertif_unb1_correlator.qsys .
-    ../../src/hex/ hex
-
-modelsim_copy_files = 
-    ../../src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator_full/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
@@ -30,6 +20,19 @@ synth_files =
 test_bench_files = 
     tb_apertif_unb1_correlator_full.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    ../../quartus/qsys_apertif_unb1_correlator.qsys .
+    ../../src/hex/ hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite/hdllib.cfg
index 0a2932a8a6..d8f7ff437a 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite/hdllib.cfg
@@ -2,19 +2,8 @@ hdl_lib_name = apertif_unb1_correlator_lite
 hdl_library_clause_name = apertif_unb1_correlator_lite_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = apertif_unb1_fn_bf_emu
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    ../../quartus/qsys_apertif_unb1_correlator.qsys .
-    ../../src/hex/ hex
-
-modelsim_copy_files = 
-    ../../src/hex hex
-    ../../../apertif_unb1_fn_bf_emu/src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator_lite/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
@@ -32,6 +21,20 @@ synth_files =
 test_bench_files = 
     tb_apertif_unb1_correlator_lite.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+    ../../../apertif_unb1_fn_bf_emu/src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    ../../quartus/qsys_apertif_unb1_correlator.qsys .
+    ../../src/hex/ hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite_bg/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite_bg/hdllib.cfg
index bd4af0a284..8da3000e2e 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite_bg/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite_bg/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = apertif_unb1_correlator_lite_bg
 hdl_library_clause_name = apertif_unb1_correlator_lite_bg_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    ../../quartus/qsys_apertif_unb1_correlator.qsys .
-    ../../src/hex/ hex
-
-modelsim_copy_files = 
-    ../../src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator_lite_bg/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
@@ -32,6 +22,19 @@ test_bench_files =
     tb_apertif_unb1_correlator_lite_bg.vhd
     ../../tb/vhdl/tb_apertif_unb1_correlator_output_framer.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    ../../quartus/qsys_apertif_unb1_correlator.qsys .
+    ../../src/hex/ hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite_bg_8/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite_bg_8/hdllib.cfg
index 117a3279aa..65e579b6c2 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite_bg_8/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_lite_bg_8/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = apertif_unb1_correlator_lite_bg_8
 hdl_library_clause_name = apertif_unb1_correlator_lite_bg_8_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    ../../quartus/qsys_apertif_unb1_correlator.qsys .
-    ../../src/hex/ hex
-
-modelsim_copy_files = 
-    ../../src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator_lite_bg_8/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
@@ -32,6 +22,19 @@ test_bench_files =
     tb_apertif_unb1_correlator_lite_bg_8.vhd
     ../../tb/vhdl/tb_apertif_unb1_correlator_output_framer.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    ../../quartus/qsys_apertif_unb1_correlator.qsys .
+    ../../src/hex/ hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_mesh_distr_ref/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_mesh_distr_ref/hdllib.cfg
index 5d03c06954..8710354f19 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_mesh_distr_ref/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_mesh_distr_ref/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = apertif_unb1_correlator_mesh_distr_ref
 hdl_library_clause_name = apertif_unb1_correlator_mesh_distr_ref_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    ../../quartus/qsys_apertif_unb1_correlator.qsys .
-    ../../src/hex/ hex
-
-modelsim_copy_files = 
-    ../../src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator_mesh_distr_ref/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
@@ -30,6 +20,19 @@ synth_files =
 test_bench_files = 
     tb_apertif_unb1_correlator_mesh_distr_ref.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    ../../quartus/qsys_apertif_unb1_correlator.qsys .
+    ../../src/hex/ hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_mesh_ref/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_mesh_ref/hdllib.cfg
index bba6d68d45..5f6dc0b0d7 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_mesh_ref/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_mesh_ref/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = apertif_unb1_correlator_mesh_ref
 hdl_library_clause_name = apertif_unb1_correlator_mesh_ref_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    ../../quartus/qsys_apertif_unb1_correlator.qsys .
-    ../../src/hex/ hex
-
-modelsim_copy_files = 
-    ../../src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator_mesh_ref/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
@@ -31,6 +21,19 @@ synth_files =
 test_bench_files = 
     tb_apertif_unb1_correlator_mesh_ref.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    ../../quartus/qsys_apertif_unb1_correlator.qsys .
+    ../../src/hex/ hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_rx_only/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_rx_only/hdllib.cfg
index fb83e07e19..212c46f80f 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_rx_only/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_rx_only/hdllib.cfg
@@ -2,19 +2,8 @@ hdl_lib_name = apertif_unb1_correlator_rx_only
 hdl_library_clause_name = apertif_unb1_correlator_rx_only_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = apertif_unb1_fn_bf_emu
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    ../../quartus/qsys_apertif_unb1_correlator.qsys .
-    ../../src/hex/ hex
-
-modelsim_copy_files = 
-    ../../src/hex hex
-    ../../../apertif_unb1_fn_bf_emu/src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator_rx_only/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
@@ -31,6 +20,20 @@ synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+    ../../../apertif_unb1_fn_bf_emu/src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    ../../quartus/qsys_apertif_unb1_correlator.qsys .
+    ../../src/hex/ hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_simple/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_simple/hdllib.cfg
index 9cfe8f4f2b..089b488499 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_simple/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/apertif_unb1_correlator_simple/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = apertif_unb1_correlator_simple
 hdl_library_clause_name = apertif_unb1_correlator_simple_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE correlator diag rTwoSDF wpfb st filter fft apertif bf
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    ../../quartus/qsys_apertif_unb1_correlator.qsys .
-    ../../src/hex/ hex
-
-modelsim_copy_files = 
-    ../../src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_correlator_simple/qsys_apertif_unb1_correlator/synthesis/qsys_apertif_unb1_correlator.v
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
@@ -30,6 +20,19 @@ synth_files =
 test_bench_files = 
     tb_apertif_unb1_correlator_simple.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    ../../quartus/qsys_apertif_unb1_correlator.qsys .
+    ../../src/hex/ hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/applications/apertif/designs/apertif_unb1_correlator/revisions/sim_apertif_unb1_correlator_nodes/hdllib.cfg b/applications/apertif/designs/apertif_unb1_correlator/revisions/sim_apertif_unb1_correlator_nodes/hdllib.cfg
index 835e6b5f7a..f6e893fd4d 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/revisions/sim_apertif_unb1_correlator_nodes/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_correlator/revisions/sim_apertif_unb1_correlator_nodes/hdllib.cfg
@@ -2,22 +2,13 @@ hdl_lib_name = sim_apertif_unb1_correlator_nodes
 hdl_library_clause_name = sim_apertif_unb1_correlator_nodes_lib
 hdl_lib_uses_synth = common mm dp correlator diag rTwoSDF wpfb st filter fft apertif bf unb1_board tr_10GbE
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-
-modelsim_copy_files = 
-    ../../src/hex hex
-
 synth_files =
     ../../src/vhdl/apertif_unb1_correlator_pkg.vhd
     ../../src/vhdl/apertif_unb1_correlator_output_framer.vhd
     ../../src/vhdl/apertif_unb1_correlator_vis_offload.vhd
     ../../src/vhdl/node_apertif_unb1_correlator_input_sync_insert.vhd
-
     ../../src/vhdl/node_apertif_unb1_correlator_input.vhd
     ../../src/vhdl/node_apertif_unb1_correlator_mesh.vhd
     ../../src/vhdl/node_apertif_unb1_correlator_processing.vhd
@@ -26,6 +17,17 @@ synth_files =
 test_bench_files = 
     tb_node_apertif_unb1_correlator_input.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+
 quartus_qsf_files = 
     
 quartus_tcl_files =
diff --git a/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_base/hdllib.cfg b/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_base/hdllib.cfg
index 33687cbb00..325598ff8b 100644
--- a/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_base/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_base/hdllib.cfg
@@ -7,8 +7,6 @@ hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master
                    ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
                    ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
 
-synth_top_level_entity =
-
 synth_files =     
     ../../../../../../libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/node_unb1_fn_bf.vhd 
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_beamformer_base/sopc_apertif_unb1_fn_beamformer.vhd    
@@ -22,8 +20,18 @@ synth_files =
 test_bench_files =                                                                      
     tb_apertif_unb1_fn_beamformer_base.vhd                                       
 
+
+[modelsim_project_file]
 modelsim_copy_files = ../../src/hex hex                                                   
 
+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    
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = ../../quartus/sopc_apertif_unb1_fn_beamformer.sopc .
 
 quartus_qsf_files =                                                       
@@ -36,9 +44,5 @@ quartus_tcl_files =
 quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_beamformer_base/sopc_apertif_unb1_fn_beamformer.qip
 
-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    
-
 quartus_sdc_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.sdc
diff --git a/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_bg_bf_tp/hdllib.cfg b/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_bg_bf_tp/hdllib.cfg
index e42ee18d6e..63de8bc3e2 100644
--- a/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_bg_bf_tp/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_bg_bf_tp/hdllib.cfg
@@ -6,8 +6,6 @@ hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master
                    ip_stratixiv_ddr3_uphy_4g_800_slave
                    ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
 
-synth_top_level_entity = apertif_unb1_fn_beamformer_bg_bf_tp
-
 synth_files =     
     ../../../../../../libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/node_unb1_fn_bf.vhd 
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_beamformer_bg_bf_tp/sopc_apertif_unb1_fn_beamformer.vhd    
@@ -21,8 +19,21 @@ synth_files =
 test_bench_files =                                                                      
     tb_apertif_unb1_fn_beamformer_bg_bf_tp.vhd                                       
 
+
+[modelsim_project_file]
 modelsim_copy_files = ../../src/hex hex                                                   
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
+    
+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    
+
+
+[quartus_project_file]
+synth_top_level_entity = apertif_unb1_fn_beamformer_bg_bf_tp
+
 quartus_copy_files = ../../quartus/sopc_apertif_unb1_fn_beamformer.sopc .
                      ../../src/hex hex
 
@@ -37,10 +48,3 @@ quartus_tcl_files =
 quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_beamformer_bg_bf_tp/sopc_apertif_unb1_fn_beamformer.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
-    
-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    
-
diff --git a/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_bg_tp/hdllib.cfg b/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_bg_tp/hdllib.cfg
index 6ab084a2b2..ebfc6cf96c 100644
--- a/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_bg_tp/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_bg_tp/hdllib.cfg
@@ -6,8 +6,6 @@ hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master
                    ip_stratixiv_ddr3_uphy_4g_800_slave
                    ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
 
-synth_top_level_entity = apertif_unb1_fn_beamformer_bg_tp
-
 synth_files =     
     ../../../../../../libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/node_unb1_fn_bf.vhd 
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_beamformer_bg_tp/sopc_apertif_unb1_fn_beamformer.vhd    
@@ -21,8 +19,21 @@ synth_files =
 test_bench_files =                                                                      
     tb_apertif_unb1_fn_beamformer_bg_tp.vhd                                       
 
+
+[modelsim_project_file]
 modelsim_copy_files = ../../src/hex hex                                                   
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
+    
+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    
+
+
+[quartus_project_file]
+synth_top_level_entity = apertif_unb1_fn_beamformer_bg_tp
+
 quartus_copy_files = ../../quartus/sopc_apertif_unb1_fn_beamformer.sopc .
                      ../../src/hex hex
 
@@ -36,11 +47,3 @@ quartus_tcl_files =
     
 quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_beamformer_bg_tp/sopc_apertif_unb1_fn_beamformer.qip
-
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
-    
-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    
-
diff --git a/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_transpose/hdllib.cfg b/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_transpose/hdllib.cfg
index 0b0c7c5ed6..3e5b81f372 100644
--- a/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_transpose/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_fn_beamformer/revisions/apertif_unb1_fn_beamformer_transpose/hdllib.cfg
@@ -7,8 +7,6 @@ hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master
                    ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
                    ip_stratixiv_ddr3_uphy_16g_dual_rank_800
 
-synth_top_level_entity = apertif_unb1_fn_beamformer_transpose
-
 synth_files =    
     ../../../../../../libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/node_unb1_fn_bf.vhd 
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_beamformer_trans/sopc_apertif_unb1_fn_beamformer.vhd    
@@ -22,8 +20,21 @@ synth_files =
 test_bench_files =                                                                      
     tb_apertif_unb1_fn_beamformer_trans.vhd                                       
 
+
+[modelsim_project_file]
 modelsim_copy_files = ../../src/hex hex                                                   
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
+
+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    
+
+
+[quartus_project_file]
+synth_top_level_entity = apertif_unb1_fn_beamformer_transpose
+
 quartus_copy_files = ../../quartus/sopc_apertif_unb1_fn_beamformer.sopc .
                      ../../src/hex hex                                                   
 
@@ -39,12 +50,5 @@ quartus_qip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/generated/ip_stratixiv_ddr3_uphy_4g_single_rank_800_master.qip
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_beamformer_trans/sopc_apertif_unb1_fn_beamformer.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
-
-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    
-
 quartus_sdc_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.sdc
diff --git a/applications/apertif/designs/apertif_unb1_fn_bf_emu/hdllib.cfg b/applications/apertif/designs/apertif_unb1_fn_bf_emu/hdllib.cfg
index 41290e791f..3f1f0f3cc7 100644
--- a/applications/apertif/designs/apertif_unb1_fn_bf_emu/hdllib.cfg
+++ b/applications/apertif/designs/apertif_unb1_fn_bf_emu/hdllib.cfg
@@ -3,8 +3,6 @@ hdl_library_clause_name = apertif_unb1_fn_bf_emu_lib
 hdl_lib_uses_synth = common technology tech_mac_10g tr_10GbE mm i2c unb1_board bf apertif 
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
 synth_files =     
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_bf_emu/sopc_apertif_unb1_fn_bf_emu.vhd    
     ../apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer_udp_offload.vhd
@@ -14,8 +12,18 @@ synth_files =
 test_bench_files =                                                                      
     tb/vhdl/tb_apertif_unb1_fn_bf_emu.vhd                                       
 
+
+[modelsim_project_file]
 modelsim_copy_files = src/hex hex                                                   
 
+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    
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = 
     quartus/sopc_apertif_unb1_fn_bf_emu.sopc .
     src/hex hex
@@ -29,8 +37,5 @@ quartus_tcl_files =
 quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/apertif_unb1_fn_bf_emu/sopc_apertif_unb1_fn_bf_emu.qip
 
-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    
 quartus_sdc_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.sdc
diff --git a/applications/apertif/libraries/apertif/hdllib.cfg b/applications/apertif/libraries/apertif/hdllib.cfg
index 1ebbb7bcda..3599df3169 100644
--- a/applications/apertif/libraries/apertif/hdllib.cfg
+++ b/applications/apertif/libraries/apertif/hdllib.cfg
@@ -7,3 +7,10 @@ synth_files =
     src/vhdl/apertif_udp_offload_pkg.vhd
 
 test_bench_files =     
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/apertif/matlab/corner_turn.m b/applications/apertif/matlab/corner_turn.m
index f9de300e87..95551dc32e 100644
--- a/applications/apertif/matlab/corner_turn.m
+++ b/applications/apertif/matlab/corner_turn.m
@@ -20,26 +20,29 @@
 %-----------------------------------------------------------------------------
 % Author: E. Kooistra, 2016
 %
-% Purpose : Collect blocks of data and then corner turn the data blocks.
+% Purpose : Collect M blocks of in_data(1:K) and then transpose [M] and [K].
 % Description :
 %
+%   The corner turn can also include the last L blocks from the previous
+%   interval, so then tranpsose [L+M] and [K].
+%
 %   M=nof_block
 %   K=block_size
 %   L=tail_nof_block
 %
-%   Buffer at in_sync (i.e. when bi == M):
-%     1   in_data(1:K)
-%     2   in_data(1:K)
-%     ...
-%     M   in_data(1:K)
-%
-%   Tail buffer at in_sync:
+%   Tail previous buffer at in_sync:
 %
 %     M-L+1   in_data(1:K)
 %     M-L+2   in_data(1:K)
 %     ...
 %     M-L+L   in_data(1:K)
 %
+%   Buffer at in_sync (i.e. when bi == M):
+%     1   in_data(1:K)
+%     2   in_data(1:K)
+%     ...
+%     M   in_data(1:K)
+%
 %   Output at in_sync when output_type = 'matrix':
 %
 %     1   in_data(1)(1:L,1:M)
diff --git a/applications/apertif/matlab/delay_tracking_pfb.m b/applications/apertif/matlab/delay_tracking_pfb.m
index d1f404ae1f..10479f7fcf 100644
--- a/applications/apertif/matlab/delay_tracking_pfb.m
+++ b/applications/apertif/matlab/delay_tracking_pfb.m
@@ -48,16 +48,18 @@ close all;
 fig=0;
 
 tb.model             = 'floating point';
-tb.model             = 'fixed point';
+%tb.model             = 'fixed point';
 
 tb.nof_complex       = 2;
-tb.nof_subbands      = 512;
-tb.bsn_init          = 0;
-tb.subband_nr        = 113;                             % subband range 0:511, can be fraction
-%tb.subband_nr        = 113.5;
-tb.subband_i         = round(tb.subband_nr);
+tb.nof_subbands      = 32;
+tb.subband_wg        = 0.1*32;                             % subband range 0:tb.nof_subbands-1, can be fraction
+%tb.subband_wg        = 13.5;
+tb.subband_i         = floor(tb.subband_wg);            % natural subband index in range 0:tb.nof_subbands-1
 tb.subband_fft_size  = tb.nof_complex*tb.nof_subbands;  % subband filterbank real FFT
-tb.nof_blocks        = 61;
+tb.nof_tsub          = 500;
+
+fs                  = 1;                       % normalized sample frequency
+fsub                = fs/tb.subband_fft_size;  % subband frequency relative to fs
 
 % DP quantization, width 0 is use double, width > 0 is use nof bits for data
 if strcmp(tb.model, 'floating point')
@@ -70,6 +72,7 @@ if strcmp(tb.model, 'floating point')
     ctrl_pfft_subband.data_w  = 0;
     
     ctrl_spec_subband.db_low  = -150;
+    ctrl_spec_subband.db_low  = -70;
 else
     ctrl_wg.data_w            = 8;
     lsb = 1/2^ctrl_wg.data_w;
@@ -92,9 +95,14 @@ if ctrl_wg.agwn_sigma>0
     ctrl_wg.ampl = 0.9;
 end
 %ctrl_wg.ampl        = 0.01;
-ctrl_wg.offset      = 0;                                   % DC offset
-ctrl_wg.freq        = tb.subband_nr/tb.subband_fft_size;   % normalized fs
+ctrl_wg.freq        = tb.subband_wg*fsub;
+ctrl_wg.df          = 0.01*fsub;             % increment freq by df per block to create chirp
 ctrl_wg.phase       = 0;                                   % normalized 2pi
+if ctrl_wg.freq == 0
+    ctrl_wg.offset = 1;                                    % DC offset 
+else
+    ctrl_wg.offset = 0;                                    % DC offset
+end
 
 % Delay tracking
 ctrl_dt.block_size  = tb.subband_fft_size;
@@ -102,9 +110,6 @@ ctrl_dt.buffer      = zeros(1, 2*ctrl_dt.block_size);
 ctrl_dt.step        = 4;               % Delay step is Psub = 4 factor, for 4 samples per clock 
 ctrl_dt.dt          = 0;               % Delay setting in +- number of ctrl_dt.step time samples of ADC or WG
 
-% BSN source
-ctrl_bsn_source.bsn = tb.bsn_init;     % Start BSN
-
 % Subband FIR filter parameters
 ctrl_pfir_subband.downsample_factor  = tb.subband_fft_size;
 ctrl_pfir_subband.nof_taps           = 16;                                                         % Number of taps
@@ -151,17 +156,25 @@ ctrl_pfft_subband.complex  = false;
 ctrl_pfft_subband.gain = ctrl_pfft_subband.fft_size;
 
 % Reorder subband select parameters
-ctrl_reorder_subband.select = tb.subband_i + [1 2];
 ctrl_reorder_subband.select = tb.subband_i + 1;
+ctrl_reorder_subband.select = tb.subband_i + 1 + [0:2];
+ctrl_reorder_subband.select = 1:tb.nof_subbands;
 ctrl_reorder_subband.block_size = length(ctrl_reorder_subband.select);
 
-% Run the data path processing (one block per row)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Run the data path processing
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 t_start = cputime;
-data_dt              = zeros(tb.nof_blocks, tb.subband_fft_size);
-data_pfir_subband    = zeros(tb.nof_blocks, tb.subband_fft_size);
-data_pfft_subband    = zeros(tb.nof_blocks, tb.nof_subbands);
-data_reorder_subband = zeros(tb.nof_blocks, ctrl_reorder_subband.block_size);
-for bi = 1:tb.nof_blocks
+data_dt              = zeros(tb.nof_tsub, tb.subband_fft_size);
+data_pfir_subband    = zeros(tb.nof_tsub, tb.subband_fft_size);
+data_pfft_subband    = zeros(tb.nof_tsub, tb.nof_subbands);
+data_reorder_subband = zeros(tb.nof_tsub, ctrl_reorder_subband.block_size);
+for bi = 1:tb.nof_tsub
+    % Timing
+    if bi==1
+        ctrl_bsn_source.bsn = 0;   % Start BSN source
+    end
+    
     % Control
     if ctrl_bsn_source.bsn == 30
         ctrl_dt.dt = ctrl_dt.dt - ctrl_dt.step;  % Apply delay step
@@ -184,10 +197,17 @@ end
 t_stop = cputime;
 disp(sprintf('Total processing time: %f seconds', t_stop-t_start));
 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Plot data path results
-ts     = (0:tb.subband_fft_size*tb.nof_blocks-1)/tb.subband_fft_size;   % time of ADC / WG samples in block periods
-tsub   = (0:tb.nof_subbands*tb.nof_blocks-1)/tb.nof_subbands;           % time in subband periods
-tblock = (0:tb.nof_blocks-1);                                           % time in blocks
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ts       = (1:tb.subband_fft_size*tb.nof_tsub)/tb.subband_fft_size;   % time of ADC / WG samples in subband periods
+tsub_all = (1:    tb.nof_subbands*tb.nof_tsub)/tb.nof_subbands;       % time in subband periods for block of subbands
+tsub_one = (1:                    tb.nof_tsub);                       % time in subband periods for one subband
+
+sub_i    = tb.subband_i + [1: tb.nof_subbands: tb.nof_subbands*tb.nof_tsub];  % get indices of all subband_i
+
+sel_sub_i = find(ctrl_reorder_subband.select == tb.subband_i + 1, 1); % find index of subband_i in selected subbands
 
 % Plot DT output
 fig=fig+1;
@@ -196,8 +216,8 @@ figure(fig);
 data = data_dt';
 plot(ts, data(:))
 ylim([-1.3 1.3]);
-title(sprintf('Delay tracking output data (WG subband %6.3f)', tb.subband_nr));
-xlabel('Time [T bsn]');
+title(sprintf('Delay tracking output data (WG subband %6.3f)', tb.subband_wg));
+xlabel(sprintf('Time 1:%d [Tsub]', tb.nof_tsub));
 ylabel('Voltage');
 grid on;
 
@@ -225,48 +245,53 @@ figure('position', [300+fig*20 200-fig*20 1000 800]);
 figure(fig);
 data = data_pfir_subband';
 plot(ts, data(:))
-title(sprintf('Subband polyphase FIR filter output - FFT input data (WG subband %6.3f)', tb.subband_nr));
-ylim([-2 2]);             % DT step when tb.subband_nr is .5 causes double range
-xlabel('Time [T bsn]');
+title(sprintf('Subband polyphase FIR filter output - FFT input data (WG subband %6.3f)', tb.subband_wg));
+ylim([-2 2]);             % DT step when tb.subband_wg is .5 causes double range
+xlabel(sprintf('Time 1:%d [Tsub]', tb.nof_tsub));
 ylabel('Voltage');
 grid on;
 
 % Plot PFFT subbands spectrum and phase
-ampl = abs(data_pfft_subband);
-phase = angle(data_pfft_subband)*180/pi;
-noise = ampl < 0.1*max(ampl(:));
-phase(noise) = 0;   % force phase of too small signals to 0
+sub_ampl = abs(data_pfft_subband);
+sub_ampl_max = max(sub_ampl(:));
+sub_phase = angle(data_pfft_subband)*180/pi;
+x = sub_ampl < 0.1*sub_ampl_max;
+sub_phase(x) = 0;   % force phase of too small signals to 0
 
 fig=fig+1;
 figure('position', [300+fig*20 200-fig*20 1000 800]);
 figure(fig);
 subplot(2,1,1);
-data = ampl';
-plot(tsub, data(:))
-title('Subband data - amplitude');
-xlabel(sprintf('Subband 0:%d at time [T bsn]', tb.nof_subbands-1));
+data = sub_ampl';
+data = data(:);
+plot(tsub_all, data, 'k', tsub_all(sub_i), data(sub_i), 'ko', tsub_all(sub_i+1), data(sub_i+1), 'kx');
+title(sprintf('Subband data - amplitude  (o = subband index %d for WG subband = %6.3f, x = next)', tb.subband_i, tb.subband_wg));
+xlabel(sprintf('Subbands 0:%d at time 1:%d [Tsub]', tb.nof_subbands-1, tb.nof_tsub));
 ylabel('Voltage');
 grid on;
 subplot(2,1,2);
-data = phase';
-plot(tsub, data(:))
+data = sub_phase';
+data = data(:);
+plot(tsub_all, data, 'k', tsub_all(sub_i), data(sub_i), 'ko', tsub_all(sub_i+1), data(sub_i+1), 'kx');
 ylim([-180 180])
-title('Subband data - phase');
-xlabel(sprintf('Subband 0:%d at time [T bsn]', tb.nof_subbands-1));
+title(sprintf('Subband data - amplitude  (o = subband index %d for WG subband = %6.3f, x = next)', tb.subband_i, tb.subband_wg));
+xlabel(sprintf('Subbands 0:%d at time 1:%d [Tsub]', tb.nof_subbands-1, tb.nof_tsub));
 ylabel('Phase [degrees]');
 grid on;
 
 % Plot phase step due to DT step for the subband that is set in the WG
-%phase = angle(data_pfft_subband(:, tb.subband_i + 1))*180/pi;
-phase = angle(data_reorder_subband(:,1))*180/pi;
-
+if isempty(sel_sub_i)
+    wg_sub_phase = angle(data_pfft_subband(:, tb.subband_i + 1))*180/pi;    % use Matlab indexing if subband is not selected
+else
+    wg_sub_phase = angle(data_reorder_subband(:, sel_sub_i))*180/pi;           % use functional reorder subband
+end
 fig=fig+1;
 figure('position', [300+fig*20 200-fig*20 1000 800]);
 figure(fig);
-plot(tblock, phase, '-o')
+plot(tsub_one, wg_sub_phase, '-o')
 ylim([-180 180])
 title(sprintf('Subband phase for subband %d in range 0:%d', tb.subband_i, tb.nof_subbands-1));
-xlabel('Time [T bsn]');
+xlabel(sprintf('Time 1:%d [Tsub]', tb.nof_tsub));
 ylabel('Phase [degrees]');
 grid on;
 
@@ -274,9 +299,7 @@ grid on;
 fig=fig+1;
 figure('position', [300+fig*20 200-fig*20 1000 800]);
 figure(fig);
-data = abs(data_pfft_subband);
-data_abs_max = max(data(:));
-data = db(data);                % no need to scale data, range is already normalized
+data = db(sub_ampl);                % no need to scale data, range is already normalized
 x = ctrl_spec_subband.db_low;
 %x = floor(min(data(data~=-Inf)))
 data(data<x) = x;
@@ -285,7 +308,7 @@ mymap = jet(-x);
 colormap(mymap);
 imagesc(data',[x 0]);
 colorbar;
-title(sprintf('Subband spectogram (max value = %f = %f dB)', data_abs_max, db(data_abs_max)));
-xlabel('Time [T bsn]');
-ylabel('Subband');
+title(sprintf('Subband spectogram (max value = %f = %f dB)', sub_ampl_max, db(sub_ampl_max)));
+xlabel(sprintf('Time 1:%d [Tsub]', tb.nof_tsub));
+ylabel(sprintf('Subbands 1:%d', tb.nof_subbands));
 
diff --git a/applications/apertif/matlab/pfir.m b/applications/apertif/matlab/pfir.m
index 0a98ea4365..006da601e3 100644
--- a/applications/apertif/matlab/pfir.m
+++ b/applications/apertif/matlab/pfir.m
@@ -26,7 +26,10 @@
 function [state, out_data] = pfir(ctrl, in_data)
 
 % Data processing
-for t = 1:ctrl.downsample_factor
+for t = ctrl.downsample_factor:-1:1
+    if t==1
+        ctrl.Zdelays(t,:)
+    end
     [out_data(t), ctrl.Zdelays(t,:)] = filter(ctrl.coeff(t,:), 1, in_data(t), ctrl.Zdelays(t,:));   % range ctrl.nof_taps coefficients and range ctrl.nof_taps-1 Zdelays
 end
 
diff --git a/applications/apertif/matlab/two_pfb.m b/applications/apertif/matlab/two_pfb.m
index e7d281221b..68e2bdaba0 100644
--- a/applications/apertif/matlab/two_pfb.m
+++ b/applications/apertif/matlab/two_pfb.m
@@ -35,36 +35,60 @@
 %   -1:1.
 % * Two poly phase filterbanks (PFB)
 %   Model subband filterbank and channel filterbank to make fine channels
-%   per subband. 
+%   per subband. The corner turner operates directly on the selected
+%   subbands to have time samples grouped per subband as input for the
+%   channel filter. The sync interval sets the number of blocks per
+%   corner turn. From subband to subband the the channel filter should
+%   rerun the impulse reponse tail of the previous sync interval.
+%   However if the sync interval is very large, than this rerun may be
+%   ignored to simplify the implementation.
+% * Then Apertif subband beamformer is not modelled, therefore the corner
+%   turn operates on the selected subbands. The channel correlator is not
+%   modelled, but typically the sync interval will be equal to the 
+%   integration interval of 1.024 s (= 800000 subband blocks).
 
 clear all;
 close all;
 fig=0;
 
 tb.model             = 'floating point';
-tb.model             = 'fixed point';
+%tb.model             = 'fixed point';
 
 tb.nof_complex       = 2;
-tb.nof_subbands      = 512;
-tb.subband_nr        = 113;                             % subband range 0:511, can be fraction
-%tb.subband_nr        = 113.5;
-tb.subband_i         = round(tb.subband_nr);
-tb.subband_fft_size  = tb.nof_complex*tb.nof_subbands;  % subband filterbank real FFT
-tb.sync_interval     = 50;                              % nof blocks per sync interval
-tb.nof_sync          = 2;
-tb.nof_blocks        = tb.nof_sync*tb.sync_interval+1;
+tb.nof_subbands      = 32;
+tb.nof_channels      = 8;
+tb.subband_wg        = 0+7/8+0.1;                             % subband range 0:tb.nof_subbands-1, can be fraction
+tb.subband_i         = floor(tb.subband_wg);                  % natural subband index in range 0:tb.nof_subbands-1
+tb.channel_wg        = tb.subband_wg - tb.subband_i;          % use subband fraction as WG channel offset frequency within subband
+tb.channel_i         = floor(tb.channel_wg*tb.nof_channels);  % natural channel index in range 0:tb.nof_channels-1
+tb.subband_fft_size  = tb.nof_subbands*tb.nof_complex;        % subband filterbank real FFT
+tb.channel_fft_size  = tb.nof_channels;                       % channel filterbank complex FFT
+
+tb.nof_tsync          = 2;                                       % nof sync intervals, the corner turn operates per sync interval
+tb.nof_tchan_per_sync = 20;                                      % nof channel periods per sync interval
+tb.nof_tchan          = tb.nof_tsync*tb.nof_tchan_per_sync;
+tb.nof_tsub_per_sync  = tb.nof_tchan_per_sync*tb.channel_fft_size;  % nof subband periods per sync interval, must be multiple of nof channels per subband
+tb.nof_tsub           = tb.nof_tsync*tb.nof_tsub_per_sync+1;        % one extra to be able to finish output of last sync interval
 
 % DP quantization, width 0 is use double, width > 0 is use nof bits for data
 if strcmp(tb.model, 'floating point')
     ctrl_wg.data_w            = 0;
     ctrl_wg.agwn_sigma        = 0;      % AGWN sigma
     %ctrl_wg.agwn_sigma        = 0.01;
+    
     ctrl_pfir_subband.coeff_w = 0;
     ctrl_pfir_subband.scale_w = 0;
     ctrl_pfir_subband.data_w  = 0;
     ctrl_pfft_subband.data_w  = 0;
     
     ctrl_spec_subband.db_low  = -150;
+    
+    ctrl_pfir_channel.coeff_w = 0;
+    ctrl_pfir_channel.scale_w = 0;
+    ctrl_pfir_channel.data_w  = 0;
+    ctrl_pfft_channel.data_w  = 0;
+    
+    ctrl_spec_channel.db_low  = -150;
 else
     ctrl_wg.data_w            = 8;
     lsb = 1/2^ctrl_wg.data_w;
@@ -75,8 +99,13 @@ else
     ctrl_pfir_subband.data_w  = 16;
     ctrl_pfft_subband.data_w  = 16;
     
-    ctrl_spec_subband.data_w  = 10;
-    ctrl_spec_subband.db_low  = floor(-20 - 6.02 * ctrl_spec_subband.data_w);
+    ctrl_pfir_channel.coeff_w = 9;
+    ctrl_pfir_channel.scale_w = 1;
+    ctrl_pfir_channel.data_w  = 16;
+    ctrl_pfft_channel.data_w  = 16;
+    
+    ctrl_spec_channel.data_w  = 10;
+    ctrl_spec_channel.db_low  = floor(-20 - 6.02 * ctrl_spec_channel.data_w);
 end
 
 % Waveform generator
@@ -87,9 +116,13 @@ if ctrl_wg.agwn_sigma>0
     ctrl_wg.ampl = 0.9;
 end
 %ctrl_wg.ampl        = 0.01;
-ctrl_wg.offset      = 0;                                   % DC offset
-ctrl_wg.freq        = tb.subband_nr/tb.subband_fft_size;   % normalized fs
+ctrl_wg.freq        = tb.subband_wg/tb.subband_fft_size;   % normalized fs
 ctrl_wg.phase       = 0;                                   % normalized 2pi
+if ctrl_wg.freq == 0
+    ctrl_wg.offset = 1;                                    % DC offset 
+else
+    ctrl_wg.offset = 0;                                    % DC offset
+end
 
 % Delay tracking
 ctrl_dt.block_size  = tb.subband_fft_size;
@@ -133,47 +166,82 @@ end
 
 %ctrl_pfir_subband.coeff = fliplr(coeff);
 %ctrl_pfir_subband.coeff = flipud(coeff);
-ctrl_pfir_subband.coeff = coeff;
+ctrl_pfir_subband.coeff   = coeff;
 ctrl_pfir_subband.Zdelays = zeros(ctrl_pfir_subband.downsample_factor, ctrl_pfir_subband.nof_taps-1);
-ctrl_pfir_subband.gain = sum(ctrl_pfir_subband.coeff(:)) / ctrl_pfir_subband.downsample_factor;
+ctrl_pfir_subband.gain    = sum(ctrl_pfir_subband.coeff(:)) / ctrl_pfir_subband.downsample_factor;
 
 % Subband FFT parameters
 ctrl_pfft_subband.fft_size = tb.subband_fft_size;
 ctrl_pfft_subband.complex  = false;
-ctrl_pfft_subband.gain = ctrl_pfft_subband.fft_size;
+ctrl_pfft_subband.gain     = ctrl_pfft_subband.fft_size;
 
 % Subband select reorder parameters
-ctrl_reorder_subband.select = tb.subband_i + 1 +[-5:5];
+ctrl_reorder_subband.select = tb.subband_i + 1 + [0:2];
 %ctrl_reorder_subband.select = tb.subband_i + 1;
+%ctrl_reorder_subband.select = 1:tb.nof_subbands;
 ctrl_reorder_subband.block_size = length(ctrl_reorder_subband.select);
 
 % Subband corner turn parameters
-ctrl_corner_turn.tail_nof_block = 0;
-ctrl_corner_turn.nof_block      = tb.sync_interval;
+ctrl_corner_turn.nof_block      = tb.nof_tsub_per_sync;
 ctrl_corner_turn.block_size     = ctrl_reorder_subband.block_size;
-ctrl_corner_turn.tail_buffer    = zeros(ctrl_corner_turn.tail_nof_block, ctrl_corner_turn.block_size);
 ctrl_corner_turn.buffer         = zeros(ctrl_corner_turn.nof_block, ctrl_corner_turn.block_size);
 ctrl_corner_turn.output_type    = 'serial';  % 'serial' or 'matrix'
 ctrl_corner_turn.bi             = 1;         % block index
 
+% Channel FIR filter parameters
+ctrl_pfir_channel.downsample_factor  = tb.channel_fft_size;
+ctrl_pfir_channel.nof_taps           = 8;                                                         % Number of taps
+ctrl_pfir_channel.nof_coefficients   = ctrl_pfir_channel.downsample_factor*ctrl_pfir_channel.nof_taps;   % Number of filter coefficients (taps)
+ctrl_pfir_channel.r_pass             = 0.001;
+ctrl_pfir_channel.r_stop             = 0.0001;
+ctrl_pfir_channel.hp_factor          = 1.050;                                               % Adjust channel half power bandwidth
+ctrl_pfir_channel.hp_factor          = 1;
+ctrl_pfir_channel.BWchan             = ctrl_pfir_channel.hp_factor / tb.channel_fft_size;   % Channel bandwidth
+ctrl_pfir_channel.config.design      = 'fir1';
+ctrl_pfir_channel.config.design      = 'fircls1';   % 'fir1', 'fircls1', 'lofar file'
+ctrl_pfir_channel.config.design_flag = 'trace';     % 'trace'
+ctrl_pfir_channel.config.interpolate = 'interpft';  % 'resample', 'fourier', 'interpft'
+ctrl_pfir_channel.coeff = pfir_coeff(ctrl_pfir_channel.downsample_factor,....
+                                     ctrl_pfir_channel.nof_taps, ...
+                                     ctrl_pfir_channel.BWchan, ...
+                                     ctrl_pfir_channel.r_pass, ...
+                                     ctrl_pfir_channel.r_stop, ...
+                                     ctrl_pfir_channel.coeff_w, ...
+                                     ctrl_pfir_channel.config);
+ctrl_pfir_channel.Zdelays = zeros(ctrl_pfir_channel.downsample_factor, ctrl_pfir_channel.nof_taps-1);
+ctrl_pfir_channel.gain = sum(ctrl_pfir_channel.coeff(:)) / ctrl_pfir_channel.downsample_factor;
+
+% Subband corner turn tail nof block depends on FIR impulse response length
+ctrl_corner_turn.tail_nof_block = (ctrl_pfir_channel.nof_taps-1)*ctrl_pfir_channel.downsample_factor;
+ctrl_corner_turn.tail_buffer    = zeros(ctrl_corner_turn.tail_nof_block, ctrl_corner_turn.block_size);
+
+% Channel FFT parameters
+ctrl_pfft_channel.fft_size = tb.channel_fft_size;
+ctrl_pfft_channel.complex  = true;
+ctrl_pfft_channel.gain     = ctrl_pfft_channel.fft_size;
+
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Run the data path processing
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 t_start = cputime;
 
-% - DP at subband block rate (one block per row)
-data_dt              = zeros(tb.nof_blocks, tb.subband_fft_size);
-data_pfir_subband    = zeros(tb.nof_blocks, tb.subband_fft_size);
-data_pfft_subband    = zeros(tb.nof_blocks, tb.nof_subbands);
-data_reorder_subband = zeros(tb.nof_blocks, ctrl_reorder_subband.block_size);
-data_corner_turn     = zeros(tb.nof_sync,   ctrl_corner_turn.block_size * (ctrl_corner_turn.tail_nof_block+ctrl_corner_turn.nof_block));
+%--------------------------------------------------------------------------
+% - DP at subband block rate (one tsub block per row)
+%--------------------------------------------------------------------------
+data_dt              = zeros(tb.nof_tsub,  tb.subband_fft_size);
+data_pfir_subband    = zeros(tb.nof_tsub,  tb.subband_fft_size);
+data_pfft_subband    = zeros(tb.nof_tsub,  tb.nof_subbands);
+data_reorder_subband = zeros(tb.nof_tsub,  ctrl_reorder_subband.block_size);
+data_corner_turn     = zeros(tb.nof_tsync, ctrl_corner_turn.block_size * (ctrl_corner_turn.tail_nof_block+ctrl_corner_turn.nof_block));
 si = 1;
-for bi = 1:tb.nof_blocks
+for bi = 1:tb.nof_tsub
     % Timing
     if bi==1
-        sync = 0;
+        dp_sync = 0;
         ctrl_bsn_source.bsn = 0;   % Start BSN source
     else
-        sync = mod(ctrl_bsn_source.bsn, tb.sync_interval) == 0;
+        dp_sync = mod(ctrl_bsn_source.bsn, tb.nof_tsub_per_sync) == 0;
     end
     
     % Control
@@ -188,7 +256,7 @@ for bi = 1:tb.nof_blocks
     [ctrl_pfir_subband,    block_pfir_subband]    = pfir(          ctrl_pfir_subband,    block_dt);
     [                      block_pfft_subband]    = pfft(          ctrl_pfft_subband,    block_pfir_subband);
     [ctrl_reorder_subband, block_reorder_subband] = reorder_serial(ctrl_reorder_subband, block_pfft_subband);
-    [ctrl_corner_turn,     block_corner_turn]     = corner_turn(   ctrl_corner_turn,     block_reorder_subband, sync);
+    [ctrl_corner_turn,     block_corner_turn]     = corner_turn(   ctrl_corner_turn,     block_reorder_subband, dp_sync);
 
     % Capture data at each DP interface
     data_dt(bi, :)              = block_dt;
@@ -196,33 +264,86 @@ for bi = 1:tb.nof_blocks
     data_pfft_subband(bi, :)    = block_pfft_subband;
     data_reorder_subband(bi, :) = block_reorder_subband;
     
-    if sync
+    if dp_sync
         data_corner_turn(si, :) = block_corner_turn;
         si = si + 1;
     end
 end
 
-% - DP at sync interval rate (one interval per row)
-for si = 1:tb.nof_sync
-end
+%--------------------------------------------------------------------------
+% - DP at sync interval rate (one tsync block per row)
+%--------------------------------------------------------------------------
+Nchan = tb.nof_channels;                  % number of channels per subband, = tb.nof_channels = tb.channel_fft_size = 64
+Ksub  = ctrl_reorder_subband.block_size;  % number of selected subbands, = 384 for 300MHz
+Kchan = Ksub*Nchan;                       % total number of channels in the selected subbands, = 384*64= 24576
+Lsub  = ctrl_corner_turn.tail_nof_block;  % number of subband periods in tail of previous sync interval, = 0 or (>= nof_taps-1) * FFT size in the channel FIR filter, = 7*64 = 448
+Msub  = tb.nof_tsub_per_sync;             % number of subband periods per corner turn sync interval, = 1.024s * 781250 = 800000
+Lchan = Lsub/Nchan;                       % number of channel periods in previous sync interval tail, = 8
+Mchan = tb.nof_tchan_per_sync;            % number of channel periods in corner turn sync interval, = Msub/tb.channel_fft_size = 800000/64 = 12500
+Msync = tb.nof_tsync;                     % number of sync periods
+
+sprintf(['Nchan = %d\n', ...
+         'Ksub  = %d\n', ...
+         'Kchan = %d\n', ...
+         'Lsub  = %d\n', ...
+         'Msub  = %d\n', ...
+         'Lchan = %d\n', ...
+         'Mchan = %d\n', ...
+         'Msync = %d\n'], Nchan, Ksub, Kchan, Lsub, Msub, Lchan, Mchan, Msync)
+
+sprintf(['                Ksub *          Mchan  = %d\n', ...
+         '                Ksub * (Lchan + Mchan) = %d\n', ...
+         '        Nchan * Ksub * (Lchan + Mchan) = %d\n', ...
+         'Msync * Nchan * Ksub * (Lchan + Mchan) = %d\n'], Ksub*Mchan, Ksub*(Lchan+Mchan), Nchan*Ksub*(Lchan+Mchan), Msync*Nchan*Ksub*(Lchan+Mchan))
 
+data_pfir_channel = zeros(Nchan, Ksub*Mchan, Msync);
+data_pfft_channel = zeros(Nchan, Ksub*Mchan, Msync);
+for si = 1:Msync
+    % Data path (DP)
+    % - data_corner_turn(si, :) = subband(1)(1:Lsub,1:Msub), subband(2)(1:Lsub,1:Msub), ..., subband(Ksub)(1:Lsub,1:Msub)
+    data = reshape(data_corner_turn(si, :), Nchan, Ksub*(Lchan+Mchan));
+    cj = 0;
+    for ci = 1:Ksub*(Lchan+Mchan)
+        % Data path (DP)
+        [ctrl_pfir_channel, block_pfir_channel] = pfir(ctrl_pfir_channel, data(:, ci));          % input block of Nchan subband samples in time
+        [                   block_pfft_channel] = pfft(ctrl_pfft_channel, block_pfir_channel);
+                
+        % Capture data at each DP interface, skip the response for the Lchan tail
+        if (Lchan==0) || (mod(ci-1, Lchan+Mchan) >= Lchan)
+            cj = cj+1;
+            data_pfir_channel(:, cj, si) = block_pfir_channel;
+            data_pfft_channel(:, cj, si) = block_pfft_channel;                                   % capture block of Nchan channel samples
+        end
+    end
+end
 t_stop = cputime;
 disp(sprintf('Total processing time: %f seconds', t_stop-t_start));
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Plot data path results
-ts     = (0:tb.subband_fft_size*tb.nof_blocks-1)/tb.subband_fft_size;   % time of ADC / WG samples in block periods
-tsub   = (0:tb.nof_subbands*tb.nof_blocks-1)/tb.nof_subbands;           % time in subband periods
-tblock = (0:tb.nof_blocks-1);                                           % time in blocks
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ts       = (1:tb.subband_fft_size*tb.nof_tsub)/tb.subband_fft_size;   % time of ADC / WG samples in subband periods
+tsub_all = (1:    tb.nof_subbands*tb.nof_tsub)/tb.nof_subbands;       % time in subband periods for block of subbands
+tsub_one = (1:                    tb.nof_tsub);                       % time in subband periods for one subband
+
+sub_i    = tb.subband_i + [1: tb.nof_subbands: tb.nof_subbands*tb.nof_tsub];  % get indices of all subband_i
+
+sel_sub_i = find(ctrl_reorder_subband.select == tb.subband_i + 1, 1); % find index of subband_i in selected subbands
+
+tchan_all = (1: Mchan*Msync*Kchan)/Kchan;       % time in channel periods for block of selected subbands channels
+tchan_one = (1: tb.nof_tchan);                  % time in channel periods for one subband
+
+%chan_i   = 
 
 % Plot DT output
 fig=fig+1;
-figure('position', [300+fig*20 200-fig*20 1000 800]);
+figure('position', [300+fig*20 200-fig*10 1000 800]);
 figure(fig);
 data = data_dt';
 plot(ts, data(:))
 ylim([-1.3 1.3]);
-title(sprintf('Delay tracking output data (WG subband %6.3f)', tb.subband_nr));
-xlabel('Time [T bsn]');
+title(sprintf('Delay tracking output data (WG subband %6.3f)', tb.subband_wg));
+xlabel(sprintf('Time 1:%d [Tsub]', tb.nof_tsub));
 ylabel('Voltage');
 grid on;
 
@@ -235,7 +356,7 @@ hf_abs = abs(fftshift(fft(h / sum(h), NL)));
 hi = 1:NL;               % coefficients index
 fx = (hi - NL/2-1) / L;  % frequency axis in subband units
 fig=fig+1;
-figure('position', [300+fig*20 200-fig*20 1000 800]);
+figure('position', [300+fig*20 200-fig*10 1000 800]);
 figure(fig);
 plot(fx, db(hf_abs));  % db() = 20*log10 for voltage
 %xlim([-3 3]);
@@ -246,91 +367,141 @@ ylabel('Magnitude [dB]');
 
 % Plot subband PFIR output
 fig=fig+1;
-figure('position', [300+fig*20 200-fig*20 1000 800]);
+figure('position', [300+fig*20 200-fig*10 1000 800]);
 figure(fig);
 data = data_pfir_subband';
 plot(ts, data(:))
-title(sprintf('Subband polyphase FIR filter output - FFT input data (WG subband %6.3f)', tb.subband_nr));
-ylim([-2 2]);             % DT step when tb.subband_nr is .5 causes double range
-xlabel('Time [T bsn]');
+title(sprintf('Subband polyphase FIR filter output - FFT input data (WG subband %6.3f)', tb.subband_wg));
+ylim([-2 2]);             % DT step when tb.subband_wg is .5 causes double range
+xlabel(sprintf('Time 1:%d [Tsub]', tb.nof_tsub));
 ylabel('Voltage');
 grid on;
 
 % Plot PFFT subbands spectrum and phase
-ampl = abs(data_pfft_subband);
-phase = angle(data_pfft_subband)*180/pi;
-noise = ampl < 0.1*max(ampl(:));
-phase(noise) = 0;   % force phase of too small signals to 0
+sub_ampl = abs(data_pfft_subband);
+sub_ampl_max = max(sub_ampl(:));
+sub_phase = angle(data_pfft_subband)*180/pi;
+x = sub_ampl < 0.1*sub_ampl_max;
+sub_phase(x) = 0;   % force phase of too small signals to 0
 
 fig=fig+1;
-figure('position', [300+fig*20 200-fig*20 1000 800]);
+figure('position', [300+fig*20 200-fig*10 1000 800]);
 figure(fig);
 subplot(2,1,1);
-data = ampl';
-plot(tsub, data(:))
-title('Subband data - amplitude');
-xlabel(sprintf('Subband 0:%d at time [T bsn]', tb.nof_subbands-1));
+data = sub_ampl';
+data = data(:);
+plot(tsub_all, data, 'k', tsub_all(sub_i), data(sub_i), 'ko', tsub_all(sub_i+1), data(sub_i+1), 'kx');
+title(sprintf('Subband data - amplitude  (o = subband index %d for WG subband = %6.3f, x = next)', tb.subband_i, tb.subband_wg));
+xlabel(sprintf('Subbands 0:%d at time 1:%d [Tsub]', tb.nof_subbands-1, tb.nof_tsub));
 ylabel('Voltage');
 grid on;
 subplot(2,1,2);
-data = phase';
-plot(tsub, data(:))
+data = sub_phase';
+data = data(:);
+plot(tsub_all, data, 'k', tsub_all(sub_i), data(sub_i), 'ko', tsub_all(sub_i+1), data(sub_i+1), 'kx');
 ylim([-180 180])
-title('Subband data - phase');
-xlabel(sprintf('Subband 0:%d at time [T bsn]', tb.nof_subbands-1));
+title(sprintf('Subband data - amplitude  (o = subband index %d for WG subband = %6.3f, x = next)', tb.subband_i, tb.subband_wg));
+xlabel(sprintf('Subbands 0:%d at time 1:%d [Tsub]', tb.nof_subbands-1, tb.nof_tsub));
 ylabel('Phase [degrees]');
 grid on;
 
 % Plot phase step due to DT step for the subband that is set in the WG
-%phase = angle(data_pfft_subband(:, tb.subband_i + 1))*180/pi;
-phase = angle(data_reorder_subband(:,1))*180/pi;
-
+if isempty(sel_sub_i)
+    wg_sub_phase = angle(data_pfft_subband(:, tb.subband_i + 1))*180/pi;    % use Matlab indexing if subband is not selected
+else
+    wg_sub_phase = angle(data_reorder_subband(:, sel_sub_i))*180/pi;         % use functional reorder subband
+end
 fig=fig+1;
-figure('position', [300+fig*20 200-fig*20 1000 800]);
+figure('position', [300+fig*20 200-fig*10 1000 800]);
 figure(fig);
-plot(tblock, phase, '-o')
+plot(tsub_one, wg_sub_phase, '-o')
 ylim([-180 180])
 title(sprintf('Subband phase for subband %d in range 0:%d', tb.subband_i, tb.nof_subbands-1));
-xlabel('Time [T bsn]');
+xlabel(sprintf('Time 1:%d [Tsub]', tb.nof_tsub));
 ylabel('Phase [degrees]');
 grid on;
 
 % Plot subband spectrogram
 fig=fig+1;
-figure('position', [300+fig*20 200-fig*20 1000 800]);
+figure('position', [300+fig*20 200-fig*10 1000 800]);
 figure(fig);
-data = abs(data_pfft_subband);
-data_abs_max = max(data(:));
-data = db(data);                % no need to scale data, range is already normalized
+data = db(sub_ampl);                % no need to scale data, range is already normalized
 x = ctrl_spec_subband.db_low;
-%x = floor(min(data(data~=-Inf)))
 data(data<x) = x;
 mymap = jet(-x);
-%mymap(1,:) = [0 0 0];   % force black for dB(0)
 colormap(mymap);
 imagesc(data',[x 0]);
 colorbar;
-title(sprintf('Subband spectogram (max value = %f = %f dB)', data_abs_max, db(data_abs_max)));
-xlabel('Time [T bsn]');
-ylabel('Subband');
+title(sprintf('Subband spectogram (max value = %f = %f dB)', sub_ampl_max, db(sub_ampl_max)));
+xlabel(sprintf('Time 1:%d [Tsub]', tb.nof_tsub));
+ylabel(sprintf('Subbands 1:%d', tb.nof_subbands));
 
 % Plot corner turn subband spectrogram
 fig=fig+1;
-figure('position', [300+fig*20 200-fig*20 1000 800]);
+figure('position', [300+fig*20 200-fig*10 1000 800]);
 figure(fig);
-data = data_corner_turn(1,:);   % take one sync interval
-data = reshape(data, ctrl_corner_turn.tail_nof_block+ctrl_corner_turn.nof_block, ctrl_corner_turn.block_size);
-data = abs(data);
-data_abs_max = max(data(:));
-data = db(data);                % no need to scale data, range is already normalized
+ct_sub_data = data_corner_turn(1,:);   % take one sync interval
+ct_sub_data = reshape(ct_sub_data, ctrl_corner_turn.tail_nof_block+ctrl_corner_turn.nof_block, ctrl_corner_turn.block_size);
+if ctrl_corner_turn.tail_nof_block>0
+    ct_sub_data = ct_sub_data(ctrl_corner_turn.tail_nof_block+1:ctrl_corner_turn.tail_nof_block+ctrl_corner_turn.nof_block, :);
+end
+ct_sub_ampl = abs(ct_sub_data);
+ct_sub_ampl_max = max(ct_sub_ampl(:));
+data = db(ct_sub_ampl);                % no need to scale data, range is already normalized
 x = ctrl_spec_subband.db_low;
-%x = floor(min(data(data~=-Inf)))
 data(data<x) = x;
 mymap = jet(-x);
-%mymap(1,:) = [0 0 0];   % force black for dB(0)
 colormap(mymap);
 imagesc(data',[x 0]);
 colorbar;
-title(sprintf('Corner turn subband spectogram (max value = %f = %f dB)', data_abs_max, db(data_abs_max)));
-xlabel('Time [T bsn]');
-ylabel('Subband');
+title(sprintf('Corner turn subband spectogram for 1 sync interval (max value = %f = %f dB)', ct_sub_ampl_max, db(ct_sub_ampl_max)));
+xlabel(sprintf('Time 1:%d [Tsub]', Msub));
+ylabel(sprintf('%d selected subbands', Ksub));
+
+% Plot PFFT channel spectrum and phase
+% - Matlab has fastest array index first, Python has fastest array index last
+data = reshape(data_pfft_channel, [Nchan, Mchan, Ksub, Msync]);  % Matlab data[Nchan][Mchan][Ksub][Msync]
+data = permute(data, [2,4,1,3]);                                 % Matlab data[Mchan][Msync][Nchan][Ksub]
+data = reshape(data, [Mchan*Msync, Nchan*Ksub]);  % group time samples across sync intervals and group channels across subbands
+
+chan_ampl = abs(data);
+chan_ampl_max = max(chan_ampl(:));
+chan_phase = angle(data)*180/pi;
+x = chan_ampl < 0.1*chan_ampl_max;
+chan_phase(x) = 0;   % force phase of too small signals to 0
+
+fig=fig+1;
+figure('position', [300+fig*20 200-fig*10 1000 800]);
+figure(fig);
+subplot(2,1,1);
+data = chan_ampl';
+data = data(:);
+plot(tchan_all, data)
+title('Channel data - amplitude');
+xlabel(sprintf('%d channels (0:%d from %d selected subbands) at time 1:%d [Tchan]', Kchan, Nchan-1, Ksub, tb.nof_tchan));
+ylabel('Voltage');
+grid on;
+subplot(2,1,2);
+data = chan_phase';
+data = data(:);
+plot(tchan_all, data)
+ylim([-180 180])
+title('Channel data - phase');
+xlabel(sprintf('%d channels (0:%d from %d selected subbands) at time 1:%d [Tchan]', Kchan, Nchan-1, Ksub, tb.nof_tchan));
+ylabel('Phase [degrees]');
+grid on;
+
+% Plot channel spectrogram
+fig=fig+1;
+figure('position', [300+fig*20 200-fig*10 1000 800]);
+figure(fig);
+data = db(chan_ampl);                % no need to scale data, range is already normalized
+x = ctrl_spec_channel.db_low;
+data(data<x) = x;
+mymap = jet(-x);
+colormap(mymap);
+imagesc(data',[x 0]);
+colorbar;
+title(sprintf('Channel spectogram (max value = %f = %f dB)', chan_ampl_max, db(chan_ampl_max)));
+xlabel(sprintf('Time 1:%d [Tchan]', tb.nof_tchan));
+ylabel(sprintf('%d channels (0:%d from %d selected subbands)', Kchan, Nchan-1, Ksub));
diff --git a/applications/apertif/matlab/wg.m b/applications/apertif/matlab/wg.m
index f447fe8999..a877842ce1 100644
--- a/applications/apertif/matlab/wg.m
+++ b/applications/apertif/matlab/wg.m
@@ -24,6 +24,7 @@
 % Description :
 %   The WG data is normalized to -1:1. Data outside this range is clipped,
 %   so use ampl >> 1 to create square wave.
+%   With df ~= 0 the WG creates a chirp.
 
 function [state, data] = wg(ctrl)
 
@@ -52,4 +53,5 @@ end
 
 % Keep state for next call
 state = ctrl;
+state.freq = ctrl.freq+ctrl.df;
 state.phase = ctrl.freq*ctrl.block_size+ctrl.phase;
diff --git a/applications/apertif/systems/apertif_bf_xc/hdllib.cfg b/applications/apertif/systems/apertif_bf_xc/hdllib.cfg
index abf264eb9f..4bd1feb4d1 100644
--- a/applications/apertif/systems/apertif_bf_xc/hdllib.cfg
+++ b/applications/apertif/systems/apertif_bf_xc/hdllib.cfg
@@ -4,10 +4,14 @@ hdl_lib_uses_synth =
 hdl_lib_uses_sim = apertif_unb1_correlator apertif_unb1_fn_beamformer
 hdl_lib_technology = ip_stratixiv
 
-modelsim_copy_files = 
-
 synth_files =
     
 test_bench_files = 
     tb/vhdl/tb_apertif_bf_xc.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+
+
+[quartus_project_file]
diff --git a/applications/apertif/systems/apertif_bg_xc/hdllib.cfg b/applications/apertif/systems/apertif_bg_xc/hdllib.cfg
index 7ae12bb310..05bbee6d5c 100644
--- a/applications/apertif/systems/apertif_bg_xc/hdllib.cfg
+++ b/applications/apertif/systems/apertif_bg_xc/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = apertif_bg_xc
 hdl_library_clause_name = apertif_bg_xc_lib
 hdl_lib_uses_synth =
 hdl_lib_uses_sim = apertif_unb1_correlator apertif_unb1_fn_bf_emu
-
 hdl_lib_technology = ip_stratixiv
 
-modelsim_copy_files = 
-    ../../designs/apertif_unb1_fn_bf_emu/src/hex/ hex/
-    $RADIOHDL/libraries/dsp/filter/src/hex/ mif
-
 synth_files =
     
 test_bench_files = 
     tb/vhdl/tb_apertif_bg_xc.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../designs/apertif_unb1_fn_bf_emu/src/hex/ hex/
+    $RADIOHDL/libraries/dsp/filter/src/hex/ mif
+
+
+[quartus_project_file]
diff --git a/applications/arts/designs/arts_unb1_bg_offload/hdllib.cfg b/applications/arts/designs/arts_unb1_bg_offload/hdllib.cfg
index e72d0e9543..a8900ed80b 100644
--- a/applications/arts/designs/arts_unb1_bg_offload/hdllib.cfg
+++ b/applications/arts/designs/arts_unb1_bg_offload/hdllib.cfg
@@ -1,27 +1,37 @@
 hdl_lib_name = arts_unb1_bg_offload
 hdl_library_clause_name = arts_unb1_bg_offload_lib
 hdl_lib_uses_synth = common dp mm diag unb1_board 
+hdl_lib_technology = ip_stratixiv
+
 synth_files =
     src/vhdl/arts_offload_fifo.vhd
     src/vhdl/mm_master.vhd
     src/vhdl/arts_unb1_bg_offload.vhd
-synth_top_level_entity =
+
 test_bench_files =
     tb/vhdl/tb_arts_unb1_bg_offload.vhd
-quartus_copy_files =
-    quartus/qsys_mm_master.qsys .
-    src/hex hex
 
+
+[modelsim_project_file]
 modelsim_copy_files = 
     src/hex hex
 
-hdl_lib_technology = ip_stratixiv
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    quartus/qsys_mm_master.qsys .
+    src/hex hex
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
+    
 quartus_sdc_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.sdc
 
 quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/arts_unb1_bg_offload/qsys_mm_master/synthesis/qsys_mm_master.qip
+    
 quartus_tcl_files =
-$RADIOHDL/applications/arts/designs/arts_unb1_bg_offload/quartus/pinning/arts_unb1_bg_offload_pins.tcl
+    $RADIOHDL/applications/arts/designs/arts_unb1_bg_offload/quartus/pinning/arts_unb1_bg_offload_pins.tcl
diff --git a/applications/arts/designs/arts_unb1_sc1/src/generated/hdllib.cfg b/applications/arts/designs/arts_unb1_sc1/src/generated/hdllib.cfg
index b85e8ade45..890c2b8d4e 100644
--- a/applications/arts/designs/arts_unb1_sc1/src/generated/hdllib.cfg
+++ b/applications/arts/designs/arts_unb1_sc1/src/generated/hdllib.cfg
@@ -1,24 +1,35 @@
 hdl_lib_name = arts_unb1_sc1_bg_single_pol
 hdl_library_clause_name = arts_unb1_sc1_bg_single_pol_lib
 hdl_lib_uses_synth = common dp mm diag bf unb1_board 
+hdl_lib_technology = ip_stratixiv
+
 synth_files =
     ../arts_unb1_sc1_offload.vhd
     ../generated/mm_master.vhd
     ../generated/arts_unb1_sc1_bg_single_pol.vhd
-synth_top_level_entity =
+
 test_bench_files =
     tb_arts_unb1_sc1_bg_single_pol.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files =
     qsys_mm_master.qsys .
 
-hdl_lib_technology = ip_stratixiv
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
+    
 quartus_sdc_files =
-
-$RADIOHDL/applications/arts/designs/arts_unb1_sc1/quartus/arts_unb1_sc1_bg_single_pol.sdc
+    $RADIOHDL/applications/arts/designs/arts_unb1_sc1/quartus/arts_unb1_sc1_bg_single_pol.sdc
+    
 quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/arts_unb1_sc1_bg_single_pol/qsys_mm_master/synthesis/qsys_mm_master.qip
     $HDL_BUILD_DIR/unb2/quartus/arts_unb1_sc1_bg_single_pol/qsys_mm_master/synthesis/qsys_mm_master.qip
+    
 quartus_tcl_files =
     arts_unb1_sc1_bg_single_pol_pins.tcl
diff --git a/applications/arts/designs/arts_unb1_sc1_bf_offload/hdllib.cfg b/applications/arts/designs/arts_unb1_sc1_bf_offload/hdllib.cfg
index 05e807f045..d6dd13bdeb 100644
--- a/applications/arts/designs/arts_unb1_sc1_bf_offload/hdllib.cfg
+++ b/applications/arts/designs/arts_unb1_sc1_bf_offload/hdllib.cfg
@@ -2,29 +2,38 @@ hdl_lib_name = arts_unb1_sc1_bf_offload
 hdl_library_clause_name = arts_unb1_sc1_bf_offload_lib
 hdl_lib_uses_synth = common dp mm diag bf tr_10GbE apertif unb1_board 
 hdl_lib_uses_sim = apertif_unb1_fn_bf_emu
+hdl_lib_technology = ip_stratixiv
+
 synth_files =
     src/vhdl/arts_offload_fifo.vhd
     src/vhdl/mm_master.vhd
     src/vhdl/arts_unb1_sc1_bf_offload.vhd
-synth_top_level_entity =
+
 test_bench_files =
     tb/vhdl/tb_arts_unb1_sc1_bf_offload.vhd
-quartus_copy_files =
-    quartus/qsys_mm_master.qsys .
-    src/hex hex
 
+
+[modelsim_project_file]
 modelsim_copy_files = 
     ../../../apertif/designs/apertif_unb1_fn_bf_emu/src/hex/ hex
     src/hex hex
 
-hdl_lib_technology = ip_stratixiv
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    quartus/qsys_mm_master.qsys .
+    src/hex hex
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
 
 quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/arts_unb1_sc1_bf_offload/qsys_mm_master/synthesis/qsys_mm_master.qip
+    
 quartus_tcl_files =
-$RADIOHDL/applications/arts/designs/arts_unb1_sc1_bf_offload/quartus/pinning/arts_unb1_sc1_bf_offload_pins.tcl
+    $RADIOHDL/applications/arts/designs/arts_unb1_sc1_bf_offload/quartus/pinning/arts_unb1_sc1_bf_offload_pins.tcl
 
 quartus_sdc_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.sdc
diff --git a/applications/arts/designs/arts_unb2_sc1/src/generated/hdllib.cfg b/applications/arts/designs/arts_unb2_sc1/src/generated/hdllib.cfg
index 6ab5d2f992..d35b91c498 100644
--- a/applications/arts/designs/arts_unb2_sc1/src/generated/hdllib.cfg
+++ b/applications/arts/designs/arts_unb2_sc1/src/generated/hdllib.cfg
@@ -1,24 +1,35 @@
 hdl_lib_name = arts_unb2_sc1_bg_single_pol
 hdl_library_clause_name = arts_unb2_sc1_bg_single_pol_lib
 hdl_lib_uses_synth = common dp mm diag bf unb2_board 
+hdl_lib_technology = ip_arria10
+
 synth_files =
     ../arts_sc1_offload.vhd
     ../generated/mm_master.vhd
     ../generated/arts_unb2_sc1_bg_single_pol.vhd
-synth_top_level_entity =
+
 test_bench_files =
     tb_arts_unb2_sc1_bg_single_pol.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files =
     qsys_mm_master.qsys .
 
-hdl_lib_technology = ip_arria10
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard2/libraries/unb2_board/quartus/unb2_board.qsf
+    
 quartus_sdc_files =
-
-$RADIOHDL/applications/arts/designs/arts_unb2_sc1/quartus/arts_unb2_sc1_bg_single_pol.sdc
+    $RADIOHDL/applications/arts/designs/arts_unb2_sc1/quartus/arts_unb2_sc1_bg_single_pol.sdc
+    
 quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/arts_unb2_sc1_bg_single_pol/qsys_mm_master/synthesis/qsys_mm_master.qip
     $HDL_BUILD_DIR/unb2/quartus/arts_unb2_sc1_bg_single_pol/qsys_mm_master/synthesis/qsys_mm_master.qip
+    
 quartus_tcl_files =
-$RADIOHDL/applications/arts/designs/arts_unb2_sc1/quartus/pinning/arts_unb2_sc1_bg_single_pol_pins.tcl
+    $RADIOHDL/applications/arts/designs/arts_unb2_sc1/quartus/pinning/arts_unb2_sc1_bg_single_pol_pins.tcl
diff --git a/applications/arts/designs/arts_unb2a_fmax_test/src/generated/hdllib.cfg b/applications/arts/designs/arts_unb2a_fmax_test/src/generated/hdllib.cfg
index d11d49fd79..6929f6a45a 100644
--- a/applications/arts/designs/arts_unb2a_fmax_test/src/generated/hdllib.cfg
+++ b/applications/arts/designs/arts_unb2a_fmax_test/src/generated/hdllib.cfg
@@ -1,23 +1,34 @@
 hdl_lib_name = arts_unb2a_fmax_test
 hdl_library_clause_name = arts_unb2a_fmax_test_lib
 hdl_lib_uses_synth = common dp mm diag bf unb2a_board 
+hdl_lib_technology = ip_arria10_e3sge3
+
 synth_files =
     ../arts_sc1_offload.vhd
     ../generated/mm_master.vhd
     ../generated/arts_unb2a_fmax_test.vhd
-synth_top_level_entity =
+
 test_bench_files =
     tb_arts_unb2a_fmax_test.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files =
     qsys_mm_master.qsys .
 
-hdl_lib_technology = ip_arria10_e3sge3
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard2a/libraries/unb2a_board/quartus/unb2a_board.qsf
+    
 quartus_sdc_files =
-
-$RADIOHDL/applications/arts/designs/arts_unb2a_fmax_test/quartus/arts_unb2a_fmax_test.sdc
+    $RADIOHDL/applications/arts/designs/arts_unb2a_fmax_test/quartus/arts_unb2a_fmax_test.sdc
+    
 quartus_qip_files =
     $HDL_BUILD_DIR/unb2a/quartus/arts_unb2a_fmax_test/qsys_mm_master/synthesis/qsys_mm_master.qip
+    
 quartus_tcl_files =
-$RADIOHDL/applications/arts/designs/arts_unb2a_fmax_test/quartus/pinning/arts_unb2a_fmax_test_pins.tcl
+    $RADIOHDL/applications/arts/designs/arts_unb2a_fmax_test/quartus/pinning/arts_unb2a_fmax_test_pins.tcl
diff --git a/applications/compaan/designs/compaan_unb1_10g/hdllib.cfg b/applications/compaan/designs/compaan_unb1_10g/hdllib.cfg
index b10d822141..a419fe77cf 100644
--- a/applications/compaan/designs/compaan_unb1_10g/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_10g/hdllib.cfg
@@ -3,11 +3,6 @@ hdl_library_clause_name = compaan_unb1_10g_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag compaan tr_10GbE
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-synth_top_level_entity =
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_10g/sopc_compaan_unb1_10g.vhd
     src/vhdl/pkg_signals.vhd
@@ -17,6 +12,13 @@ synth_files =
 
 test_bench_files = 
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = quartus/sopc_compaan_unb1_10g.sopc .
 
 quartus_qsf_files = 
diff --git a/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_blockgen/hdllib.cfg b/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_blockgen/hdllib.cfg
index cd09351a98..c112ae55f5 100644
--- a/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_blockgen/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_blockgen/hdllib.cfg
@@ -3,11 +3,6 @@ hdl_library_clause_name = compaan_unb1_10g_blockgen_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag compaan tr_10GbE
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-synth_top_level_entity =
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_10g_blockgen/sopc_compaan_unb1_10g.vhd
     ../../src/vhdl/pkg_signals.vhd
@@ -19,6 +14,13 @@ synth_files =
 test_bench_files =   
     ../../tb/vhdl/tb_compaan_unb1_10g_bg_lb.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = ../../quartus/sopc_compaan_unb1_10g.sopc .
 
 quartus_qsf_files = 
@@ -31,6 +33,3 @@ quartus_qip_files = $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_10g_blockgen/sopc_c
 
 quartus_sdc_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.sdc
-
-
-
diff --git a/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_compaan/hdllib.cfg b/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_compaan/hdllib.cfg
index 93b20f4422..ce349bed0b 100644
--- a/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_compaan/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_compaan/hdllib.cfg
@@ -3,11 +3,6 @@ hdl_library_clause_name = compaan_unb1_10g_compaan_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag compaan tr_10GbE
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-synth_top_level_entity =
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_10g_compaan/sopc_compaan_unb1_10g.vhd
     ../../src/vhdl/pkg_signals.vhd
@@ -19,6 +14,13 @@ synth_files =
 test_bench_files =   
     ../../tb/vhdl/tb_compaan_unb1_10g_bg_lb.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = ../../quartus/sopc_compaan_unb1_10g.sopc .
 
 quartus_qsf_files = 
diff --git a/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_loopback/hdllib.cfg b/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_loopback/hdllib.cfg
index 4f8a6d41c5..80581ea142 100644
--- a/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_loopback/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_10g/revisions/compaan_unb1_10g_loopback/hdllib.cfg
@@ -3,11 +3,6 @@ hdl_library_clause_name = compaan_unb1_10g_loopback_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag compaan tr_10GbE
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-synth_top_level_entity =
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_10g_loopback/sopc_compaan_unb1_10g.vhd
     ../../src/vhdl/pkg_signals.vhd
@@ -19,6 +14,13 @@ synth_files =
 test_bench_files =   
     ../../tb/vhdl/tb_compaan_unb1_10g_bg_lb.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = ../../quartus/sopc_compaan_unb1_10g.sopc .
 
 quartus_qsf_files = 
diff --git a/applications/compaan/designs/compaan_unb1_10g_app/hdllib.cfg b/applications/compaan/designs/compaan_unb1_10g_app/hdllib.cfg
index 2a1a20d429..3f88257c57 100644
--- a/applications/compaan/designs/compaan_unb1_10g_app/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_10g_app/hdllib.cfg
@@ -3,8 +3,6 @@ hdl_library_clause_name = compaan_unb1_10g_app_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag tr_10GbE compaan
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
 synth_files =
     src/vhdl/compaan_unb1_10g_pkg.vhd
     src/vhdl/compaan_design.vhd
@@ -16,6 +14,13 @@ synth_files =
 test_bench_files =   
     tb/vhdl/tb_compaan_unb1_10g_app.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = quartus/qsys_compaan_unb1_10g_app.qsys .  
 
 quartus_qsf_files = 
diff --git a/applications/compaan/designs/compaan_unb1_10g_bg_db/hdllib.cfg b/applications/compaan/designs/compaan_unb1_10g_bg_db/hdllib.cfg
index 9966e451d9..8b18f9298c 100644
--- a/applications/compaan/designs/compaan_unb1_10g_bg_db/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_10g_bg_db/hdllib.cfg
@@ -3,8 +3,6 @@ hdl_library_clause_name = compaan_unb1_10g_bg_db_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag tr_10GbE
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
 synth_files =
     src/vhdl/mmm_compaan_unb1_10g_bg_db.vhd
     src/vhdl/compaan_unb1_10g_bg_db.vhd
@@ -12,6 +10,13 @@ synth_files =
 test_bench_files =   
     tb/vhdl/tb_compaan_unb1_10g_bg_db.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = quartus/qsys_compaan_unb1_10g_bg_db.qsys .  
 
 quartus_qsf_files = 
diff --git a/applications/compaan/designs/compaan_unb1_dp_offload/hdllib.cfg b/applications/compaan/designs/compaan_unb1_dp_offload/hdllib.cfg
index b42a7fd064..107cb2864a 100644
--- a/applications/compaan/designs/compaan_unb1_dp_offload/hdllib.cfg
+++ b/applications/compaan/designs/compaan_unb1_dp_offload/hdllib.cfg
@@ -3,9 +3,6 @@ hdl_library_clause_name = compaan_unb1_dp_offload_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag compaan 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $HDL_BUILD_DIR/quartus/compaan_unb1_dp_offload/sopc_compaan_unb1_dp_offload.vhd
     src/vhdl/pkg_signals.vhd
@@ -19,6 +16,11 @@ test_bench_files =
     tb/vhdl/tb_compaan_unb1_dp_offload_bg_lb.vhd
     tb/vhdl/tb_compaan_unb1_dp_offload_bg_co.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 quartus_sdc_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.sdc    
 
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 45e1ee166e..11b0b21ce8 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
@@ -3,11 +3,6 @@ hdl_library_clause_name = compaan_unb1_dp_offload_bg_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag compaan 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-synth_top_level_entity =                                                                                                                                                            
-                                                                                                                                                                                    
 synth_files = 
     $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_dp_offload_bg/sopc_compaan_unb1_dp_offload.vhd
     ../../src/vhdl/pkg_signals.vhd
@@ -22,6 +17,13 @@ test_bench_files =
     ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_lb.vhd
     ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_co.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =                                                                                                                                                            
+                                                                                                                                                                                    
 quartus_copy_files = ../../quartus/sopc_compaan_unb1_dp_offload.sopc .
 
 quartus_qsf_files = 
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 40bb05306d..369565cb0a 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
@@ -3,11 +3,6 @@ hdl_library_clause_name = compaan_unb1_dp_offload_co_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag compaan 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-synth_top_level_entity =                                                                                                                                                            
-                                                                                                                                                                                    
 synth_files = 
     $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_dp_offload_co/sopc_compaan_unb1_dp_offload.vhd
     ../../src/vhdl/pkg_signals.vhd
@@ -22,6 +17,14 @@ test_bench_files =
     ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_lb.vhd
     ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_co.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =                                                                                                                                                            
+                                                                                                                                                                                    
+
 quartus_copy_files = ../../quartus/sopc_compaan_unb1_dp_offload.sopc .
 
 quartus_qsf_files = 
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 bf3f9147aa..42fbe5f127 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
@@ -3,11 +3,6 @@ hdl_library_clause_name = compaan_unb1_dp_offload_lb_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag compaan 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-synth_top_level_entity =                                                                                                                                                            
-                                                                                                                                                                                    
 synth_files = 
     $HDL_BUILD_DIR/unb1/quartus/compaan_unb1_dp_offload_lb/sopc_compaan_unb1_dp_offload.vhd
     ../../src/vhdl/pkg_signals.vhd
@@ -22,6 +17,13 @@ test_bench_files =
     ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_lb.vhd
     ../../tb/vhdl/tb_compaan_unb1_dp_offload_bg_co.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =                                                                                                                                                            
+
 quartus_copy_files = ../../quartus/sopc_compaan_unb1_dp_offload.sopc .
 
 quartus_qsf_files = 
diff --git a/applications/compaan/libraries/hdllib.cfg b/applications/compaan/libraries/hdllib.cfg
index 88538c1211..d3cbec3c24 100644
--- a/applications/compaan/libraries/hdllib.cfg
+++ b/applications/compaan/libraries/hdllib.cfg
@@ -1,7 +1,6 @@
 hdl_lib_name = compaan
 hdl_library_clause_name = compaan_lib
 hdl_lib_uses_synth = common technology ip_arria10_fifo ip_stratixiv_fifo tech_fifo dp ip_stratixiv_ram ip_arria10_ram tech_memory
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files = 
@@ -45,3 +44,10 @@ synth_files =
     src/vhdl/ipcore.vhd
 
 test_bench_files = 
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/altera/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/altera/hdllib.cfg
index 42fe0e0764..7415be80bd 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/altera/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/altera/hdllib.cfg
@@ -3,13 +3,15 @@ hdl_library_clause_name = compaandesign_com_common_altera_1_lib
 hdl_lib_uses_synth = common dp 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/fsl_v20.vhd
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/common/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/common/hdllib.cfg
index f2be4df5fd..9fccfe0bb8 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/common/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/common/hdllib.cfg
@@ -3,13 +3,15 @@ hdl_library_clause_name = compaandesign_com_common_common_1_lib
 hdl_lib_uses_synth = 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/hw_node_pkg.vhd
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/const_connector/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/const_connector/hdllib.cfg
index b0677c9a95..cebacc969f 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/const_connector/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/const_connector/hdllib.cfg
@@ -3,13 +3,15 @@ hdl_library_clause_name = compaandesign_com_common_const_connector_1_lib
 hdl_lib_uses_synth = 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/const_connector.vhd
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/extern_connector/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/extern_connector/hdllib.cfg
index 1e07fc0d1a..59dd1b4a27 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/extern_connector/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/extern_connector/hdllib.cfg
@@ -3,13 +3,15 @@ hdl_library_clause_name = compaandesign_com_common_extern_connector_1_lib
 hdl_lib_uses_synth = 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/extern_connector.vhd
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/fifo/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/fifo/hdllib.cfg
index b72c7f121f..77021e60bc 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/fifo/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/fifo/hdllib.cfg
@@ -3,10 +3,6 @@ hdl_library_clause_name = compaandesign_com_common_fifo_1_lib
 hdl_lib_uses_synth = compaandesign_com_common_altera_1 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/async_fifo_bram.vhd
 	src/vhdl/async_fifo.vhd
@@ -18,4 +14,10 @@ synth_files =
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/hwnode/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/hwnode/hdllib.cfg
index a8a07f827b..49dc9893c3 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/hwnode/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/hwnode/hdllib.cfg
@@ -3,10 +3,6 @@ hdl_library_clause_name = compaandesign_com_common_hwnode_1_lib
 hdl_lib_uses_synth = compaandesign_com_common_common_1 compaandesign_com_common_altera_1 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/controller.vhd
 	src/vhdl/counter.vhd
@@ -19,4 +15,10 @@ synth_files =
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/wire_connector/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/wire_connector/hdllib.cfg
index 7218370814..c93ece68d9 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/wire_connector/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/common/wire_connector/hdllib.cfg
@@ -3,13 +3,15 @@ hdl_library_clause_name = compaandesign_com_common_wire_connector_1_lib
 hdl_lib_uses_synth = 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/wire_connector.vhd
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/functions/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/functions/hdllib.cfg
index 5c0ba00ff1..325e06a33f 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/functions/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/functions/hdllib.cfg
@@ -3,10 +3,6 @@ hdl_library_clause_name = compaandesign_com_ipcore2rtl_functions_1_lib
 hdl_lib_uses_synth = compaandesign_com_common_hwnode_1 compaandesign_com_common_common_1 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/compaan_outlinedproc0.vhd
 	src/vhdl/compaan_outlinedproc0_pipeline.vhd
@@ -17,4 +13,9 @@ synth_files =
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_1/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_1/hdllib.cfg
index bc7ff43915..e4a030a324 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_1/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_1/hdllib.cfg
@@ -3,10 +3,6 @@ hdl_library_clause_name = compaandesign_com_ipcore2rtl_hwn_nd_1_1_lib
 hdl_lib_uses_synth = compaandesign_com_ipcore2rtl_functions_1 compaandesign_com_common_hwnode_1 compaandesign_com_common_common_1 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/ipcore2rtl_hwn_nd_1_execution_unit.vhd
 	src/vhdl/ipcore2rtl_hwn_nd_1_eval_logic_rd.vhd
@@ -15,4 +11,10 @@ synth_files =
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_2/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_2/hdllib.cfg
index fbc97274bd..7dcabc08d6 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_2/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_2/hdllib.cfg
@@ -3,10 +3,6 @@ hdl_library_clause_name = compaandesign_com_ipcore2rtl_hwn_nd_2_1_lib
 hdl_lib_uses_synth = compaandesign_com_ipcore2rtl_functions_1 compaandesign_com_common_hwnode_1 compaandesign_com_common_common_1 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/ipcore2rtl_hwn_nd_2_execution_unit.vhd
 	src/vhdl/ipcore2rtl_hwn_nd_2_eval_logic_rd.vhd
@@ -15,4 +11,10 @@ synth_files =
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_3/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_3/hdllib.cfg
index abe75a4174..5b1cdc40ee 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_3/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/hwn_nd_3/hdllib.cfg
@@ -3,10 +3,6 @@ hdl_library_clause_name = compaandesign_com_ipcore2rtl_hwn_nd_3_1_lib
 hdl_lib_uses_synth = compaandesign_com_ipcore2rtl_functions_1 compaandesign_com_common_hwnode_1 compaandesign_com_common_common_1 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/ipcore2rtl_hwn_nd_3_execution_unit.vhd
 	src/vhdl/ipcore2rtl_hwn_nd_3_eval_logic_rd.vhd
@@ -15,4 +11,10 @@ synth_files =
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/register_rf/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/register_rf/hdllib.cfg
index 921a0a4da0..5770934540 100644
--- a/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/register_rf/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/compaandesign_com/ipcore2rtl/register_rf/hdllib.cfg
@@ -3,13 +3,15 @@ hdl_library_clause_name = compaandesign_com_ipcore2rtl_register_rf_1_lib
 hdl_lib_uses_synth = 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files =
 	src/vhdl/register_rf.vhd
 
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files =
+
+
+[quartus_project_file]
+
diff --git a/applications/compaan/libraries/vhdl_altera/hdllib.cfg b/applications/compaan/libraries/vhdl_altera/hdllib.cfg
index af71b8418a..1d1d8e9da8 100644
--- a/applications/compaan/libraries/vhdl_altera/hdllib.cfg
+++ b/applications/compaan/libraries/vhdl_altera/hdllib.cfg
@@ -1,13 +1,8 @@
 hdl_lib_name = ipcore
 hdl_library_clause_name = ipcore_lib
-
 hdl_lib_uses_synth = compaandesign_com_ipcore2rtl_hwn_nd_3_1 compaandesign_com_ipcore2rtl_hwn_nd_1_1 compaandesign_com_ipcore2rtl_register_rf_1 compaandesign_com_ipcore2rtl_hwn_nd_2_1 compaandesign_com_common_altera_1 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-# Specify here all the files you want to be included in the library.
 synth_files = 
 	src/vhdl/ipcore.vhd
 	src/vhdl/ipcore2rtl_ed_1_ip_wrapper.vhd
@@ -19,3 +14,10 @@ synth_files =
 
 test_bench_files =
 	src/vhdl/system_ext_TB.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/dig_receiver/designs/dig_receiver_bn/hdllib.cfg b/applications/dig_receiver/designs/dig_receiver_bn/hdllib.cfg
index 21b93ffb78..0f10892983 100644
--- a/applications/dig_receiver/designs/dig_receiver_bn/hdllib.cfg
+++ b/applications/dig_receiver/designs/dig_receiver_bn/hdllib.cfg
@@ -2,16 +2,8 @@ hdl_lib_name = dig_receiver_bn
 hdl_library_clause_name = dig_receiver_bn_lib
 hdl_lib_uses_synth = common mm dp unb1_board diag digital_receiver dr_mesh test_generator
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity = dig_receiver_bn
-
-quartus_copy_files =
-    $RADIOHDL/applications/dig_receiver/designs/dig_receiver_bn/quartus/sopc_dig_receiver_bn.sopc .
-
-modelsim_copy_files = 
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/dig_receiver_bn/sopc_dig_receiver_bn.vhd
     $RADIOHDL/applications/dig_receiver/designs/dig_receiver_bn/src/vhdl/adc_lvds.vhd
@@ -21,6 +13,17 @@ synth_files =
 
 test_bench_files =
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+
+
+[quartus_project_file]
+synth_top_level_entity = dig_receiver_bn
+
+quartus_copy_files =
+    $RADIOHDL/applications/dig_receiver/designs/dig_receiver_bn/quartus/sopc_dig_receiver_bn.sopc .
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
 
diff --git a/applications/dig_receiver/designs/dig_receiver_fn/hdllib.cfg b/applications/dig_receiver/designs/dig_receiver_fn/hdllib.cfg
index 9a2dece9f4..9d3d978741 100644
--- a/applications/dig_receiver/designs/dig_receiver_fn/hdllib.cfg
+++ b/applications/dig_receiver/designs/dig_receiver_fn/hdllib.cfg
@@ -2,16 +2,8 @@ hdl_lib_name = dig_receiver_fn
 hdl_library_clause_name = dig_receiver_fn_lib
 hdl_lib_uses_synth = common mm dp unb1_board diag digital_receiver dr_mesh tr_10GbE dr_udp_packetizer
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity = dig_receiver_fn
-
-quartus_copy_files =
-    $RADIOHDL/applications/dig_receiver/designs/dig_receiver_fn/quartus/sopc_dig_receiver_fn.sopc .
-
-modelsim_copy_files = 
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/dig_receiver_fn/sopc_dig_receiver_fn.vhd
     $RADIOHDL/applications/dig_receiver/designs/dig_receiver_fn/src/vhdl/dig_receiver_mm.vhd
@@ -20,6 +12,17 @@ synth_files =
 
 test_bench_files =
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+
+
+[quartus_project_file]
+synth_top_level_entity = dig_receiver_fn
+
+quartus_copy_files =
+    $RADIOHDL/applications/dig_receiver/designs/dig_receiver_fn/quartus/sopc_dig_receiver_fn.sopc .
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
 
diff --git a/applications/dig_receiver/libraries/common_OA/hdllib.cfg b/applications/dig_receiver/libraries/common_OA/hdllib.cfg
index 5121fe88af..77e6522acd 100644
--- a/applications/dig_receiver/libraries/common_OA/hdllib.cfg
+++ b/applications/dig_receiver/libraries/common_OA/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = common_OA
 hdl_library_clause_name = common_OA_lib
 hdl_lib_uses_synth = technology common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/common_OA/src/vhdl/common_ram_wsrs.vhd
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/common_OA/src/vhdl/common_pulse_delay.vhd
@@ -24,3 +20,9 @@ synth_files =
 
 test_bench_files = 
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/dig_receiver/libraries/dbbc/hdllib.cfg b/applications/dig_receiver/libraries/dbbc/hdllib.cfg
index f609d66d89..5415750a0f 100644
--- a/applications/dig_receiver/libraries/dbbc/hdllib.cfg
+++ b/applications/dig_receiver/libraries/dbbc/hdllib.cfg
@@ -2,11 +2,8 @@ hdl_lib_name = dbbc
 hdl_library_clause_name = dbbc_lib
 hdl_lib_uses_synth = common mm dp common_OA
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
 
 synth_files =
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/dbbc/src/vhdl/dBBC_pkg.vhd
@@ -25,3 +22,9 @@ synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/dig_receiver/libraries/digital_receiver/hdllib.cfg b/applications/dig_receiver/libraries/digital_receiver/hdllib.cfg
index ff870d0d48..8c4c60e733 100644
--- a/applications/dig_receiver/libraries/digital_receiver/hdllib.cfg
+++ b/applications/dig_receiver/libraries/digital_receiver/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = digital_receiver
 hdl_library_clause_name = digital_receiver_lib
 hdl_lib_uses_synth = common mm dp common_OA dbbc fft_module_n vdif_formatter
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/DigitalReceiver/src/vhdl/digrec_pkg.vhd
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/DigitalReceiver/src/vhdl/realign_data.vhd
@@ -44,3 +40,10 @@ synth_files =
    
 test_bench_files = 
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
+
diff --git a/applications/dig_receiver/libraries/dr_mesh/hdllib.cfg b/applications/dig_receiver/libraries/dr_mesh/hdllib.cfg
index 0fe39f460f..975bf15e87 100644
--- a/applications/dig_receiver/libraries/dr_mesh/hdllib.cfg
+++ b/applications/dig_receiver/libraries/dr_mesh/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = dr_mesh
 hdl_library_clause_name = dr_mesh_lib
 hdl_lib_uses_synth = common mm dp diag tr_nonbonded
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/dr_mesh/src/vhdl/mesh_pkg.vhd
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/dr_mesh/src/vhdl/mesh_resample_47.vhd
@@ -27,3 +23,9 @@ synth_files =
 
 test_bench_files = 
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/dig_receiver/libraries/fft_module_n/hdllib.cfg b/applications/dig_receiver/libraries/fft_module_n/hdllib.cfg
index 7a3f5e1396..8f04b48ea7 100644
--- a/applications/dig_receiver/libraries/fft_module_n/hdllib.cfg
+++ b/applications/dig_receiver/libraries/fft_module_n/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = fft_module_n
 hdl_library_clause_name = fft_module_n_lib
 hdl_lib_uses_synth = technology common common_OA
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/fft/src/vhdl/fft_pkg.vhd
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/fft/src/vhdl/multadd.vhd
@@ -50,3 +46,9 @@ test_bench_files =
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/fft/src/vhdl/sims/tb_fftmod4_dav.vhd
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/fft/src/vhdl/sims/tb_real_fft.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/dig_receiver/libraries/polyfilt/hdllib.cfg b/applications/dig_receiver/libraries/polyfilt/hdllib.cfg
index 6cf92e38c3..17d3b4a2d9 100644
--- a/applications/dig_receiver/libraries/polyfilt/hdllib.cfg
+++ b/applications/dig_receiver/libraries/polyfilt/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = polyfilt
 hdl_library_clause_name = polyfilt_lib
 hdl_lib_uses_synth = technology common common_OA fft_module_n
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
   $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/polyfilt/src/vhdl/channelizer_pfb_4.vhd
   $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/polyfilt/src/vhdl/poly_filter_main.vhd
@@ -25,3 +21,9 @@ synth_files =
 test_bench_files =
   $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/polyfilt/src/vhdl/poly_filt_tb.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/dig_receiver/libraries/test_generator/hdllib.cfg b/applications/dig_receiver/libraries/test_generator/hdllib.cfg
index ea9fd7c062..913d052d6d 100644
--- a/applications/dig_receiver/libraries/test_generator/hdllib.cfg
+++ b/applications/dig_receiver/libraries/test_generator/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = test_generator
 hdl_library_clause_name = test_generator_lib
 hdl_lib_uses_synth = common mm dp diag axi4
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/test_generator/src/vhdl/cal_pulse.vhd
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/test_generator/src/vhdl/xorshift_RNG.vhd
@@ -20,3 +16,11 @@ synth_files =
     
 test_bench_files = 
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/test_generator/src/vhdl/tb_test_generator.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
+
diff --git a/applications/dig_receiver/libraries/udp_packetizer/hdllib.cfg b/applications/dig_receiver/libraries/udp_packetizer/hdllib.cfg
index 92fb3ae730..6918d4a195 100644
--- a/applications/dig_receiver/libraries/udp_packetizer/hdllib.cfg
+++ b/applications/dig_receiver/libraries/udp_packetizer/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = dr_udp_packetizer
 hdl_library_clause_name = dr_udp_packetizer_lib
 hdl_lib_uses_synth = common mm dp technology_lib tr_10GbE_lib tech_mac_10g tech_eth_10g tr_xaui
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/udp_packetizer/src/vhdl/udp_packetizer_pkg.vhd
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/udp_packetizer/src/vhdl/udp_packetizer_st.vhd
@@ -16,3 +12,9 @@ synth_files =
 
 test_bench_files = 
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/dig_receiver/libraries/vdif_formatter/hdllib.cfg b/applications/dig_receiver/libraries/vdif_formatter/hdllib.cfg
index 53af6f3871..be0a31eb1e 100644
--- a/applications/dig_receiver/libraries/vdif_formatter/hdllib.cfg
+++ b/applications/dig_receiver/libraries/vdif_formatter/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = vdif_formatter
 hdl_library_clause_name = vdif_formatter_lib
 hdl_lib_uses_synth = common mm dp common_OA 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/formatter/src/vhdl/format_header.vhd
     $SVN/Digital_Receiver/trunk/Firmware/modules_HDL/formatter/src/vhdl/formatter.vhd
@@ -19,3 +15,9 @@ synth_files =
 
 test_bench_files = 
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/applications/rfidb/designs/rfidb/hdllib.cfg b/applications/rfidb/designs/rfidb/hdllib.cfg
index f84012fe01..6c2dd63869 100644
--- a/applications/rfidb/designs/rfidb/hdllib.cfg
+++ b/applications/rfidb/designs/rfidb/hdllib.cfg
@@ -2,20 +2,8 @@ hdl_lib_name = unb1_rfidb
 hdl_library_clause_name = unb1_rfidb_lib
 hdl_lib_uses_synth =  common dp unb1_board diag eth detector tech_tse
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    quartus/qsys_unb1_rfidb.qsys .
-    $RADIOHDL/libraries/base/dp/designs/unb1_dp_offload/src/hex hex
-
-modelsim_copy_files =
-    $RADIOHDL/libraries/base/dp/designs/unb1_dp_offload/src/hex hex
-    tb/data data
-    modelsim .
-
 synth_files =
     src/vhdl/rfidb_constants_pkg.vhd
     src/vhdl/qsys_unb1_rfidb_pkg.vhd
@@ -25,6 +13,21 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_rfidb.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files =
+    $RADIOHDL/libraries/base/dp/designs/unb1_dp_offload/src/hex hex
+    tb/data data
+    modelsim .
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    quartus/qsys_unb1_rfidb.qsys .
+    $RADIOHDL/libraries/base/dp/designs/unb1_dp_offload/src/hex hex
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
 
diff --git a/applications/rfidb/librairies/detector/hdllib.cfg b/applications/rfidb/librairies/detector/hdllib.cfg
index 308f73de60..063eedd992 100644
--- a/applications/rfidb/librairies/detector/hdllib.cfg
+++ b/applications/rfidb/librairies/detector/hdllib.cfg
@@ -1,7 +1,6 @@
 hdl_lib_name = detector
 hdl_library_clause_name = detector_lib
 hdl_lib_uses_synth = common technology mm ip_arria10_fifo ip_stratixiv_fifo tech_fifo dp ip_stratixiv_ram ip_arria10_ram tech_memory
-
 hdl_lib_technology = 
 
 synth_files = 
@@ -14,7 +13,6 @@ synth_files =
     src/vhdl/detector.vhd
     src/vhdl/write_rfi_db.vhd
 
-
 test_bench_files = 
     tb/vhdl/tb_universal_shift_reg.vhd
     tb/vhdl/tb_robust_mean.vhd
@@ -23,5 +21,10 @@ test_bench_files =
     tb/vhdl/tb_detector.vhd
     tb/vhdl/tb_write_rfi_db.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 quartus_qip_files =
     $RADIOHDL/applications/rfidb/designs/rfidb/quartus/alt_probe.qip
diff --git a/applications/stagiair/designs/stagiair_unb1_wave_gen/hdllib.cfg b/applications/stagiair/designs/stagiair_unb1_wave_gen/hdllib.cfg
index b55ed95039..4dda433d6c 100644
--- a/applications/stagiair/designs/stagiair_unb1_wave_gen/hdllib.cfg
+++ b/applications/stagiair/designs/stagiair_unb1_wave_gen/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = stagiair_unb1_wave_gen
 hdl_library_clause_name = stagiair_unb1_wave_gen_lib
 hdl_lib_uses_synth = common mm unb1_board wave_gen
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -14,6 +13,11 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_stagiair_unb1_wave_gen.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/applications/stagiair/libraries/wave_gen/hdllib.cfg b/applications/stagiair/libraries/wave_gen/hdllib.cfg
index b5891f574e..14cd061512 100644
--- a/applications/stagiair/libraries/wave_gen/hdllib.cfg
+++ b/applications/stagiair/libraries/wave_gen/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = wave_gen
 hdl_library_clause_name = wave_gen_lib
 hdl_lib_uses_synth = common_mult common dp mm diag
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -14,3 +13,8 @@ test_bench_files =
     tb/vhdl/tb_sine_gen.vhd
     tb/vhdl/tb_wave_gen.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
diff --git a/boards/uniboard1/designs/unb1_bn_capture/hdllib.cfg b/boards/uniboard1/designs/unb1_bn_capture/hdllib.cfg
index 007320343e..b6e76a1270 100644
--- a/boards/uniboard1/designs/unb1_bn_capture/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_bn_capture/hdllib.cfg
@@ -3,11 +3,6 @@ hdl_library_clause_name = unb1_bn_capture_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag aduh 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-synth_top_level_entity =
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_bn_capture/sopc_unb1_bn_capture.vhd
     src/vhdl/unb1_bn_capture_pkg.vhd
@@ -19,13 +14,19 @@ test_bench_files =
     tb/vhdl/tb_unb1_bn_capture.vhd
     tb/vhdl/tb_node_unb1_bn_capture.vhd
 
-quartus_copy_files = quartus/sopc_unb1_bn_capture.sopc .
-                     $RADIOHDL/libraries/io/i2c/tb/data data
-                     $RADIOHDL/libraries/base/diag/src/data data
 
+[modelsim_project_file]
 modelsim_copy_files = $RADIOHDL/libraries/io/i2c/tb/data data   
                       $RADIOHDL/libraries/base/diag/src/data data
 
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files = quartus/sopc_unb1_bn_capture.sopc .
+                     $RADIOHDL/libraries/io/i2c/tb/data data
+                     $RADIOHDL/libraries/base/diag/src/data data
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/boards/uniboard1/designs/unb1_bn_terminal_bg/hdllib.cfg b/boards/uniboard1/designs/unb1_bn_terminal_bg/hdllib.cfg
index 81ccf6d574..327cfda99a 100644
--- a/boards/uniboard1/designs/unb1_bn_terminal_bg/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_bn_terminal_bg/hdllib.cfg
@@ -3,11 +3,6 @@ hdl_library_clause_name = unb1_bn_terminal_bg_lib
 hdl_lib_uses_synth = common unb1_board dp eth tech_tse diag bf  
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
-synth_top_level_entity =
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_bn_terminal_bg/sopc_unb1_bn_terminal_bg.vhd
     src/vhdl/node_unb1_bn_terminal_bg.vhd
@@ -17,8 +12,14 @@ test_bench_files =
     tb/vhdl/tb_node_unb1_bn_terminal_bg.vhd
     tb/vhdl/tb_tb_node_unb1_bn_terminal_bg.vhd    
 
+
+[modelsim_project_file]
 modelsim_copy_files = $RADIOHDL/libraries/base/diag/src/data data
 
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = quartus/sopc_unb1_bn_terminal_bg.sopc .
                      $RADIOHDL/libraries/base/diag/src/data data 
 
@@ -32,7 +33,3 @@ quartus_qip_files = $HDL_BUILD_DIR/unb1/quartus/unb1_bn_terminal_bg/sopc_unb1_bn
 
 quartus_sdc_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.sdc
-
-
-
-
diff --git a/boards/uniboard1/designs/unb1_ddr3/hdllib.cfg b/boards/uniboard1/designs/unb1_ddr3/hdllib.cfg
index 9d5067b941..5c7bc018d7 100644
--- a/boards/uniboard1/designs/unb1_ddr3/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_ddr3/hdllib.cfg
@@ -16,9 +16,13 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_ddr3.vhd
 
+
+[modelsim_project_file]
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
     
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_dual_rank/hdllib.cfg b/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_dual_rank/hdllib.cfg
index 3f5a3a121c..a788059ab4 100644
--- a/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_dual_rank/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_dual_rank/hdllib.cfg
@@ -3,7 +3,6 @@ hdl_library_clause_name = unb1_ddr3_reorder_dual_rank_lib
 hdl_lib_uses_synth = common technology mm i2c unb1_board dp eth tech_tse diag io_ddr reorder
 hdl_lib_uses_sim = 
 hdl_lib_technology = ip_stratixiv
-
 hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_slave 
                    ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave 
                    ip_stratixiv_ddr3_uphy_4g_single_rank_800_master                   
@@ -20,15 +19,22 @@ test_bench_files =
     ../../tb/vhdl/tb_unb1_ddr3_reorder.vhd
     tb_unb1_ddr3_reorder_dual_rank.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
+    
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
     ../../quartus/sopc_unb1_ddr3_reorder.sopc .
     ../../src/hex hex
 
-modelsim_copy_files = 
-    ../../src/hex hex
-
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
@@ -42,6 +48,3 @@ quartus_qip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip
     $RADIOHDL/build/unb1/quartus/unb1_ddr3_reorder_dual_rank/sopc_unb1_ddr3_reorder.qip
     
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
-    
diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_single_rank/hdllib.cfg b/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_single_rank/hdllib.cfg
index 4cd2921d16..ab76e6abc4 100644
--- a/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_single_rank/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_single_rank/hdllib.cfg
@@ -19,15 +19,22 @@ test_bench_files =
     ../../tb/vhdl/tb_unb1_ddr3_reorder.vhd
     tb_unb1_ddr3_reorder_single_rank.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+    ../../src/hex hex
+
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
+    
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
     ../../quartus/sopc_unb1_ddr3_reorder.sopc .
     ../../src/hex hex
 
-modelsim_copy_files = 
-    ../../src/hex hex
-
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
@@ -41,6 +48,3 @@ quartus_qip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/generated/ip_stratixiv_ddr3_uphy_4g_single_rank_800_master.qip
     $RADIOHDL/build/unb1/quartus/unb1_ddr3_reorder_single_rank/sopc_unb1_ddr3_reorder.qip
     
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
-    
diff --git a/boards/uniboard1/designs/unb1_ddr3_transpose/hdllib.cfg b/boards/uniboard1/designs/unb1_ddr3_transpose/hdllib.cfg
index 75e963d7fd..3d32971246 100644
--- a/boards/uniboard1/designs/unb1_ddr3_transpose/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_ddr3_transpose/hdllib.cfg
@@ -2,9 +2,8 @@ hdl_lib_name = unb1_ddr3_transpose
 hdl_library_clause_name = unb1_ddr3_transpose_lib
 hdl_lib_uses_synth = common mm i2c unb1_board dp eth diagnostics ddr3
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_slave
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_slave
 
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_ddr3_transpose/sopc_unb_ddr3_transpose.vhd
@@ -14,6 +13,13 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_ddr3_transpose.vhd
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
@@ -32,7 +38,3 @@ quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_ddr3_transpose/sopc_unb_ddr3_transpose.qip
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
-
-
diff --git a/boards/uniboard1/designs/unb1_fn_terminal_db/hdllib.cfg b/boards/uniboard1/designs/unb1_fn_terminal_db/hdllib.cfg
index 2addfe9782..fb01a093b4 100644
--- a/boards/uniboard1/designs/unb1_fn_terminal_db/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_fn_terminal_db/hdllib.cfg
@@ -3,8 +3,6 @@ hdl_library_clause_name = unb1_fn_terminal_db_lib
 hdl_lib_uses_synth = common technology mm i2c unb1_board diag 
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
 synth_files =   
     $HDL_BUILD_DIR/unb1/quartus/unb1_fn_terminal_db/sopc_unb1_fn_terminal_db.vhd
     src/vhdl/mmm_unb1_fn_terminal_db.vhd
@@ -13,8 +11,14 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_fn_terminal_db.vhd
 
+
+[modelsim_project_file]
 #modelsim_copy_files = src/hex hex                                                   
 
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = quartus/sopc_unb1_fn_terminal_db.sopc .
 
 quartus_qsf_files =                                                       
diff --git a/boards/uniboard1/designs/unb1_minimal/hdllib.cfg b/boards/uniboard1/designs/unb1_minimal/hdllib.cfg
index 503fcc0212..19bf76180a 100644
--- a/boards/uniboard1/designs/unb1_minimal/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_minimal/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb1_minimal
 hdl_library_clause_name = unb1_minimal_lib
 hdl_lib_uses_synth = common mm unb1_board 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -14,3 +13,9 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_minimal.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_mm_arbiter/hdllib.cfg b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_mm_arbiter/hdllib.cfg
index 6bc51c9a80..573fbd31de 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_mm_arbiter/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_mm_arbiter/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb1_minimal_mm_arbiter
 hdl_library_clause_name = unb1_minimal_mm_arbiter_lib
 hdl_lib_uses_synth = unb1_board unb1_minimal
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -11,6 +10,11 @@ synth_files =
 test_bench_files = 
     tb_unb1_minimal_mm_arbiter.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/hdllib.cfg b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/hdllib.cfg
index 29572a52c1..8ce77c6be8 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb1_minimal_qsys
 hdl_library_clause_name = unb1_minimal_qsys_lib
 hdl_lib_uses_synth = unb1_board unb1_minimal
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -11,8 +10,10 @@ synth_files =
 test_bench_files = 
     tb_unb1_minimal_qsys.vhd
 
+
 [modelsim_project_file]
 
+
 [quartus_project_file]
 synth_top_level_entity =
 
diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/hdllib.cfg b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/hdllib.cfg
index 2550cc33cc..47ab642c83 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb1_minimal_qsys_wo_pll
 hdl_library_clause_name = unb1_minimal_qsys_wo_pll_lib
 hdl_lib_uses_synth = unb1_board common mm
 hdl_lib_uses_sim =
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -13,6 +12,11 @@ synth_files =
 test_bench_files =
     tb_unb1_minimal_qsys_wo_pll.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/hdllib.cfg b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/hdllib.cfg
index 7088247037..b533e42f36 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb1_minimal_sopc
 hdl_library_clause_name = unb1_minimal_sopc_lib
 hdl_lib_uses_synth = unb1_board unb1_minimal
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -11,6 +10,11 @@ synth_files =
 test_bench_files = 
     tb_unb1_minimal_sopc.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/hdllib.cfg b/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/hdllib.cfg
index a1d0c7c506..f687fcbc73 100644
--- a/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/hdllib.cfg
@@ -3,8 +3,6 @@ hdl_library_clause_name = unb1_terminal_bg_mesh_db_lib
 hdl_lib_uses_synth = common technology mm i2c unb1_board diag eth tech_tse
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
 synth_files =   
     $HDL_BUILD_DIR/unb1/quartus/unb1_terminal_bg_mesh_db/qsys_unb1_terminal_bg_mesh_db/synthesis/qsys_unb1_terminal_bg_mesh_db.v
     src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd
@@ -14,8 +12,14 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_terminal_bg_mesh_db.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files = src/hex hex                                                   
 
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = quartus/qsys_unb1_terminal_bg_mesh_db.qsys .
                      src/hex hex                                                   
 quartus_qsf_files = 
diff --git a/boards/uniboard1/designs/unb1_test/hdllib.cfg b/boards/uniboard1/designs/unb1_test/hdllib.cfg
index e1997ac46d..5fe53f6bc3 100644
--- a/boards/uniboard1/designs/unb1_test/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb1_test
 hdl_library_clause_name = unb1_test_lib
 hdl_lib_uses_synth = common technology mm unb1_board dp eth tech_tse tr_10GbE mdio diagnostics diag io_ddr tech_ddr
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -15,3 +14,9 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_test.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/hdllib.cfg
index 4f3efa6d0f..114de10212 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/hdllib.cfg
@@ -2,9 +2,11 @@ hdl_lib_name = unb1_test_10GbE
 hdl_library_clause_name = unb1_test_10GbE_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master ip_stratixiv_ddr3_uphy_4g_800_slave ip_stratixiv_ddr3_uphy_4g_single_rank_800_master ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave 
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master
+                   ip_stratixiv_ddr3_uphy_4g_800_slave
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave 
 
 synth_files =
     unb1_test_10GbE.vhd
@@ -12,9 +14,13 @@ synth_files =
 test_bench_files = 
     tb_unb1_test_10GbE.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE_tx_only/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE_tx_only/hdllib.cfg
index 633c042366..5f2928ba59 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE_tx_only/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE_tx_only/hdllib.cfg
@@ -2,9 +2,11 @@ hdl_lib_name = unb1_test_10GbE_tx_only
 hdl_library_clause_name = unb1_test_10GbE_tx_only_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master ip_stratixiv_ddr3_uphy_4g_800_slave ip_stratixiv_ddr3_uphy_4g_single_rank_800_master ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave 
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master
+                   ip_stratixiv_ddr3_uphy_4g_800_slave
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave 
 
 synth_files =
     unb1_test_10GbE_tx_only.vhd
@@ -12,9 +14,13 @@ synth_files =
 test_bench_files = 
     tb_unb1_test_10GbE_tx_only.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_1GbE/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_1GbE/hdllib.cfg
index a2620cc92c..e7eae92f05 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_1GbE/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_1GbE/hdllib.cfg
@@ -2,9 +2,11 @@ hdl_lib_name = unb1_test_1GbE
 hdl_library_clause_name = unb1_test_1GbE_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master ip_stratixiv_ddr3_uphy_4g_800_slave ip_stratixiv_ddr3_uphy_4g_single_rank_800_master ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave 
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master
+                   ip_stratixiv_ddr3_uphy_4g_800_slave
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave 
 
 synth_files =
     unb1_test_1GbE.vhd
@@ -12,9 +14,13 @@ synth_files =
 test_bench_files = 
     tb_unb1_test_1GbE.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/hdllib.cfg
index 72bd3170f6..309f8c6efc 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/hdllib.cfg
@@ -2,9 +2,10 @@ hdl_lib_name = unb1_test_all
 hdl_library_clause_name = unb1_test_all_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_slave ip_stratixiv_ddr3_uphy_4g_single_rank_800_master ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_slave
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
 
 synth_files =
     unb1_test_all.vhd
@@ -12,9 +13,16 @@ synth_files =
 test_bench_files = 
     tb_unb1_test_all.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
@@ -38,6 +46,3 @@ quartus_qip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip
     #$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/generated/ip_stratixiv_ddr3_uphy_4g_800_slave.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
-
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/hdllib.cfg
index 6471298ee8..6603d3c125 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/hdllib.cfg
@@ -2,9 +2,10 @@ hdl_lib_name = unb1_test_ddr
 hdl_library_clause_name = unb1_test_ddr_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_slave ip_stratixiv_ddr3_uphy_4g_single_rank_800_master ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_slave
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
 
 synth_files =
     unb1_test_ddr.vhd
@@ -12,9 +13,16 @@ synth_files =
 test_bench_files = 
     tb_unb1_test_ddr.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
+    
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
@@ -38,6 +46,3 @@ quartus_qip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip
     #$RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/generated/ip_stratixiv_ddr3_uphy_4g_800_slave.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
-
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I/hdllib.cfg
index a0af4901a7..1cc1ad308b 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I/hdllib.cfg
@@ -2,9 +2,12 @@ hdl_lib_name = unb1_test_ddr_16g_MB_I
 hdl_library_clause_name = unb1_test_ddr_16g_MB_I_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master ip_stratixiv_ddr3_uphy_4g_800_slave ip_stratixiv_ddr3_uphy_4g_single_rank_800_master ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master
+                   ip_stratixiv_ddr3_uphy_4g_800_slave
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
+
 
 synth_files =
     unb1_test_ddr_16g_MB_I.vhd
@@ -12,9 +15,16 @@ synth_files =
 test_bench_files = 
     tb_unb1_test_ddr_16g_MB_I.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/copy_hex_files.tcl
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
@@ -37,6 +47,3 @@ quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_test_ddr_16g_MB_I/qsys_unb1_test/synthesis/qsys_unb1_test.qip
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/generated/ip_stratixiv_ddr3_uphy_16g_dual_rank_800.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/copy_hex_files.tcl
-
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_II/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_II/hdllib.cfg
index b92e6f5e2f..3e8133c285 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_II/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_II/hdllib.cfg
@@ -2,9 +2,11 @@ hdl_lib_name = unb1_test_ddr_16g_MB_II
 hdl_library_clause_name = unb1_test_ddr_16g_MB_II_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master ip_stratixiv_ddr3_uphy_4g_800_slave ip_stratixiv_ddr3_uphy_4g_single_rank_800_master ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_800_master
+                   ip_stratixiv_ddr3_uphy_4g_800_slave
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
 
 synth_files =
     unb1_test_ddr_16g_MB_II.vhd
@@ -12,9 +14,16 @@ synth_files =
 test_bench_files = 
     tb_unb1_test_ddr_16g_MB_II.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/copy_hex_files.tcl
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
@@ -37,6 +46,3 @@ quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_test_ddr_16g_MB_II/qsys_unb1_test/synthesis/qsys_unb1_test.qip
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/generated/ip_stratixiv_ddr3_uphy_16g_dual_rank_800.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/copy_hex_files.tcl
-
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I_II/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I_II/hdllib.cfg
index 6931d7ff37..6cd6991ddd 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I_II/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I_II/hdllib.cfg
@@ -2,22 +2,28 @@ hdl_lib_name = unb1_test_ddr_16g_MB_I_II
 hdl_library_clause_name = unb1_test_ddr_16g_MB_I_II_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
+hdl_lib_technology = ip_stratixiv
 hdl_lib_excludes = ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
                    ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
                    ip_stratixiv_ddr3_uphy_4g_800_master
                    ip_stratixiv_ddr3_uphy_4g_800_slave
 
-hdl_lib_technology = ip_stratixiv
-
 synth_files =
     unb1_test_ddr_16g_MB_I_II.vhd
     
 test_bench_files = 
     tb_unb1_test_ddr_16g_MB_I_II.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/copy_hex_files.tcl
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
@@ -40,6 +46,3 @@ quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_test_ddr_16g_MB_I_II/qsys_unb1_test/synthesis/qsys_unb1_test.qip
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/generated/ip_stratixiv_ddr3_uphy_16g_dual_rank_800.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/copy_hex_files.tcl
-
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I/hdllib.cfg
index 9d9761cddb..01a53de499 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I/hdllib.cfg
@@ -2,9 +2,11 @@ hdl_lib_name = unb1_test_ddr_MB_I
 hdl_library_clause_name = unb1_test_ddr_MB_I_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_16g_dual_rank_800 ip_stratixiv_ddr3_uphy_4g_800_slave ip_stratixiv_ddr3_uphy_4g_800_master ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_16g_dual_rank_800
+                   ip_stratixiv_ddr3_uphy_4g_800_slave
+                   ip_stratixiv_ddr3_uphy_4g_800_master
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
 
 synth_files =
     unb1_test_ddr_MB_I.vhd
@@ -12,9 +14,16 @@ synth_files =
 test_bench_files = 
     tb_unb1_test_ddr_MB_I.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
@@ -37,6 +46,3 @@ quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_test_ddr_MB_I/qsys_unb1_test/synthesis/qsys_unb1_test.qip
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/generated/ip_stratixiv_ddr3_uphy_4g_single_rank_800_master.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
-
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_II/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_II/hdllib.cfg
index 569fa8f360..999ef9629c 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_II/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_II/hdllib.cfg
@@ -2,9 +2,12 @@ hdl_lib_name = unb1_test_ddr_MB_II
 hdl_library_clause_name = unb1_test_ddr_MB_II_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_stratixiv_ddr3_uphy_16g_dual_rank_800 ip_stratixiv_ddr3_uphy_4g_800_slave ip_stratixiv_ddr3_uphy_4g_800_master ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
-
 hdl_lib_technology = ip_stratixiv
+hdl_lib_excludes = ip_stratixiv_ddr3_uphy_16g_dual_rank_800
+                   ip_stratixiv_ddr3_uphy_4g_800_slave
+                   ip_stratixiv_ddr3_uphy_4g_800_master
+                   ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
+
 
 synth_files =
     unb1_test_ddr_MB_II.vhd
@@ -12,9 +15,16 @@ synth_files =
 test_bench_files = 
     tb_unb1_test_ddr_MB_II.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
@@ -37,6 +47,3 @@ quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_test_ddr_MB_II/qsys_unb1_test/synthesis/qsys_unb1_test.qip
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/generated/ip_stratixiv_ddr3_uphy_4g_single_rank_800_master.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
-
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I_II/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I_II/hdllib.cfg
index 6e0d0d2402..2ff1c3c08f 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I_II/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I_II/hdllib.cfg
@@ -2,22 +2,27 @@ hdl_lib_name = unb1_test_ddr_MB_I_II
 hdl_library_clause_name = unb1_test_ddr_MB_I_II_lib
 hdl_lib_uses_synth = unb1_board unb1_test
 hdl_lib_uses_sim = 
+hdl_lib_technology = ip_stratixiv
 hdl_lib_excludes = ip_stratixiv_ddr3_uphy_16g_dual_rank_800
                    ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
                    ip_stratixiv_ddr3_uphy_4g_800_master
                    ip_stratixiv_ddr3_uphy_4g_800_slave
 
-hdl_lib_technology = ip_stratixiv
-
 synth_files =
     unb1_test_ddr_MB_I_II.vhd
     
 test_bench_files = 
     tb_unb1_test_ddr_MB_I_II.vhd
 
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
@@ -40,6 +45,3 @@ quartus_qip_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_test_ddr_MB_I_II/qsys_unb1_test/synthesis/qsys_unb1_test.qip
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/generated/ip_stratixiv_ddr3_uphy_4g_single_rank_800_master.qip
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
-
diff --git a/boards/uniboard1/designs/unb1_tr_10GbE/hdllib.cfg b/boards/uniboard1/designs/unb1_tr_10GbE/hdllib.cfg
index 8ff59c1f1a..3ef8d196d4 100644
--- a/boards/uniboard1/designs/unb1_tr_10GbE/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_tr_10GbE/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = unb1_tr_10GbE
 hdl_library_clause_name = unb1_tr_10GbE_lib
 hdl_lib_uses_synth = common mm dp i2c unb1_board tr_10GbE diag
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    quartus/qsys_unb1_tr_10GbE.qsys .
-#    src/hex/ hex
-
-modelsim_copy_files = 
-#    src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_tr_10GbE/qsys_unb1_tr_10GbE/synthesis/qsys_unb1_tr_10GbE.v
     src/vhdl/mmm_unb1_tr_10GbE.vhd
@@ -22,6 +12,19 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_tr_10GbE.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files = 
+#    src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    quartus/qsys_unb1_tr_10GbE.qsys .
+#    src/hex/ hex
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/boards/uniboard1/libraries/unb1_board/hdllib.cfg b/boards/uniboard1/libraries/unb1_board/hdllib.cfg
index a047b9247c..bce15bdfb3 100644
--- a/boards/uniboard1/libraries/unb1_board/hdllib.cfg
+++ b/boards/uniboard1/libraries/unb1_board/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb1_board
 hdl_library_clause_name = unb1_board_lib
 hdl_lib_uses_synth = common dp diag uth ppsh i2c tr_nonbonded eth remu technology tech_pll epcs
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -59,3 +58,10 @@ test_bench_files =
     tb/vhdl/tb_unb1_board_mesh_reorder_bidir.vhd
     
     tb/vhdl/tb_tb_tb_unb1_board_regression.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/boards/uniboard2/designs/unb2_led/hdllib.cfg b/boards/uniboard2/designs/unb2_led/hdllib.cfg
index 674b89da0f..b827bc6b80 100644
--- a/boards/uniboard2/designs/unb2_led/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_led/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb2_led
 hdl_library_clause_name = unb2_led_lib
 hdl_lib_uses_synth = common technology unb2_board
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
 synth_files =
@@ -11,6 +10,11 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb2_led.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2/designs/unb2_minimal/hdllib.cfg b/boards/uniboard2/designs/unb2_minimal/hdllib.cfg
index f0eaef9977..1f74d99516 100644
--- a/boards/uniboard2/designs/unb2_minimal/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_minimal/hdllib.cfg
@@ -2,9 +2,8 @@ hdl_lib_name = unb2_minimal
 hdl_library_clause_name = unb2_minimal_lib
 hdl_lib_uses_synth = common technology mm unb2_board 
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_arria10_mac_10g
-
 hdl_lib_technology = ip_arria10
+hdl_lib_excludes = ip_arria10_mac_10g
 
 synth_files =
     src/vhdl/qsys_unb2_minimal_pkg.vhd
@@ -14,6 +13,11 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb2_minimal.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2/designs/unb2_test/hdllib.cfg b/boards/uniboard2/designs/unb2_test/hdllib.cfg
index 6bb91f9b1b..22b2ff9525 100644
--- a/boards/uniboard2/designs/unb2_test/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_test/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb2_test
 hdl_library_clause_name = unb2_test_lib
 hdl_lib_uses_synth = common technology mm unb2_board unb2_board_10gbe dp eth tech_tse tr_10GbE diagnostics diag tech_mac_10g io_ddr tech_ddr
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
 synth_files =
@@ -15,3 +14,9 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb2_test.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/hdllib.cfg b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/hdllib.cfg
index 86cd5c864b..adbdf99c91 100644
--- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/hdllib.cfg
@@ -2,9 +2,12 @@ hdl_lib_name = unb2_test_10GbE
 hdl_library_clause_name = unb2_test_10GbE_lib
 hdl_lib_uses_synth = common mm technology unb2_board unb2_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_arria10_ddr4_4g_1600 ip_arria10_ddr4_8g_2400 ip_arria10_ddr4_4g_2000 ip_arria10_phy_10gbase_r ip_arria10_transceiver_reset_controller_1
-
 hdl_lib_technology = ip_arria10
+hdl_lib_excludes = ip_arria10_ddr4_4g_1600
+                   ip_arria10_ddr4_8g_2400
+                   ip_arria10_ddr4_4g_2000
+                   ip_arria10_phy_10gbase_r
+                   ip_arria10_transceiver_reset_controller_1
 
 synth_files =
     unb2_test_10GbE.vhd
@@ -12,9 +15,13 @@ synth_files =
 test_bench_files = 
     tb_unb2_test_10GbE.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/hdllib.cfg b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/hdllib.cfg
index 6af5195755..2479dbcda3 100644
--- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/hdllib.cfg
@@ -2,9 +2,11 @@ hdl_lib_name = unb2_test_1GbE
 hdl_library_clause_name = unb2_test_1GbE_lib
 hdl_lib_uses_synth = common mm technology unb2_board unb2_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_arria10_ddr4_4g_1600 ip_arria10_ddr4_8g_2400 ip_arria10_ddr4_4g_2000 ip_arria10_mac_10g
-
 hdl_lib_technology = ip_arria10
+hdl_lib_excludes = ip_arria10_ddr4_4g_1600
+                   ip_arria10_ddr4_8g_2400
+                   ip_arria10_ddr4_4g_2000
+                   ip_arria10_mac_10g
 
 synth_files =
     unb2_test_1GbE.vhd
@@ -12,9 +14,13 @@ synth_files =
 test_bench_files = 
     tb_unb2_test_1GbE.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/hdllib.cfg b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/hdllib.cfg
index afb79d2f08..65eca95384 100644
--- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/hdllib.cfg
@@ -2,8 +2,11 @@ hdl_lib_name = unb2_test_all
 hdl_library_clause_name = unb2_test_all_lib
 hdl_lib_uses_synth = common mm technology unb2_board unb2_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_arria10_ddr4_8g_2400 ip_arria10_ddr4_4g_2000 ip_arria10_phy_10gbase_r ip_arria10_transceiver_reset_controller_1
 hdl_lib_technology = ip_arria10
+hdl_lib_excludes = ip_arria10_ddr4_8g_2400
+                   ip_arria10_ddr4_4g_2000
+                   ip_arria10_phy_10gbase_r
+                   ip_arria10_transceiver_reset_controller_1
 
 synth_files =
     unb2_test_all.vhd
@@ -11,9 +14,13 @@ synth_files =
 test_bench_files = 
     tb_unb2_test_all.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/hdllib.cfg b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/hdllib.cfg
index b48fb0e704..e16917e8fc 100644
--- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/hdllib.cfg
@@ -20,12 +20,16 @@ synth_files =
 test_bench_files = 
     tb_unb2_test_ddr_MB_I.vhd
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_1600/copy_hex_files.tcl
-    
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_1600/copy_hex_files.tcl    
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/hdllib.cfg b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/hdllib.cfg
index a097f6e1c5..fd8757b646 100644
--- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/hdllib.cfg
@@ -20,12 +20,16 @@ synth_files =
 test_bench_files = 
     tb_unb2_test_ddr_MB_II.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files =
+    ../../src/hex hex
+
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_1600/copy_hex_files.tcl
     
-modelsim_copy_files =
-    ../../src/hex hex
 
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/hdllib.cfg b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/hdllib.cfg
index 4c50965953..f3a98983f9 100644
--- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/hdllib.cfg
@@ -20,12 +20,16 @@ synth_files =
 test_bench_files = 
     tb_unb2_test_ddr_MB_I_II.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files =
+    ../../src/hex hex
+
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_1600/copy_hex_files.tcl
     
-modelsim_copy_files =
-    ../../src/hex hex
 
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2/libraries/unb2_board/hdllib.cfg b/boards/uniboard2/libraries/unb2_board/hdllib.cfg
index 9fac903d50..30ff80632c 100644
--- a/boards/uniboard2/libraries/unb2_board/hdllib.cfg
+++ b/boards/uniboard2/libraries/unb2_board/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb2_board
 hdl_library_clause_name = unb2_board_lib
 hdl_lib_uses_synth = common dp ppsh i2c eth remu technology tech_clkbuf tech_pll tech_fractional_pll epcs fpga_sense
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
 synth_files =
@@ -38,3 +37,9 @@ test_bench_files =
     tb/vhdl/tb_unb2_board_node_ctrl.vhd
     tb/vhdl/tb_unb2_board_qsfp_leds.vhd
     
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/boards/uniboard2/libraries/unb2_board_10gbe/hdllib.cfg b/boards/uniboard2/libraries/unb2_board_10gbe/hdllib.cfg
index da343c764d..5e59d9e1c9 100644
--- a/boards/uniboard2/libraries/unb2_board_10gbe/hdllib.cfg
+++ b/boards/uniboard2/libraries/unb2_board_10gbe/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb2_board_10gbe
 hdl_library_clause_name = unb2_board_10gbe_lib
 hdl_lib_uses_synth = common dp technology tech_pll tr_10GbE
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
 synth_files =
@@ -10,3 +9,9 @@ synth_files =
     
 test_bench_files = 
     
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/boards/uniboard2a/designs/unb2a_heater/hdllib.cfg b/boards/uniboard2a/designs/unb2a_heater/hdllib.cfg
index 8d7359470c..db1ae46309 100644
--- a/boards/uniboard2a/designs/unb2a_heater/hdllib.cfg
+++ b/boards/uniboard2a/designs/unb2a_heater/hdllib.cfg
@@ -2,6 +2,7 @@ hdl_lib_name = unb2a_heater
 hdl_library_clause_name = unb2a_heater_lib
 hdl_lib_uses_synth = common technology mm unb2a_board util
 hdl_lib_uses_sim = 
+hdl_lib_technology = ip_arria10_e3sge3
 hdl_lib_excludes = ip_arria10_e3sge3_mac_10g
                    ip_arria10_e3sge3_pll_xgmii_mac_clocks
                    ip_arria10_e3sge3_pll_clk25
@@ -9,8 +10,6 @@ hdl_lib_excludes = ip_arria10_e3sge3_mac_10g
                    ip_arria10_e3sge3_pll_clk200
                    ip_arria10_e3sge3_tse_sgmii_gx
 
-hdl_lib_technology = ip_arria10_e3sge3
-
 synth_files =
     src/vhdl/qsys_unb2a_heater_pkg.vhd
     src/vhdl/mmm_unb2a_heater.vhd
@@ -19,6 +18,11 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb2a_heater.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2a/designs/unb2a_minimal/hdllib.cfg b/boards/uniboard2a/designs/unb2a_minimal/hdllib.cfg
index fe76802949..06105d861e 100644
--- a/boards/uniboard2a/designs/unb2a_minimal/hdllib.cfg
+++ b/boards/uniboard2a/designs/unb2a_minimal/hdllib.cfg
@@ -2,6 +2,7 @@ hdl_lib_name = unb2a_minimal
 hdl_library_clause_name = unb2a_minimal_lib
 hdl_lib_uses_synth = common technology mm unb2a_board 
 hdl_lib_uses_sim = 
+hdl_lib_technology = ip_arria10_e3sge3
 hdl_lib_excludes = ip_arria10_e3sge3_mac_10g
                    ip_arria10_e3sge3_pll_xgmii_mac_clocks
                    ip_arria10_e3sge3_pll_clk25
@@ -9,8 +10,6 @@ hdl_lib_excludes = ip_arria10_e3sge3_mac_10g
                    ip_arria10_e3sge3_pll_clk200
                    ip_arria10_e3sge3_tse_sgmii_gx
 
-hdl_lib_technology = ip_arria10_e3sge3
-
 synth_files =
     src/vhdl/qsys_unb2a_minimal_pkg.vhd
     src/vhdl/mmm_unb2a_minimal.vhd
@@ -19,6 +18,11 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb2a_minimal.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2a/designs/unb2a_test/hdllib.cfg b/boards/uniboard2a/designs/unb2a_test/hdllib.cfg
index fad4c3599a..a25ee64932 100644
--- a/boards/uniboard2a/designs/unb2a_test/hdllib.cfg
+++ b/boards/uniboard2a/designs/unb2a_test/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb2a_test
 hdl_library_clause_name = unb2a_test_lib
 hdl_lib_uses_synth = common technology mm unb2a_board unb2a_board_10gbe dp eth tech_tse tr_10GbE diagnostics diag tech_mac_10g io_ddr tech_ddr
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
 synth_files =
@@ -15,3 +14,9 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb2a_test.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/hdllib.cfg b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/hdllib.cfg
index f887ae0e7b..2dc9b1464a 100644
--- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/hdllib.cfg
+++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/hdllib.cfg
@@ -2,6 +2,7 @@ hdl_lib_name = unb2a_test_10GbE
 hdl_library_clause_name = unb2a_test_10GbE_lib
 hdl_lib_uses_synth = common mm technology unb2a_board unb2a_test
 hdl_lib_uses_sim = 
+hdl_lib_technology = ip_arria10_e3sge3
 hdl_lib_excludes = ip_arria10_e3sge3_ddr4_4g_1600
                    ip_arria10_e3sge3_ddr4_4g_2000
                    ip_arria10_e3sge3_ddr4_8g_1600
@@ -9,17 +10,19 @@ hdl_lib_excludes = ip_arria10_e3sge3_ddr4_4g_1600
                    ip_arria10_e3sge3_phy_10gbase_r
                    ip_arria10_e3sge3_transceiver_reset_controller_1
 
-hdl_lib_technology = ip_arria10_e3sge3
-
 synth_files =
     unb2a_test_10GbE.vhd
 
 test_bench_files = 
     tb_unb2a_test_10GbE.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/hdllib.cfg b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/hdllib.cfg
index c0fbe15c89..b01a7885c3 100644
--- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/hdllib.cfg
+++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/hdllib.cfg
@@ -2,9 +2,11 @@ hdl_lib_name = unb2a_test_1GbE
 hdl_library_clause_name = unb2a_test_1GbE_lib
 hdl_lib_uses_synth = common mm technology unb2a_board unb2a_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_arria10_e3sge3_ddr4_4g_1600 ip_arria10_e3sge3_ddr4_8g_2400 ip_arria10_e3sge3_ddr4_4g_2000 ip_arria10_e3sge3_mac_10g
-
 hdl_lib_technology = ip_arria10_e3sge3
+hdl_lib_excludes = ip_arria10_e3sge3_ddr4_4g_1600
+                   ip_arria10_e3sge3_ddr4_8g_2400
+                   ip_arria10_e3sge3_ddr4_4g_2000
+                   ip_arria10_e3sge3_mac_10g
 
 synth_files =
     unb2a_test_1GbE.vhd
@@ -12,9 +14,13 @@ synth_files =
 test_bench_files = 
     tb_unb2a_test_1GbE.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/hdllib.cfg b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/hdllib.cfg
index 838bd77316..59aacc877c 100644
--- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/hdllib.cfg
+++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/hdllib.cfg
@@ -2,18 +2,25 @@ hdl_lib_name = unb2a_test_all
 hdl_library_clause_name = unb2a_test_all_lib
 hdl_lib_uses_synth = common mm technology unb2a_board unb2a_test
 hdl_lib_uses_sim = 
-hdl_lib_excludes = ip_arria10_e3sge3_ddr4_8g_2400 ip_arria10_e3sge3_ddr4_4g_2000 ip_arria10_e3sge3_phy_10gbase_r ip_arria10_e3sge3_transceiver_reset_controller_1
 hdl_lib_technology = ip_arria10_e3sge3
-
+hdl_lib_excludes = ip_arria10_e3sge3_ddr4_8g_2400
+                   ip_arria10_e3sge3_ddr4_4g_2000
+                   ip_arria10_e3sge3_phy_10gbase_r
+                   ip_arria10_e3sge3_transceiver_reset_controller_1
+                   
 synth_files =
     unb2a_test_all.vhd
 
 test_bench_files = 
     tb_unb2a_test_all.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/hdllib.cfg b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/hdllib.cfg
index aa25d3e9e1..ef6693b173 100644
--- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/hdllib.cfg
+++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/hdllib.cfg
@@ -21,12 +21,16 @@ synth_files =
 test_bench_files = 
     tb_unb2a_test_ddr_MB_I.vhd
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_8g_1600/copy_hex_files.tcl
-    
+
+[modelsim_project_file]
 modelsim_copy_files =
     ../../src/hex hex
 
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_8g_1600/copy_hex_files.tcl
+
+
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/hdllib.cfg b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/hdllib.cfg
index 68aeacf304..847a9e9722 100644
--- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/hdllib.cfg
+++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/hdllib.cfg
@@ -21,12 +21,16 @@ synth_files =
 test_bench_files = 
     tb_unb2a_test_ddr_MB_II.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files =
+    ../../src/hex hex
+
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_8g_1600/copy_hex_files.tcl
     
-modelsim_copy_files =
-    ../../src/hex hex
 
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/hdllib.cfg b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/hdllib.cfg
index 70c3cca8af..985265b3e9 100644
--- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/hdllib.cfg
+++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/hdllib.cfg
@@ -21,12 +21,16 @@ synth_files =
 test_bench_files = 
     tb_unb2a_test_ddr_MB_I_II.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files =
+    ../../src/hex hex
+
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_4g_1600/copy_hex_files.tcl
     
-modelsim_copy_files =
-    ../../src/hex hex
 
+[quartus_project_file]
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/boards/uniboard2a/libraries/unb2a_board/hdllib.cfg b/boards/uniboard2a/libraries/unb2a_board/hdllib.cfg
index 9ff804ab52..cb14fa462f 100644
--- a/boards/uniboard2a/libraries/unb2a_board/hdllib.cfg
+++ b/boards/uniboard2a/libraries/unb2a_board/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb2a_board
 hdl_library_clause_name = unb2a_board_lib
 hdl_lib_uses_synth = common dp ppsh i2c eth remu technology tech_clkbuf tech_pll tech_fractional_pll epcs fpga_sense
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
 synth_files =
@@ -38,3 +37,9 @@ test_bench_files =
     tb/vhdl/tb_unb2_board_node_ctrl.vhd
     tb/vhdl/tb_unb2_board_qsfp_leds.vhd
     
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/boards/uniboard2a/libraries/unb2a_board_10gbe/hdllib.cfg b/boards/uniboard2a/libraries/unb2a_board_10gbe/hdllib.cfg
index 5ec5ad52e4..23ae0d618e 100644
--- a/boards/uniboard2a/libraries/unb2a_board_10gbe/hdllib.cfg
+++ b/boards/uniboard2a/libraries/unb2a_board_10gbe/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = unb2a_board_10gbe
 hdl_library_clause_name = unb2a_board_10gbe_lib
 hdl_lib_uses_synth = common dp technology tech_pll tr_10GbE
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
 synth_files =
@@ -10,3 +9,9 @@ synth_files =
     
 test_bench_files = 
     
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/base/common/hdllib.cfg b/libraries/base/common/hdllib.cfg
index 3a903aa000..bb6293abc4 100644
--- a/libraries/base/common/hdllib.cfg
+++ b/libraries/base/common/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = common
 hdl_library_clause_name = common_lib
 hdl_lib_uses_synth = technology tech_memory tech_fifo tech_iobuf tst
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -194,3 +193,10 @@ test_bench_files =
     tb/vhdl/tb_tb_common_rl.vhd
     tb/vhdl/tb_tb_common_rl_register.vhd
     tb/vhdl/tb_tb_common_transpose.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/base/common_mult/hdllib.cfg b/libraries/base/common_mult/hdllib.cfg
index 75d8b3889b..df4cdb0d9d 100644
--- a/libraries/base/common_mult/hdllib.cfg
+++ b/libraries/base/common_mult/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = common_mult
 hdl_library_clause_name = common_mult_lib
 hdl_lib_uses_synth = common technology tech_mult
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -18,3 +17,10 @@ test_bench_files =
     tb/vhdl/tb_common_complex_mult.vhd
 
     tb/vhdl/tb_tb_common_mult.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/base/diag/hdllib.cfg b/libraries/base/diag/hdllib.cfg
index afb94b13ad..d3ab815ac0 100644
--- a/libraries/base/diag/hdllib.cfg
+++ b/libraries/base/diag/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = diag
 hdl_library_clause_name = diag_lib
 hdl_lib_uses_synth = dp common common_mult technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -42,6 +41,12 @@ test_bench_files =
     tb/vhdl/tb_tb_mms_diag_block_gen.vhd
     tb/vhdl/tb_diag_regression.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     src/data data
+
+
+[quartus_project_file]
+
     
\ No newline at end of file
diff --git a/libraries/base/diagnostics/hdllib.cfg b/libraries/base/diagnostics/hdllib.cfg
index dfab915a22..cb89f13910 100644
--- a/libraries/base/diagnostics/hdllib.cfg
+++ b/libraries/base/diagnostics/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = diagnostics
 hdl_library_clause_name = diagnostics_lib
 hdl_lib_uses_synth = common dp diag
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -19,3 +18,10 @@ test_bench_files =
     tb/vhdl/tb_diagnostics_trnb_pkg.vhd
     tb/vhdl/tb_diagnostics.vhd
     tb/vhdl/tb_mm_tx_framer.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/base/dp/designs/unb1_dp_offload/hdllib.cfg b/libraries/base/dp/designs/unb1_dp_offload/hdllib.cfg
index f46a5d0d55..4e1c6925ab 100644
--- a/libraries/base/dp/designs/unb1_dp_offload/hdllib.cfg
+++ b/libraries/base/dp/designs/unb1_dp_offload/hdllib.cfg
@@ -2,18 +2,8 @@ hdl_lib_name = unb1_dp_offload
 hdl_library_clause_name = unb1_dp_offload_lib
 hdl_lib_uses_synth = common dp unb1_board diag
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =                                                                                                                                                            
-                                                                                                                                                                                    
-quartus_copy_files =
-    quartus/sopc_unb1_dp_offload.sopc .
-    src/hex hex
-
-modelsim_copy_files =
-    src/hex hex
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_dp_offload/sopc_unb1_dp_offload.vhd
     src/vhdl/mmm_unb1_dp_offload.vhd
@@ -22,6 +12,19 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_dp_offload.vhd
 
+
+[modelsim_project_file]
+modelsim_copy_files =
+    src/hex hex
+
+
+[quartus_project_file]
+synth_top_level_entity =                                                                                                                                                            
+                                                                                                                                                                                    
+quartus_copy_files =
+    quartus/sopc_unb1_dp_offload.sopc .
+    src/hex hex
+
 quartus_qsf_files = 
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board_head.qsf
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board_tail.qsf
diff --git a/libraries/base/dp/hdllib.cfg b/libraries/base/dp/hdllib.cfg
index 5045c7571d..553a94ac8c 100644
--- a/libraries/base/dp/hdllib.cfg
+++ b/libraries/base/dp/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = dp
 hdl_library_clause_name = dp_lib
 hdl_lib_uses_synth = mm common common_mult easics  
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -205,8 +204,6 @@ test_bench_files =
     tb/vhdl/tb_tb_dp_pad_insert_remove.vhd
     tb/vhdl/tb_tb_dp_packetizing.vhd
     tb/vhdl/tb_tb_dp_packet.vhd
-
-
     tb/vhdl/tb_tb_dp_packet_merge.vhd
     tb/vhdl/tb_tb_dp_pipeline.vhd
     tb/vhdl/tb_tb_dp_pipeline_ready.vhd
@@ -215,3 +212,9 @@ test_bench_files =
     tb/vhdl/tb_tb_dp_sync_checker.vhd
     
     tb/vhdl/tb_tb_tb_dp_backpressure.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
diff --git a/libraries/base/mm/hdllib.cfg b/libraries/base/mm/hdllib.cfg
index 14cd3a1a9d..454828faab 100644
--- a/libraries/base/mm/hdllib.cfg
+++ b/libraries/base/mm/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = mm
 hdl_library_clause_name = mm_lib
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -17,3 +16,10 @@ test_bench_files =
     tb/vhdl/mm_file.vhd
     tb/vhdl/dummy_reg.vhd
     tb/vhdl/tb_mm_file.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/base/reorder/hdllib.cfg b/libraries/base/reorder/hdllib.cfg
index 6f2bd62554..0c87da8ed1 100644
--- a/libraries/base/reorder/hdllib.cfg
+++ b/libraries/base/reorder/hdllib.cfg
@@ -2,13 +2,8 @@ hdl_lib_name = reorder
 hdl_library_clause_name = reorder_lib
 hdl_lib_uses_synth = common dp 
 hdl_lib_uses_sim = io_ddr tech_ddr
-
 hdl_lib_technology = 
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
-
-
 synth_files =
     src/vhdl/reorder_pkg.vhd    
     src/vhdl/reorder_retreive.vhd
@@ -37,7 +32,15 @@ test_bench_files =
     tb/vhdl/tb_mmf_reorder_matrix.vhd     
     tb/vhdl/tb_mmf_reorder_row.vhd     
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
+
 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    
+    
+
+[quartus_project_file]
 
diff --git a/libraries/base/sens/hdllib.cfg b/libraries/base/sens/hdllib.cfg
index 773ff211eb..fabc9009b1 100644
--- a/libraries/base/sens/hdllib.cfg
+++ b/libraries/base/sens/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = sens
 hdl_library_clause_name = sens_lib
 hdl_lib_uses_synth = common i2c
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -12,3 +11,9 @@ synth_files =
 test_bench_files =
     tb/vhdl/tb_sens.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/base/ss/hdllib.cfg b/libraries/base/ss/hdllib.cfg
index 3034a4bca1..68aed757d3 100644
--- a/libraries/base/ss/hdllib.cfg
+++ b/libraries/base/ss/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ss
 hdl_library_clause_name = ss_lib
 hdl_lib_uses_synth = diag dp mm common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -19,3 +18,10 @@ test_bench_files =
     tb/vhdl/tb_ss.vhd
     tb/vhdl/tb_ss_wide.vhd
     tb/vhdl/tb_tb_ss.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/base/tst/hdllib.cfg b/libraries/base/tst/hdllib.cfg
index 8ade1d63d4..d043c47a1f 100644
--- a/libraries/base/tst/hdllib.cfg
+++ b/libraries/base/tst/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tst
 hdl_library_clause_name = tst_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -10,3 +9,10 @@ synth_files =
     src/vhdl/tst_input.vhd
     
 test_bench_files = 
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/base/uth/hdllib.cfg b/libraries/base/uth/hdllib.cfg
index ac04bcfaea..3a67124dbb 100644
--- a/libraries/base/uth/hdllib.cfg
+++ b/libraries/base/uth/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = uth
 hdl_library_clause_name = uth_lib
 hdl_lib_uses_synth = common dp easics
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -22,3 +21,10 @@ test_bench_files =
     tb/vhdl/tb_tb_uth_dp_packet.vhd
     tb/vhdl/tb_tb_uth_terminals.vhd
     tb/vhdl/tb_tb_tb_uth_regression.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/base/util/hdllib.cfg b/libraries/base/util/hdllib.cfg
index 6894bcbde3..c998ad98bb 100644
--- a/libraries/base/util/hdllib.cfg
+++ b/libraries/base/util/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = util
 hdl_library_clause_name = util_lib
 hdl_lib_uses_synth = mm common common_mult technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -12,3 +11,10 @@ synth_files =
 
 test_bench_files = 
     tb/vhdl/tb_util_heater.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg b/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg
index c165af84a0..3e3089912f 100644
--- a/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg
+++ b/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg
@@ -2,11 +2,8 @@ hdl_lib_name = unb1_fn_bf
 hdl_library_clause_name = unb1_fn_bf_lib
 hdl_lib_uses_synth = common technology mm i2c bf diag eth tech_tse unb1_board
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
 synth_files =   
     $HDL_BUILD_DIR/unb1/quartus/unb1_fn_bf/sopc_unb1_fn_bf.vhd
     src/vhdl/mmm_unb1_fn_bf.vhd
@@ -16,8 +13,14 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_fn_bf.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files = src/hex hex                                                   
 
+
+[quartus_project_file]
+synth_top_level_entity =
+
 quartus_copy_files = quartus/sopc_unb1_fn_bf.sopc .
 
 quartus_qsf_files =                                                       
diff --git a/libraries/dsp/bf/hdllib.cfg b/libraries/dsp/bf/hdllib.cfg
index 64c8a2e1d4..e971c985d7 100644
--- a/libraries/dsp/bf/hdllib.cfg
+++ b/libraries/dsp/bf/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = bf
 hdl_library_clause_name = bf_lib
 hdl_lib_uses_synth = common common_mult technology mm dp st reorder
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -13,3 +12,10 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_bf_unit.vhd 
     tb/vhdl/tb_bf.vhd 
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg b/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
index 9e915ac1b2..b59f6067a5 100644
--- a/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
+++ b/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
@@ -2,14 +2,8 @@ hdl_lib_name = unb1_correlator
 hdl_library_clause_name = unb1_correlator_lib
 hdl_lib_uses_synth = common mm i2c unb1_board correlator 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-synth_top_level_entity =
-
-quartus_copy_files =
-    quartus/qsys_unb1_correlator.qsys .
-
 synth_files =
     $HDL_BUILD_DIR/unb1/quartus/unb1_correlator/qsys_unb1_correlator/synthesis/qsys_unb1_correlator.v
     src/vhdl/mmm_unb1_correlator.vhd
@@ -18,6 +12,16 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_unb1_correlator.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+synth_top_level_entity =
+
+quartus_copy_files =
+    quartus/qsys_unb1_correlator.qsys .
+
 quartus_qsf_files =
     $RADIOHDL/boards/uniboard1/libraries/unb1_board/quartus/unb1_board.qsf
     
diff --git a/libraries/dsp/correlator/hdllib.cfg b/libraries/dsp/correlator/hdllib.cfg
index 26c9466d5d..62898ea521 100644
--- a/libraries/dsp/correlator/hdllib.cfg
+++ b/libraries/dsp/correlator/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = correlator
 hdl_library_clause_name = correlator_lib
 hdl_lib_uses_synth = common common_mult technology dp diag
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-modelsim_copy_files = 
-    src/hex hex
-
 synth_files =
     src/vhdl/corr_carousel.vhd
     src/vhdl/corr_unfolder.vhd
@@ -30,3 +26,10 @@ test_bench_files =
     tb/vhdl/tb_correlator.vhd
 
 
+[modelsim_project_file]
+modelsim_copy_files = 
+    src/hex hex
+
+
+[quartus_project_file]
+
diff --git a/libraries/dsp/fft/hdllib.cfg b/libraries/dsp/fft/hdllib.cfg
index 1679ba7306..07f1da5f9f 100644
--- a/libraries/dsp/fft/hdllib.cfg
+++ b/libraries/dsp/fft/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = fft
 hdl_library_clause_name = fft_lib
 hdl_lib_uses_synth = common mm dp diag rTwoSDF st
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -29,3 +28,10 @@ test_bench_files =
     tb/vhdl/tb_fft_wide_unit.vhd 
     tb/vhdl/tb_mmf_fft_r2.vhd 
     tb/vhdl/tb_mmf_fft_wide_unit.vhd 
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/dsp/filter/hdllib.cfg b/libraries/dsp/filter/hdllib.cfg
index 3d7b1bc163..05f00bc170 100644
--- a/libraries/dsp/filter/hdllib.cfg
+++ b/libraries/dsp/filter/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = filter
 hdl_library_clause_name = filter_lib
 hdl_lib_uses_synth = common common_mult technology dp diag
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -16,4 +15,10 @@ test_bench_files =
     tb/vhdl/tb_fil_ppf_single.vhd 
     tb/vhdl/tb_fil_ppf_wide.vhd 
 
+
+[modelsim_project_file]
 modelsim_copy_files = src/hex hex                                                   
+
+
+[quartus_project_file]
+
diff --git a/libraries/dsp/rTwoSDF/hdllib.cfg b/libraries/dsp/rTwoSDF/hdllib.cfg
index a53a8a8824..e8c3fbef0b 100644
--- a/libraries/dsp/rTwoSDF/hdllib.cfg
+++ b/libraries/dsp/rTwoSDF/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = rTwoSDF
 hdl_library_clause_name = rTwoSDF_lib
 hdl_lib_uses_synth = common common_mult technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files = 
@@ -21,12 +20,9 @@ test_bench_files =
     tb/vhdl/tb_tb_rTwoSDF.vhd 
     tb/vhdl/tb_rTwoOrder.vhd 
 
-modelsim_copy_files = tb/data data                                                   
-
-
-
-
-
 
+[modelsim_project_file]
+modelsim_copy_files = tb/data data                                                   
 
 
+[quartus_project_file]
diff --git a/libraries/dsp/st/hdllib.cfg b/libraries/dsp/st/hdllib.cfg
index 2bc22dbf05..da029b5947 100644
--- a/libraries/dsp/st/hdllib.cfg
+++ b/libraries/dsp/st/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = st
 hdl_library_clause_name = st_lib
 hdl_lib_uses_synth = common common_mult technology mm dp diag
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files = 
@@ -17,3 +16,9 @@ test_bench_files =
     tb/vhdl/tb_st_calc.vhd 
     tb/vhdl/tb_mmf_st_sst.vhd   
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/dsp/wpfb/hdllib.cfg b/libraries/dsp/wpfb/hdllib.cfg
index 5eccb67244..5ea9f5187b 100644
--- a/libraries/dsp/wpfb/hdllib.cfg
+++ b/libraries/dsp/wpfb/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = wpfb
 hdl_library_clause_name = wpfb_lib
 hdl_lib_uses_synth = common mm diag dp rTwoSDF st fft filter
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files = 
@@ -13,6 +12,12 @@ test_bench_files =
     tb/vhdl/tb_wpfb_unit.vhd 
     tb/vhdl/tb_mmf_wpfb_unit.vhd 
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     modelsim/wave_tb_mmf_wpfb_unit.do     .
     ../filter/src/hex                     data
+
+
+[quartus_project_file]
+
diff --git a/libraries/external/easics/hdllib.cfg b/libraries/external/easics/hdllib.cfg
index 397ef56c6f..1ced007236 100644
--- a/libraries/external/easics/hdllib.cfg
+++ b/libraries/external/easics/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = easics
 hdl_library_clause_name = easics_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -62,4 +61,12 @@ synth_files =
     src/vhdl/RAD_CRC20_D20.vhd
     src/vhdl/RAD_CRC16_D16.vhd
     src/vhdl/RAD_CRC18_D18.vhd
+
 test_bench_files = 
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/external/numonyx_m25p128/hdllib.cfg b/libraries/external/numonyx_m25p128/hdllib.cfg
index 3a9dc46d77..2f27bb34e1 100644
--- a/libraries/external/numonyx_m25p128/hdllib.cfg
+++ b/libraries/external/numonyx_m25p128/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = numonyx_m25p128
 hdl_library_clause_name = numonyx_m25p128_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -16,3 +15,10 @@ test_bench_files =
     NU_M25P128_V10/lib/TimingData.vhd
     NU_M25P128_V10/lib/MemoryLib.vhd
     NU_M25P128_V10/code/M25P128.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/aduh/hdllib.cfg b/libraries/io/aduh/hdllib.cfg
index 334d608df2..d2e7e76aea 100644
--- a/libraries/io/aduh/hdllib.cfg
+++ b/libraries/io/aduh/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = aduh
 hdl_library_clause_name = aduh_lib
 hdl_lib_uses_synth = common common_mult dp diag i2c technology 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =   
@@ -38,3 +37,9 @@ test_bench_files =
     tb/vhdl/tb_tb_lvdsh_dd_phs4.vhd
     tb/vhdl/tb_tb_lvdsh_dd_wb4.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/ddr/hdllib.cfg b/libraries/io/ddr/hdllib.cfg
index 8880537603..398a370c75 100644
--- a/libraries/io/ddr/hdllib.cfg
+++ b/libraries/io/ddr/hdllib.cfg
@@ -2,13 +2,8 @@ hdl_lib_name = io_ddr
 hdl_library_clause_name = io_ddr_lib
 hdl_lib_uses_synth = technology tech_ddr tech_ddr3 common dp diag diagnostics 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
-    $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_1600/copy_hex_files.tcl
-
 synth_files =
     src/vhdl/io_ddr_driver_flush_ctrl.vhd
     src/vhdl/io_ddr_driver.vhd
@@ -22,3 +17,11 @@ test_bench_files =
     tb/vhdl/tb_io_ddr.vhd
     tb/vhdl/tb_tb_io_ddr.vhd
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
+    $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_1600/copy_hex_files.tcl
+
+
+[quartus_project_file]
diff --git a/libraries/io/ddr3/hdllib.cfg b/libraries/io/ddr3/hdllib.cfg
index 63d4550dd6..5c8f38d2de 100644
--- a/libraries/io/ddr3/hdllib.cfg
+++ b/libraries/io/ddr3/hdllib.cfg
@@ -2,13 +2,8 @@ hdl_lib_name = ddr3
 hdl_library_clause_name = ddr3_lib
 hdl_lib_uses_synth = common dp diag diagnostics ss tech_ddr 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology =
 
-modelsim_compile_ip_files =
-     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
-     #$RADIOHDL/libraries/io/ddr3/src/tcl/compile_ip.tcl
-
 synth_files =
     src/vhdl/ddr3_pkg.vhd
     src/vhdl/ddr3_reg.vhd
@@ -27,8 +22,17 @@ test_bench_files =
     tb/vhdl/tb_seq_ddr3.vhd
     tb/vhdl/tb_ddr3_transpose.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master/ip_stratixiv_ddr3_uphy_4g_800_master_s0_AC_ROM.hex .
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master/ip_stratixiv_ddr3_uphy_4g_800_master_s0_inst_ROM.hex .
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/generated/ip_stratixiv_ddr3_uphy_4g_800_master/ip_stratixiv_ddr3_uphy_4g_800_master_s0_sequencer_mem.hex .
 
+modelsim_compile_ip_files =
+     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
+     #$RADIOHDL/libraries/io/ddr3/src/tcl/compile_ip.tcl
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/epcs/hdllib.cfg b/libraries/io/epcs/hdllib.cfg
index ba8f956303..d493969fba 100644
--- a/libraries/io/epcs/hdllib.cfg
+++ b/libraries/io/epcs/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = epcs
 hdl_library_clause_name = epcs_lib
 hdl_lib_uses_synth = common dp tech_flash
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -11,3 +10,10 @@ synth_files =
 
 test_bench_files = 
     tb/vhdl/tb_mms_epcs.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/eth/hdllib.cfg b/libraries/io/eth/hdllib.cfg
index 5945c7cf47..b363c0a31a 100644
--- a/libraries/io/eth/hdllib.cfg
+++ b/libraries/io/eth/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = eth
 hdl_library_clause_name = eth_lib
 hdl_lib_uses_synth = dp common tech_tse
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -33,3 +32,8 @@ test_bench_files =
     tb/vhdl/tb_eth_ihl_to_20.vhd
     tb/vhdl/tb_tb_tb_eth_regression.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
diff --git a/libraries/io/fpga_sense/hdllib.cfg b/libraries/io/fpga_sense/hdllib.cfg
index c40c0ac1e1..f922790204 100644
--- a/libraries/io/fpga_sense/hdllib.cfg
+++ b/libraries/io/fpga_sense/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = fpga_sense
 hdl_library_clause_name = fpga_sense_lib
 hdl_lib_uses_synth = common technology tech_fpga_temp_sens tech_fpga_voltage_sens
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -10,3 +9,9 @@ synth_files =
 
 test_bench_files = 
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/i2c/hdllib.cfg b/libraries/io/i2c/hdllib.cfg
index 9c55ec5d80..b48f36ef81 100644
--- a/libraries/io/i2c/hdllib.cfg
+++ b/libraries/io/i2c/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = i2c
 hdl_library_clause_name = i2c_lib
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -45,5 +44,10 @@ test_bench_files =
     tb/vhdl/tb_i2c_commander.vhd
     tb/vhdl/tb_tb_i2c_commander.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     tb/data data
+
+
+[quartus_project_file]
diff --git a/libraries/io/mac_10g/hdllib.cfg b/libraries/io/mac_10g/hdllib.cfg
index 7b180d825b..0ab81e2fc0 100644
--- a/libraries/io/mac_10g/hdllib.cfg
+++ b/libraries/io/mac_10g/hdllib.cfg
@@ -2,10 +2,16 @@ hdl_lib_name = io_mac_10g
 hdl_library_clause_name = io_mac_10g_lib
 hdl_lib_uses_synth = technology tech_mac_10g common dp
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
     io_mac_10g.vhd
 
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/mdio/hdllib.cfg b/libraries/io/mdio/hdllib.cfg
index d3f07f82bc..378f3569b4 100644
--- a/libraries/io/mdio/hdllib.cfg
+++ b/libraries/io/mdio/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = mdio
 hdl_library_clause_name = mdio_lib
 hdl_lib_uses_synth = common mm
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -21,3 +20,10 @@ test_bench_files =
     tb/vhdl/tb_mdio_phy.vhd
     tb/vhdl/tb_mdio_phy_reg.vhd
     tb/vhdl/tb_mdio_phy_ctlr.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/ppsh/hdllib.cfg b/libraries/io/ppsh/hdllib.cfg
index 2c71bdfe5d..6ce56a78ff 100644
--- a/libraries/io/ppsh/hdllib.cfg
+++ b/libraries/io/ppsh/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ppsh
 hdl_library_clause_name = ppsh_lib
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -14,3 +13,10 @@ synth_files =
 test_bench_files =
     tb/vhdl/tb_ppsh.vhd
     tb/vhdl/tb_mms_ppsh.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/remu/hdllib.cfg b/libraries/io/remu/hdllib.cfg
index f498233824..213f6331ae 100644
--- a/libraries/io/remu/hdllib.cfg
+++ b/libraries/io/remu/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = remu
 hdl_library_clause_name = remu_lib
 hdl_lib_uses_synth = common tech_flash
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -10,3 +9,10 @@ synth_files =
     src/vhdl/mms_remu.vhd
 
 test_bench_files = 
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/tr_10GbE/hdllib.cfg b/libraries/io/tr_10GbE/hdllib.cfg
index 6ca11e9954..7ec28c31fd 100644
--- a/libraries/io/tr_10GbE/hdllib.cfg
+++ b/libraries/io/tr_10GbE/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tr_10GbE
 hdl_library_clause_name = tr_10GbE_lib
 hdl_lib_uses_synth = common technology tech_mac_10g tech_eth_10g tr_xaui dp diag diagnostics
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -12,3 +11,9 @@ test_bench_files =
     tb/vhdl/tb_tr_10GbE.vhd
     tb/vhdl/tb_tb_tr_10GbE.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/tr_nonbonded/hdllib.cfg b/libraries/io/tr_nonbonded/hdllib.cfg
index f7ae0a2638..d04f8a3bb4 100644
--- a/libraries/io/tr_nonbonded/hdllib.cfg
+++ b/libraries/io/tr_nonbonded/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tr_nonbonded
 hdl_library_clause_name = tr_nonbonded_lib
 hdl_lib_uses_synth = common dp diag diagnostics tech_transceiver
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -13,3 +12,10 @@ synth_files =
 test_bench_files = 
     tb/vhdl/tb_tr_nonbonded.vhd
     tb/vhdl/tb_tb_tr_nonbonded.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/io/tr_xaui/hdllib.cfg b/libraries/io/tr_xaui/hdllib.cfg
index bc11236d47..7377a503ee 100644
--- a/libraries/io/tr_xaui/hdllib.cfg
+++ b/libraries/io/tr_xaui/hdllib.cfg
@@ -2,14 +2,12 @@ hdl_lib_name = tr_xaui
 hdl_library_clause_name = tr_xaui_lib
 hdl_lib_uses_synth = common dp mdio diagnostics tech_xaui
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
     src/vhdl/tr_xaui_deframer.vhd
     src/vhdl/tr_xaui_framer.vhd
     src/vhdl/tr_xaui_mdio.vhd
-    
     src/vhdl/tr_xaui.vhd
     src/vhdl/mms_tr_xaui.vhd
 
@@ -18,3 +16,10 @@ test_bench_files =
     tb/vhdl/tb_tr_xaui_framer.vhd
     tb/vhdl/tb_tr_xaui.vhd
     tb/vhdl/tb_tb_tr_xaui.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/10gbase_r/hdllib.cfg b/libraries/technology/10gbase_r/hdllib.cfg
index 56fd81f75b..9d9de8bd73 100644
--- a/libraries/technology/10gbase_r/hdllib.cfg
+++ b/libraries/technology/10gbase_r/hdllib.cfg
@@ -1,33 +1,32 @@
 hdl_lib_name = tech_10gbase_r
 hdl_library_clause_name = tech_10gbase_r_lib
 hdl_lib_uses_synth = technology
-               tech_pll
-               ip_arria10_phy_10gbase_r
-               ip_arria10_phy_10gbase_r_4
-               ip_arria10_phy_10gbase_r_12
-               ip_arria10_phy_10gbase_r_24
-               ip_arria10_phy_10gbase_r_48
-               ip_arria10_transceiver_pll_10g
-               ip_arria10_transceiver_reset_controller_1
-               ip_arria10_transceiver_reset_controller_4
-               ip_arria10_transceiver_reset_controller_12
-               ip_arria10_transceiver_reset_controller_24
-               ip_arria10_transceiver_reset_controller_48
-               ip_arria10_e3sge3_phy_10gbase_r
-               ip_arria10_e3sge3_phy_10gbase_r_4
-               ip_arria10_e3sge3_phy_10gbase_r_12
-               ip_arria10_e3sge3_phy_10gbase_r_24
-               ip_arria10_e3sge3_phy_10gbase_r_48
-               ip_arria10_e3sge3_transceiver_pll_10g
-               ip_arria10_e3sge3_transceiver_reset_controller_1
-               ip_arria10_e3sge3_transceiver_reset_controller_4
-               ip_arria10_e3sge3_transceiver_reset_controller_12
-               ip_arria10_e3sge3_transceiver_reset_controller_24
-               ip_arria10_e3sge3_transceiver_reset_controller_48
-               tech_transceiver
-               common
+                     tech_pll
+                     ip_arria10_phy_10gbase_r
+                     ip_arria10_phy_10gbase_r_4
+                     ip_arria10_phy_10gbase_r_12
+                     ip_arria10_phy_10gbase_r_24
+                     ip_arria10_phy_10gbase_r_48
+                     ip_arria10_transceiver_pll_10g
+                     ip_arria10_transceiver_reset_controller_1
+                     ip_arria10_transceiver_reset_controller_4
+                     ip_arria10_transceiver_reset_controller_12
+                     ip_arria10_transceiver_reset_controller_24
+                     ip_arria10_transceiver_reset_controller_48
+                     ip_arria10_e3sge3_phy_10gbase_r
+                     ip_arria10_e3sge3_phy_10gbase_r_4
+                     ip_arria10_e3sge3_phy_10gbase_r_12
+                     ip_arria10_e3sge3_phy_10gbase_r_24
+                     ip_arria10_e3sge3_phy_10gbase_r_48
+                     ip_arria10_e3sge3_transceiver_pll_10g
+                     ip_arria10_e3sge3_transceiver_reset_controller_1
+                     ip_arria10_e3sge3_transceiver_reset_controller_4
+                     ip_arria10_e3sge3_transceiver_reset_controller_12
+                     ip_arria10_e3sge3_transceiver_reset_controller_24
+                     ip_arria10_e3sge3_transceiver_reset_controller_48
+                     tech_transceiver
+                     common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -40,3 +39,9 @@ synth_files =
 test_bench_files =
     tb_tech_10gbase_r.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/clkbuf/hdllib.cfg b/libraries/technology/clkbuf/hdllib.cfg
index e576fef06a..eb6cccdd3d 100644
--- a/libraries/technology/clkbuf/hdllib.cfg
+++ b/libraries/technology/clkbuf/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_clkbuf
 hdl_library_clause_name = tech_clkbuf_lib
 hdl_lib_uses_synth = technology ip_arria10_clkbuf_global ip_arria10_e3sge3_clkbuf_global common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -10,3 +9,10 @@ synth_files =
     tech_clkbuf.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ddr/hdllib.cfg b/libraries/technology/ddr/hdllib.cfg
index 511b86ec53..7823158935 100644
--- a/libraries/technology/ddr/hdllib.cfg
+++ b/libraries/technology/ddr/hdllib.cfg
@@ -15,7 +15,6 @@ hdl_lib_uses_synth = ip_stratixiv_ddr3_uphy_4g_800_master
                      common
 hdl_lib_uses_sim = ip_stratixiv_ddr3_mem_model
                    ip_arria10_ddr4_mem_model_141
-
 hdl_lib_technology = 
 
 synth_files =
@@ -31,3 +30,9 @@ test_bench_files =
     tech_ddr_mem_model_component_pkg.vhd
     tech_ddr_mem_model.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/eth_10g/hdllib.cfg b/libraries/technology/eth_10g/hdllib.cfg
index 998ad42426..4097bc27e2 100644
--- a/libraries/technology/eth_10g/hdllib.cfg
+++ b/libraries/technology/eth_10g/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_eth_10g
 hdl_library_clause_name = tech_eth_10g_lib
 hdl_lib_uses_synth = technology tech_pll tech_mac_10g tech_10gbase_r tech_xaui common dp
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -17,3 +16,9 @@ test_bench_files =
     tb_tech_eth_10g_ppm.vhd
     tb_tb_tech_eth_10g.vhd
     
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/fifo/hdllib.cfg b/libraries/technology/fifo/hdllib.cfg
index 358adc9cda..cd2f4e75a3 100644
--- a/libraries/technology/fifo/hdllib.cfg
+++ b/libraries/technology/fifo/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_fifo
 hdl_library_clause_name = tech_fifo_lib
 hdl_lib_uses_synth = technology ip_stratixiv_fifo ip_arria10_fifo ip_arria10_e3sge3_fifo
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -12,3 +11,9 @@ synth_files =
     tech_fifo_dc_mixed_widths.vhd
 
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
diff --git a/libraries/technology/flash/hdllib.cfg b/libraries/technology/flash/hdllib.cfg
index 7f549d0a61..3d9f76f1bc 100644
--- a/libraries/technology/flash/hdllib.cfg
+++ b/libraries/technology/flash/hdllib.cfg
@@ -7,7 +7,6 @@ hdl_lib_uses_synth = technology
                ip_arria10_e3sge3_asmi_parallel
                ip_arria10_e3sge3_remote_update
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -16,3 +15,10 @@ synth_files =
     tech_flash_remote_update.vhd
 
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/fpga_temp_sens/hdllib.cfg b/libraries/technology/fpga_temp_sens/hdllib.cfg
index f52490785a..cbb8929e5c 100644
--- a/libraries/technology/fpga_temp_sens/hdllib.cfg
+++ b/libraries/technology/fpga_temp_sens/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_fpga_temp_sens
 hdl_library_clause_name = tech_fpga_temp_sens_lib
 hdl_lib_uses_synth = technology common ip_arria10_temp_sense ip_arria10_e3sge3_temp_sense
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -10,3 +9,10 @@ synth_files =
     tech_fpga_temp_sens.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/fpga_voltage_sens/hdllib.cfg b/libraries/technology/fpga_voltage_sens/hdllib.cfg
index 9793a24998..08112f7364 100644
--- a/libraries/technology/fpga_voltage_sens/hdllib.cfg
+++ b/libraries/technology/fpga_voltage_sens/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_fpga_voltage_sens
 hdl_library_clause_name = tech_fpga_voltage_sens_lib
 hdl_lib_uses_synth = technology common ip_arria10_voltage_sense ip_arria10_e3sge3_voltage_sense
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -10,3 +9,10 @@ synth_files =
     tech_fpga_voltage_sens.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/fractional_pll/hdllib.cfg b/libraries/technology/fractional_pll/hdllib.cfg
index c5e72e6023..e9cc301c17 100644
--- a/libraries/technology/fractional_pll/hdllib.cfg
+++ b/libraries/technology/fractional_pll/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_fractional_pll
 hdl_library_clause_name = tech_fractional_pll_lib
 hdl_lib_uses_synth = technology ip_arria10_fractional_pll_clk200 ip_arria10_fractional_pll_clk125 ip_arria10_e3sge3_fractional_pll_clk200 ip_arria10_e3sge3_fractional_pll_clk125 common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -11,3 +10,10 @@ synth_files =
     tech_fractional_pll_clk125.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/hdllib.cfg b/libraries/technology/hdllib.cfg
index 98623b6f42..b63e66f46f 100644
--- a/libraries/technology/hdllib.cfg
+++ b/libraries/technology/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = technology
 hdl_library_clause_name = technology_lib
 hdl_lib_uses_synth =
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -10,3 +9,10 @@ synth_files =
     technology_select_pkg.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/iobuf/hdllib.cfg b/libraries/technology/iobuf/hdllib.cfg
index 410b543a38..53d656dc9d 100644
--- a/libraries/technology/iobuf/hdllib.cfg
+++ b/libraries/technology/iobuf/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_iobuf
 hdl_library_clause_name = tech_iobuf_lib
 hdl_lib_uses_synth = technology ip_stratixiv_ddio ip_arria10_ddio ip_arria10_e3sge3_ddio
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -11,3 +10,10 @@ synth_files =
     tech_iobuf_ddio_out.vhd
 
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_arria10/clkbuf_global/hdllib.cfg b/libraries/technology/ip_arria10/clkbuf_global/hdllib.cfg
index 0d8942d691..dab29a0357 100644
--- a/libraries/technology/ip_arria10/clkbuf_global/hdllib.cfg
+++ b/libraries/technology/ip_arria10/clkbuf_global/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_clkbuf_global
 hdl_library_clause_name = ip_arria10_clkbuf_global_altclkctrl_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/clkbuf_global/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/clkbuf_global/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_clkbuf_global.qip
diff --git a/libraries/technology/ip_arria10/complex_mult/hdllib.cfg b/libraries/technology/ip_arria10/complex_mult/hdllib.cfg
index d6aaa13158..8e7b0c0c0b 100644
--- a/libraries/technology/ip_arria10/complex_mult/hdllib.cfg
+++ b/libraries/technology/ip_arria10/complex_mult/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_complex_mult
 hdl_library_clause_name = ip_arria10_complex_mult_altmult_complex_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/complex_mult/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/complex_mult/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_complex_mult.qip
diff --git a/libraries/technology/ip_arria10/complex_mult_rtl/hdllib.cfg b/libraries/technology/ip_arria10/complex_mult_rtl/hdllib.cfg
index e001e9caee..4e99d3d331 100644
--- a/libraries/technology/ip_arria10/complex_mult_rtl/hdllib.cfg
+++ b/libraries/technology/ip_arria10/complex_mult_rtl/hdllib.cfg
@@ -2,10 +2,16 @@ hdl_lib_name = ip_arria10_complex_mult_rtl
 hdl_library_clause_name = ip_arria10_complex_mult_rtl_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
 synth_files =
     ip_arria10_complex_mult_rtl.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_arria10/ddio/hdllib.cfg b/libraries/technology/ip_arria10/ddio/hdllib.cfg
index 3e0dcb7f17..f3881529ba 100644
--- a/libraries/technology/ip_arria10/ddio/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ddio/hdllib.cfg
@@ -2,18 +2,21 @@ hdl_lib_name = ip_arria10_ddio
 hdl_library_clause_name = ip_arria10_ddio_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/ddio/compile_ip.tcl
-
 synth_files =
     ip_arria10_ddio_in.vhd
     ip_arria10_ddio_out.vhd
     
 test_bench_files =
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/ddio/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_ddio_in_1.qip
     generated/ip_arria10_ddio_out_1.qip
diff --git a/libraries/technology/ip_arria10/ddr4_4g_1600/hdllib.cfg b/libraries/technology/ip_arria10/ddr4_4g_1600/hdllib.cfg
index bbd11c76bd..df28a123cd 100644
--- a/libraries/technology/ip_arria10/ddr4_4g_1600/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ddr4_4g_1600/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_ddr4_4g_1600
 hdl_library_clause_name = ip_arria10_ddr4_4g_1600_altera_emif_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_1600/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_1600/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_ddr4_4g_1600.qip
diff --git a/libraries/technology/ip_arria10/ddr4_4g_2000/hdllib.cfg b/libraries/technology/ip_arria10/ddr4_4g_2000/hdllib.cfg
index c9c12814e6..b11af9b217 100644
--- a/libraries/technology/ip_arria10/ddr4_4g_2000/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ddr4_4g_2000/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_ddr4_4g_2000
 hdl_library_clause_name = ip_arria10_ddr4_4g_2000_altera_emif_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_2000/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_2000/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_ddr4_4g_2000.qip
diff --git a/libraries/technology/ip_arria10/ddr4_8g_2400/hdllib.cfg b/libraries/technology/ip_arria10/ddr4_8g_2400/hdllib.cfg
index 1853b8c23f..9a802df0ee 100644
--- a/libraries/technology/ip_arria10/ddr4_8g_2400/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ddr4_8g_2400/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_ddr4_8g_2400
 hdl_library_clause_name = ip_arria10_ddr4_8g_2400_altera_emif_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/ddr4_8g_2400/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/ddr4_8g_2400/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_ddr4_8g_2400.qip
diff --git a/libraries/technology/ip_arria10/ddr4_mem_model_141/hdllib.cfg b/libraries/technology/ip_arria10/ddr4_mem_model_141/hdllib.cfg
index 5bc56a3815..f1011b2cc6 100644
--- a/libraries/technology/ip_arria10/ddr4_mem_model_141/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ddr4_mem_model_141/hdllib.cfg
@@ -2,12 +2,16 @@ hdl_lib_name = ip_arria10_ddr4_mem_model_141
 hdl_library_clause_name = ed_sim_altera_emif_mem_model_core_ddr4_141
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/ddr4_mem_model_141/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
+
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/ddr4_mem_model_141/compile_ip.tcl
+
+
+[quartus_project_file]
diff --git a/libraries/technology/ip_arria10/fifo/hdllib.cfg b/libraries/technology/ip_arria10/fifo/hdllib.cfg
index be81b20d07..12198c4f1c 100644
--- a/libraries/technology/ip_arria10/fifo/hdllib.cfg
+++ b/libraries/technology/ip_arria10/fifo/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_arria10_fifo
 hdl_library_clause_name = ip_arria10_fifo_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
 synth_files =
@@ -11,3 +10,10 @@ synth_files =
     ip_arria10_fifo_dc_mixed_widths.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg b/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg
index 1198f8980b..ff92bbf78c 100644
--- a/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg
+++ b/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_asmi_parallel
 hdl_library_clause_name = ip_arria10_asmi_parallel_altera_asmi_parallel_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/flash/asmi_parallel/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/flash/asmi_parallel/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_asmi_parallel.qip
diff --git a/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg b/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg
index 35530b1872..a1da1edce3 100644
--- a/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg
+++ b/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_remote_update
 hdl_library_clause_name = ip_arria10_remote_update_altera_remote_update_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/flash/remote_update/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/flash/remote_update/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_remote_update.qip
diff --git a/libraries/technology/ip_arria10/fractional_pll_clk125/hdllib.cfg b/libraries/technology/ip_arria10/fractional_pll_clk125/hdllib.cfg
index 67d512bd7a..e3e1e4ab69 100644
--- a/libraries/technology/ip_arria10/fractional_pll_clk125/hdllib.cfg
+++ b/libraries/technology/ip_arria10/fractional_pll_clk125/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_fractional_pll_clk125
 hdl_library_clause_name = ip_arria10_fractional_pll_clk125_altera_xcvr_fpll_a10_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/fractional_pll_clk125/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/fractional_pll_clk125/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_fractional_pll_clk125.qip
diff --git a/libraries/technology/ip_arria10/fractional_pll_clk200/hdllib.cfg b/libraries/technology/ip_arria10/fractional_pll_clk200/hdllib.cfg
index 5ff81486b4..9efe341b9c 100644
--- a/libraries/technology/ip_arria10/fractional_pll_clk200/hdllib.cfg
+++ b/libraries/technology/ip_arria10/fractional_pll_clk200/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_fractional_pll_clk200
 hdl_library_clause_name = ip_arria10_fractional_pll_clk200_altera_xcvr_fpll_a10_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/fractional_pll_clk200/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/fractional_pll_clk200/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_fractional_pll_clk200.qip
diff --git a/libraries/technology/ip_arria10/mac_10g/hdllib.cfg b/libraries/technology/ip_arria10/mac_10g/hdllib.cfg
index 337af9fd0e..432addcdba 100644
--- a/libraries/technology/ip_arria10/mac_10g/hdllib.cfg
+++ b/libraries/technology/ip_arria10/mac_10g/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = ip_arria10_mac_10g
 hdl_library_clause_name = ip_arria10_mac_10g_alt_em10g32_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/mac_10g/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
@@ -15,5 +11,12 @@ test_bench_files =
     # the tb is commented because it is not useful, see generate_ip.sh.
     #$RADIOHDL/libraries/technology/ip_arria10/mac_10g/generated_tb/generated/sim/ip_arria10_mac_10g_tb.vhd
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/mac_10g/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_mac_10g.qip
diff --git a/libraries/technology/ip_arria10/mult/hdllib.cfg b/libraries/technology/ip_arria10/mult/hdllib.cfg
index d4b2970091..e703feb5f3 100644
--- a/libraries/technology/ip_arria10/mult/hdllib.cfg
+++ b/libraries/technology/ip_arria10/mult/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_arria10_mult
 hdl_library_clause_name = ip_arria10_mult_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
 synth_files =
@@ -10,3 +9,10 @@ synth_files =
     ip_arria10_mult_rtl.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_arria10/phy_10gbase_r/hdllib.cfg b/libraries/technology/ip_arria10/phy_10gbase_r/hdllib.cfg
index 480ecc9175..a9da96f5ea 100644
--- a/libraries/technology/ip_arria10/phy_10gbase_r/hdllib.cfg
+++ b/libraries/technology/ip_arria10/phy_10gbase_r/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_phy_10gbase_r
 hdl_library_clause_name = ip_arria10_phy_10gbase_r_altera_xcvr_native_a10_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_phy_10gbase_r.qip
diff --git a/libraries/technology/ip_arria10/phy_10gbase_r_12/hdllib.cfg b/libraries/technology/ip_arria10/phy_10gbase_r_12/hdllib.cfg
index 58025b8771..df2b66e38e 100644
--- a/libraries/technology/ip_arria10/phy_10gbase_r_12/hdllib.cfg
+++ b/libraries/technology/ip_arria10/phy_10gbase_r_12/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_phy_10gbase_r_12
 hdl_library_clause_name = ip_arria10_phy_10gbase_r_12_altera_xcvr_native_a10_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r_12/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r_12/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_phy_10gbase_r_12.qip
diff --git a/libraries/technology/ip_arria10/phy_10gbase_r_24/hdllib.cfg b/libraries/technology/ip_arria10/phy_10gbase_r_24/hdllib.cfg
index 121778e158..ca1857cf44 100644
--- a/libraries/technology/ip_arria10/phy_10gbase_r_24/hdllib.cfg
+++ b/libraries/technology/ip_arria10/phy_10gbase_r_24/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_phy_10gbase_r_24
 hdl_library_clause_name = ip_arria10_phy_10gbase_r_24_altera_xcvr_native_a10_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r_24/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r_24/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_phy_10gbase_r_24.qip
diff --git a/libraries/technology/ip_arria10/phy_10gbase_r_4/hdllib.cfg b/libraries/technology/ip_arria10/phy_10gbase_r_4/hdllib.cfg
index 81402c6915..b41ddab972 100644
--- a/libraries/technology/ip_arria10/phy_10gbase_r_4/hdllib.cfg
+++ b/libraries/technology/ip_arria10/phy_10gbase_r_4/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_phy_10gbase_r_4
 hdl_library_clause_name = ip_arria10_phy_10gbase_r_4_altera_xcvr_native_a10_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r_4/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r_4/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_phy_10gbase_r_4.qip
diff --git a/libraries/technology/ip_arria10/phy_10gbase_r_48/hdllib.cfg b/libraries/technology/ip_arria10/phy_10gbase_r_48/hdllib.cfg
index 03e0ff49ad..0a0ae1bc3b 100644
--- a/libraries/technology/ip_arria10/phy_10gbase_r_48/hdllib.cfg
+++ b/libraries/technology/ip_arria10/phy_10gbase_r_48/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_phy_10gbase_r_48
 hdl_library_clause_name = ip_arria10_phy_10gbase_r_48_altera_xcvr_native_a10_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r_48/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/phy_10gbase_r_48/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_phy_10gbase_r_48.qip
diff --git a/libraries/technology/ip_arria10/pll_clk125/hdllib.cfg b/libraries/technology/ip_arria10/pll_clk125/hdllib.cfg
index 36c69cea1d..fbef174b2a 100644
--- a/libraries/technology/ip_arria10/pll_clk125/hdllib.cfg
+++ b/libraries/technology/ip_arria10/pll_clk125/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_pll_clk125
 hdl_library_clause_name = ip_arria10_pll_clk125_altera_iopll_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/pll_clk125/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/pll_clk125/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_pll_clk125.qip
diff --git a/libraries/technology/ip_arria10/pll_clk200/hdllib.cfg b/libraries/technology/ip_arria10/pll_clk200/hdllib.cfg
index a407fab699..03522a7e1e 100644
--- a/libraries/technology/ip_arria10/pll_clk200/hdllib.cfg
+++ b/libraries/technology/ip_arria10/pll_clk200/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_pll_clk200
 hdl_library_clause_name = ip_arria10_pll_clk200_altera_iopll_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/pll_clk200/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/pll_clk200/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_pll_clk200.qip
diff --git a/libraries/technology/ip_arria10/pll_clk25/hdllib.cfg b/libraries/technology/ip_arria10/pll_clk25/hdllib.cfg
index aff8909344..55e9e73b6a 100644
--- a/libraries/technology/ip_arria10/pll_clk25/hdllib.cfg
+++ b/libraries/technology/ip_arria10/pll_clk25/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_pll_clk25
 hdl_library_clause_name = ip_arria10_pll_clk25_altera_iopll_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/pll_clk25/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/pll_clk25/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_pll_clk25.qip
diff --git a/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/hdllib.cfg b/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/hdllib.cfg
index 31d1464deb..deacb41f9e 100644
--- a/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/hdllib.cfg
+++ b/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_pll_xgmii_mac_clocks
 hdl_library_clause_name = ip_arria10_pll_xgmii_mac_clocks_altera_xcvr_fpll_a10_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_pll_xgmii_mac_clocks.qip
diff --git a/libraries/technology/ip_arria10/ram/hdllib.cfg b/libraries/technology/ip_arria10/ram/hdllib.cfg
index a2a5329df4..c955318716 100644
--- a/libraries/technology/ip_arria10/ram/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ram/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_arria10_ram
 hdl_library_clause_name = ip_arria10_ram_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
 synth_files =
@@ -16,3 +15,10 @@ synth_files =
     ip_arria10_ram_r_w.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_arria10/temp_sense/hdllib.cfg b/libraries/technology/ip_arria10/temp_sense/hdllib.cfg
index 54e94a998f..5266b8bcf5 100644
--- a/libraries/technology/ip_arria10/temp_sense/hdllib.cfg
+++ b/libraries/technology/ip_arria10/temp_sense/hdllib.cfg
@@ -2,14 +2,17 @@ hdl_lib_name = ip_arria10_temp_sense
 hdl_library_clause_name = ip_arria10_temp_sense_altera_temp_sense_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-#modelsim_compile_ip_files =
-#    $RADIOHDL/libraries/technology/ip_arria10/temp_sense/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+#modelsim_compile_ip_files =
+#    $RADIOHDL/libraries/technology/ip_arria10/temp_sense/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files = generated/ip_arria10_temp_sense.qip
diff --git a/libraries/technology/ip_arria10/transceiver_pll_10g/hdllib.cfg b/libraries/technology/ip_arria10/transceiver_pll_10g/hdllib.cfg
index 609fb99a54..0858e529e8 100644
--- a/libraries/technology/ip_arria10/transceiver_pll_10g/hdllib.cfg
+++ b/libraries/technology/ip_arria10/transceiver_pll_10g/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_transceiver_pll_10g
 hdl_library_clause_name = ip_arria10_transceiver_pll_10g_altera_xcvr_atx_pll_a10_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/transceiver_pll_10g/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/transceiver_pll_10g/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_transceiver_pll_10g.qip
diff --git a/libraries/technology/ip_arria10/transceiver_reset_controller_1/hdllib.cfg b/libraries/technology/ip_arria10/transceiver_reset_controller_1/hdllib.cfg
index 7fd7792ec1..180275109a 100644
--- a/libraries/technology/ip_arria10/transceiver_reset_controller_1/hdllib.cfg
+++ b/libraries/technology/ip_arria10/transceiver_reset_controller_1/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_transceiver_reset_controller_1
 hdl_library_clause_name = ip_arria10_transceiver_reset_controller_1_altera_xcvr_reset_control_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_1/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_1/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_transceiver_reset_controller_1.qip
diff --git a/libraries/technology/ip_arria10/transceiver_reset_controller_12/hdllib.cfg b/libraries/technology/ip_arria10/transceiver_reset_controller_12/hdllib.cfg
index bc07a17a1f..11b372a73f 100644
--- a/libraries/technology/ip_arria10/transceiver_reset_controller_12/hdllib.cfg
+++ b/libraries/technology/ip_arria10/transceiver_reset_controller_12/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_transceiver_reset_controller_12
 hdl_library_clause_name = ip_arria10_transceiver_reset_controller_12_altera_xcvr_reset_control_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_12/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_12/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_transceiver_reset_controller_12.qip
diff --git a/libraries/technology/ip_arria10/transceiver_reset_controller_24/hdllib.cfg b/libraries/technology/ip_arria10/transceiver_reset_controller_24/hdllib.cfg
index 9fb365e911..bb7b3626ee 100644
--- a/libraries/technology/ip_arria10/transceiver_reset_controller_24/hdllib.cfg
+++ b/libraries/technology/ip_arria10/transceiver_reset_controller_24/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_transceiver_reset_controller_24
 hdl_library_clause_name = ip_arria10_transceiver_reset_controller_24_altera_xcvr_reset_control_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_24/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_24/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_transceiver_reset_controller_24.qip
diff --git a/libraries/technology/ip_arria10/transceiver_reset_controller_4/hdllib.cfg b/libraries/technology/ip_arria10/transceiver_reset_controller_4/hdllib.cfg
index 5ac10251a3..fa0c96d38c 100644
--- a/libraries/technology/ip_arria10/transceiver_reset_controller_4/hdllib.cfg
+++ b/libraries/technology/ip_arria10/transceiver_reset_controller_4/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_transceiver_reset_controller_4
 hdl_library_clause_name = ip_arria10_transceiver_reset_controller_4_altera_xcvr_reset_control_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_4/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_4/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_transceiver_reset_controller_4.qip
diff --git a/libraries/technology/ip_arria10/transceiver_reset_controller_48/hdllib.cfg b/libraries/technology/ip_arria10/transceiver_reset_controller_48/hdllib.cfg
index 36a3cea679..0db9821b67 100644
--- a/libraries/technology/ip_arria10/transceiver_reset_controller_48/hdllib.cfg
+++ b/libraries/technology/ip_arria10/transceiver_reset_controller_48/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_transceiver_reset_controller_48
 hdl_library_clause_name = ip_arria10_transceiver_reset_controller_48_altera_xcvr_reset_control_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_48/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/transceiver_reset_controller_48/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_transceiver_reset_controller_48.qip
diff --git a/libraries/technology/ip_arria10/tse_sgmii_gx/hdllib.cfg b/libraries/technology/ip_arria10/tse_sgmii_gx/hdllib.cfg
index 3ef64426b9..aad3d57375 100644
--- a/libraries/technology/ip_arria10/tse_sgmii_gx/hdllib.cfg
+++ b/libraries/technology/ip_arria10/tse_sgmii_gx/hdllib.cfg
@@ -2,16 +2,19 @@ hdl_lib_name = ip_arria10_tse_sgmii_gx
 hdl_library_clause_name = ip_arria10_tse_sgmii_gx_altera_eth_tse_150
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/tse_sgmii_gx/compile_ip.tcl
-    
 synth_files =
     
 test_bench_files = 
     tb_ip_arria10_tse_sgmii_gx.vhd
 
+    
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/tse_sgmii_gx/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_tse_sgmii_gx.qip
diff --git a/libraries/technology/ip_arria10/tse_sgmii_lvds/hdllib.cfg b/libraries/technology/ip_arria10/tse_sgmii_lvds/hdllib.cfg
index fbf2daaa28..d8a27e3848 100644
--- a/libraries/technology/ip_arria10/tse_sgmii_lvds/hdllib.cfg
+++ b/libraries/technology/ip_arria10/tse_sgmii_lvds/hdllib.cfg
@@ -2,17 +2,20 @@ hdl_lib_name = ip_arria10_tse_sgmii_lvds
 hdl_library_clause_name = ip_arria10_tse_sgmii_lvds_altera_eth_tse_150
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/tse_sgmii_lvds/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
     tb_ip_arria10_tse_sgmii_lvds.vhd
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/tse_sgmii_lvds/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_tse_sgmii_lvds.qip
 
diff --git a/libraries/technology/ip_arria10/voltage_sense/hdllib.cfg b/libraries/technology/ip_arria10/voltage_sense/hdllib.cfg
index 1c0b337feb..7268d16a04 100644
--- a/libraries/technology/ip_arria10/voltage_sense/hdllib.cfg
+++ b/libraries/technology/ip_arria10/voltage_sense/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_voltage_sense
 hdl_library_clause_name = ip_arria10_voltage_sense_altera_voltage_sense_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10
 
+synth_files =
+    
+test_bench_files = 
+
+
+[modelsim_project_file]
 # There is no simulation model for the FPGA voltage sensor IP
 #modelsim_compile_ip_files =
 #    $RADIOHDL/libraries/technology/ip_arria10/voltage_sense/compile_ip.tcl
 
-synth_files =
-    
-test_bench_files = 
 
+[quartus_project_file]
 quartus_qip_files = generated/ip_arria10_voltage_sense.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/clkbuf_global/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/clkbuf_global/hdllib.cfg
index 2c7493ddd9..d2f1999952 100644
--- a/libraries/technology/ip_arria10_e3sge3/clkbuf_global/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/clkbuf_global/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_clkbuf_global
 hdl_library_clause_name = ip_arria10_e3sge3_clkbuf_global_altclkctrl_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/clkbuf_global/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/clkbuf_global/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_clkbuf_global.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/complex_mult/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/complex_mult/hdllib.cfg
index 66728e9b19..43be8eb955 100644
--- a/libraries/technology/ip_arria10_e3sge3/complex_mult/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/complex_mult/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_complex_mult
 hdl_library_clause_name = ip_arria10_e3sge3_complex_mult_altmult_complex_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/complex_mult/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/complex_mult/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_complex_mult.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/ddio/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/ddio/hdllib.cfg
index fca92aa025..32435e25bc 100644
--- a/libraries/technology/ip_arria10_e3sge3/ddio/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/ddio/hdllib.cfg
@@ -2,18 +2,21 @@ hdl_lib_name = ip_arria10_e3sge3_ddio
 hdl_library_clause_name = ip_arria10_e3sge3_ddio_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddio/compile_ip.tcl
-
 synth_files =
     ip_arria10_e3sge3_ddio_in.vhd
     ip_arria10_e3sge3_ddio_out.vhd
     
 test_bench_files =
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddio/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_ddio_in_1.qip
     generated/ip_arria10_e3sge3_ddio_out_1.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/ddr4_4g_1600/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/ddr4_4g_1600/hdllib.cfg
index 53b1928aa2..99742d110b 100644
--- a/libraries/technology/ip_arria10_e3sge3/ddr4_4g_1600/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/ddr4_4g_1600/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_ddr4_4g_1600
 hdl_library_clause_name = ip_arria10_e3sge3_ddr4_4g_1600_altera_emif_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_4g_1600/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_4g_1600/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_ddr4_4g_1600.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/ddr4_4g_2000/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/ddr4_4g_2000/hdllib.cfg
index 2a19b44457..f45e4a918b 100644
--- a/libraries/technology/ip_arria10_e3sge3/ddr4_4g_2000/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/ddr4_4g_2000/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_ddr4_4g_2000
 hdl_library_clause_name = ip_arria10_e3sge3_ddr4_4g_2000_altera_emif_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_4g_2000/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_4g_2000/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_ddr4_4g_2000.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/ddr4_8g_1600/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/ddr4_8g_1600/hdllib.cfg
index 3a9628acbb..acd778d409 100644
--- a/libraries/technology/ip_arria10_e3sge3/ddr4_8g_1600/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/ddr4_8g_1600/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_ddr4_8g_1600
 hdl_library_clause_name = ip_arria10_e3sge3_ddr4_8g_1600_altera_emif_150
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_8g_1600/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_8g_1600/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_ddr4_8g_1600.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/ddr4_8g_2400/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/ddr4_8g_2400/hdllib.cfg
index 3db8c8f2ed..8c19e34ac8 100644
--- a/libraries/technology/ip_arria10_e3sge3/ddr4_8g_2400/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/ddr4_8g_2400/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_ddr4_8g_2400
 hdl_library_clause_name = ip_arria10_e3sge3_ddr4_8g_2400_altera_emif_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_8g_2400/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/ddr4_8g_2400/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_ddr4_8g_2400.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/fifo/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/fifo/hdllib.cfg
index da7f0d8f51..779ccfcef2 100644
--- a/libraries/technology/ip_arria10_e3sge3/fifo/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/fifo/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_arria10_e3sge3_fifo
 hdl_library_clause_name = ip_arria10_e3sge3_fifo_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
 synth_files =
@@ -11,3 +10,10 @@ synth_files =
     ip_arria10_e3sge3_fifo_dc_mixed_widths.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_arria10_e3sge3/flash/asmi_parallel/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/flash/asmi_parallel/hdllib.cfg
index 52a2a86a6b..704be79dca 100644
--- a/libraries/technology/ip_arria10_e3sge3/flash/asmi_parallel/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/flash/asmi_parallel/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_asmi_parallel
 hdl_library_clause_name = ip_arria10_e3sge3_asmi_parallel_altera_asmi_parallel_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/flash/asmi_parallel/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/flash/asmi_parallel/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_asmi_parallel.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/flash/remote_update/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/flash/remote_update/hdllib.cfg
index 0f8147f4fb..697564797b 100644
--- a/libraries/technology/ip_arria10_e3sge3/flash/remote_update/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/flash/remote_update/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_remote_update
 hdl_library_clause_name = ip_arria10_e3sge3_remote_update_altera_remote_update_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/flash/remote_update/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/flash/remote_update/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_remote_update.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk125/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk125/hdllib.cfg
index 7caa46b972..febed22b2c 100644
--- a/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk125/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk125/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_fractional_pll_clk125
 hdl_library_clause_name = ip_arria10_e3sge3_fractional_pll_clk125_altera_xcvr_fpll_a10_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk125/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk125/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_fractional_pll_clk125.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk200/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk200/hdllib.cfg
index 8050fce67e..fd683a26a0 100644
--- a/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk200/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk200/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_fractional_pll_clk200
 hdl_library_clause_name = ip_arria10_e3sge3_fractional_pll_clk200_altera_xcvr_fpll_a10_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk200/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/fractional_pll_clk200/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_fractional_pll_clk200.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/mac_10g/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/mac_10g/hdllib.cfg
index b04b01e767..0363ce82a4 100644
--- a/libraries/technology/ip_arria10_e3sge3/mac_10g/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/mac_10g/hdllib.cfg
@@ -2,12 +2,8 @@ hdl_lib_name = ip_arria10_e3sge3_mac_10g
 hdl_library_clause_name = ip_arria10_e3sge3_mac_10g_alt_em10g32_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/mac_10g/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
@@ -15,5 +11,12 @@ test_bench_files =
     # the tb is commented because it is not useful, see generate_ip.sh.
     #$RADIOHDL/libraries/technology/ip_arria10_e3sge3/mac_10g/generated_tb/generated/sim/ip_arria10_e3sge3_mac_10g_tb.vhd
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/mac_10g/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_mac_10g.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/mult_add4/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/mult_add4/hdllib.cfg
index 91d152874f..e1d3436d38 100644
--- a/libraries/technology/ip_arria10_e3sge3/mult_add4/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/mult_add4/hdllib.cfg
@@ -2,14 +2,17 @@ hdl_lib_name = ip_arria10_e3sge3_mult_add4_rtl
 hdl_library_clause_name = ip_arria10_e3sge3_mult_add4_rtl_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-
 synth_files =
     ip_arria10_e3sge3_mult_add4_rtl.vhd
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+
+
+[quartus_project_file]
 quartus_qip_files =
diff --git a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r/hdllib.cfg
index 5719a49ff6..849af13e09 100644
--- a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_phy_10gbase_r
 hdl_library_clause_name = ip_arria10_e3sge3_phy_10gbase_r_altera_xcvr_native_a10_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_phy_10gbase_r.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_12/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_12/hdllib.cfg
index 80d0680bce..fba55e697b 100644
--- a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_12/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_12/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_phy_10gbase_r_12
 hdl_library_clause_name = ip_arria10_e3sge3_phy_10gbase_r_12_altera_xcvr_native_a10_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_12/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_12/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_phy_10gbase_r_12.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_24/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_24/hdllib.cfg
index 06f79d9374..b04864d239 100644
--- a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_24/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_24/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_phy_10gbase_r_24
 hdl_library_clause_name = ip_arria10_e3sge3_phy_10gbase_r_24_altera_xcvr_native_a10_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_24/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_24/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_phy_10gbase_r_24.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_4/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_4/hdllib.cfg
index 5955c388ee..efb4fdc211 100644
--- a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_4/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_4/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_phy_10gbase_r_4
 hdl_library_clause_name = ip_arria10_e3sge3_phy_10gbase_r_4_altera_xcvr_native_a10_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_4/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_4/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_phy_10gbase_r_4.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_48/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_48/hdllib.cfg
index b25af53a70..6182b3cd25 100644
--- a/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_48/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_48/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_phy_10gbase_r_48
 hdl_library_clause_name = ip_arria10_e3sge3_phy_10gbase_r_48_altera_xcvr_native_a10_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_48/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/phy_10gbase_r_48/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_phy_10gbase_r_48.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/pll_clk125/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/pll_clk125/hdllib.cfg
index 6857212230..b87c3842cd 100644
--- a/libraries/technology/ip_arria10_e3sge3/pll_clk125/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/pll_clk125/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_pll_clk125
 hdl_library_clause_name = ip_arria10_e3sge3_pll_clk125_altera_iopll_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/pll_clk125/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/pll_clk125/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_pll_clk125.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/pll_clk200/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/pll_clk200/hdllib.cfg
index 26ec0a211e..746b95e754 100644
--- a/libraries/technology/ip_arria10_e3sge3/pll_clk200/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/pll_clk200/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_pll_clk200
 hdl_library_clause_name = ip_arria10_e3sge3_pll_clk200_altera_iopll_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/pll_clk200/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/pll_clk200/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_pll_clk200.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/pll_clk25/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/pll_clk25/hdllib.cfg
index 37d30f2de3..d921f8ffc4 100644
--- a/libraries/technology/ip_arria10_e3sge3/pll_clk25/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/pll_clk25/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_pll_clk25
 hdl_library_clause_name = ip_arria10_e3sge3_pll_clk25_altera_iopll_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/pll_clk25/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/pll_clk25/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_pll_clk25.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/pll_xgmii_mac_clocks/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/pll_xgmii_mac_clocks/hdllib.cfg
index a0be0646dd..163fd8ab18 100644
--- a/libraries/technology/ip_arria10_e3sge3/pll_xgmii_mac_clocks/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/pll_xgmii_mac_clocks/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_pll_xgmii_mac_clocks
 hdl_library_clause_name = ip_arria10_e3sge3_pll_xgmii_mac_clocks_altera_xcvr_fpll_a10_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/pll_xgmii_mac_clocks/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/pll_xgmii_mac_clocks/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_pll_xgmii_mac_clocks.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/ram/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/ram/hdllib.cfg
index 44aaf317ab..993b503c63 100644
--- a/libraries/technology/ip_arria10_e3sge3/ram/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/ram/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_arria10_e3sge3_ram
 hdl_library_clause_name = ip_arria10_e3sge3_ram_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
 synth_files =
@@ -16,3 +15,10 @@ synth_files =
     ip_arria10_e3sge3_ram_r_w.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_arria10_e3sge3/temp_sense/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/temp_sense/hdllib.cfg
index 63d27bbaeb..0f2bea029f 100644
--- a/libraries/technology/ip_arria10_e3sge3/temp_sense/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/temp_sense/hdllib.cfg
@@ -2,14 +2,17 @@ hdl_lib_name = ip_arria10_e3sge3_temp_sense
 hdl_library_clause_name = ip_arria10_e3sge3_temp_sense_altera_temp_sense_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-#modelsim_compile_ip_files =
-#    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/temp_sense/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+#modelsim_compile_ip_files =
+#    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/temp_sense/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files = generated/ip_arria10_e3sge3_temp_sense.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/transceiver_pll_10g/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/transceiver_pll_10g/hdllib.cfg
index ca0096f0c4..24cb2c48da 100644
--- a/libraries/technology/ip_arria10_e3sge3/transceiver_pll_10g/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/transceiver_pll_10g/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_transceiver_pll_10g
 hdl_library_clause_name = ip_arria10_e3sge3_transceiver_pll_10g_altera_xcvr_atx_pll_a10_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_pll_10g/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_pll_10g/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_transceiver_pll_10g.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_1/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_1/hdllib.cfg
index fbb5c8d1a6..38e2dc944a 100644
--- a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_1/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_1/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_transceiver_reset_controller_1
 hdl_library_clause_name = ip_arria10_e3sge3_transceiver_reset_controller_1_altera_xcvr_reset_control_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_1/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_1/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_transceiver_reset_controller_1.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_12/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_12/hdllib.cfg
index 90ac370efd..491b15792b 100644
--- a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_12/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_12/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_transceiver_reset_controller_12
 hdl_library_clause_name = ip_arria10_e3sge3_transceiver_reset_controller_12_altera_xcvr_reset_control_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_12/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_12/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_transceiver_reset_controller_12.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_24/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_24/hdllib.cfg
index 46a59f7ae1..6eb1e1c0ca 100644
--- a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_24/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_24/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_transceiver_reset_controller_24
 hdl_library_clause_name = ip_arria10_e3sge3_transceiver_reset_controller_24_altera_xcvr_reset_control_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_24/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_24/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_transceiver_reset_controller_24.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_4/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_4/hdllib.cfg
index e4ca938995..0d46dbf1cf 100644
--- a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_4/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_4/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_transceiver_reset_controller_4
 hdl_library_clause_name = ip_arria10_e3sge3_transceiver_reset_controller_4_altera_xcvr_reset_control_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_4/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_4/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_transceiver_reset_controller_4.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_48/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_48/hdllib.cfg
index a677a2d9df..2598b18af3 100644
--- a/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_48/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_48/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_transceiver_reset_controller_48
 hdl_library_clause_name = ip_arria10_e3sge3_transceiver_reset_controller_48_altera_xcvr_reset_control_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_48/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/transceiver_reset_controller_48/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_transceiver_reset_controller_48.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/tse_sgmii_gx/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/tse_sgmii_gx/hdllib.cfg
index 08b93719dc..931957a3a1 100644
--- a/libraries/technology/ip_arria10_e3sge3/tse_sgmii_gx/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/tse_sgmii_gx/hdllib.cfg
@@ -2,16 +2,19 @@ hdl_lib_name = ip_arria10_e3sge3_tse_sgmii_gx
 hdl_library_clause_name = ip_arria10_e3sge3_tse_sgmii_gx_altera_eth_tse_151
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/tse_sgmii_gx/compile_ip.tcl
-    
 synth_files =
     
 test_bench_files = 
     tb_ip_arria10_e3sge3_tse_sgmii_gx.vhd
 
+    
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/tse_sgmii_gx/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_tse_sgmii_gx.qip
diff --git a/libraries/technology/ip_arria10_e3sge3/tse_sgmii_lvds/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/tse_sgmii_lvds/hdllib.cfg
index e8b3d4351a..a99d870f4e 100644
--- a/libraries/technology/ip_arria10_e3sge3/tse_sgmii_lvds/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/tse_sgmii_lvds/hdllib.cfg
@@ -2,17 +2,20 @@ hdl_lib_name = ip_arria10_e3sge3_tse_sgmii_lvds
 hdl_library_clause_name = ip_arria10_e3sge3_tse_sgmii_lvds_altera_eth_tse_151
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_arria10/tse_sgmii_lvds/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
     tb_ip_arria10_e3sge3_tse_sgmii_lvds.vhd
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_arria10/tse_sgmii_lvds/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_arria10_e3sge3_tse_sgmii_lvds.qip
 
diff --git a/libraries/technology/ip_arria10_e3sge3/voltage_sense/hdllib.cfg b/libraries/technology/ip_arria10_e3sge3/voltage_sense/hdllib.cfg
index 6f541b5a46..5c3a2a7bfe 100644
--- a/libraries/technology/ip_arria10_e3sge3/voltage_sense/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e3sge3/voltage_sense/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_arria10_e3sge3_voltage_sense
 hdl_library_clause_name = ip_arria10_e3sge3_voltage_sense_altera_voltage_sense_151
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_arria10_e3sge3
 
+synth_files =
+    
+test_bench_files = 
+
+
+[modelsim_project_file]
 # There is no simulation model for the FPGA voltage sensor IP
 #modelsim_compile_ip_files =
 #    $RADIOHDL/libraries/technology/ip_arria10_e3sge3/voltage_sense/compile_ip.tcl
 
-synth_files =
-    
-test_bench_files = 
 
+[quartus_project_file]
 quartus_qip_files = generated/ip_arria10_e3sge3_voltage_sense.qip
diff --git a/libraries/technology/ip_stratixiv/ddio/hdllib.cfg b/libraries/technology/ip_stratixiv/ddio/hdllib.cfg
index 64947cdaec..f997c9361b 100644
--- a/libraries/technology/ip_stratixiv/ddio/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddio/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_stratixiv_ddio
 hdl_library_clause_name = ip_stratixiv_ddio_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -10,3 +9,10 @@ synth_files =
     ip_stratixiv_ddio_out.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_stratixiv/ddr3_mem_model/hdllib.cfg b/libraries/technology/ip_stratixiv/ddr3_mem_model/hdllib.cfg
index a69f1eb202..54443d82bc 100644
--- a/libraries/technology/ip_stratixiv/ddr3_mem_model/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddr3_mem_model/hdllib.cfg
@@ -2,12 +2,16 @@ hdl_lib_name = ip_stratixiv_ddr3_mem_model
 hdl_library_clause_name = ip_stratixiv_ddr3_mem_model_lib
 hdl_lib_uses_synth = ip_stratixiv_ddr3_uphy_4g_800_master
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_mem_model/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
+
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_mem_model/compile_ip.tcl
+
+
+[quartus_project_file]
diff --git a/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/hdllib.cfg b/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/hdllib.cfg
index 8c7e30a9be..bd0c67d481 100644
--- a/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/hdllib.cfg
@@ -2,16 +2,19 @@ hdl_lib_name = ip_stratixiv_ddr3_uphy_16g_dual_rank_800
 hdl_library_clause_name = ip_stratixiv_ddr3_uphy_16g_dual_rank_800_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
+synth_files =
+    
+test_bench_files = 
+
+
+[modelsim_project_file]
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/compile_ip.tcl
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_16g_dual_rank_800/copy_hex_files.tcl
 
-synth_files =
-    
-test_bench_files = 
 
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_stratixiv_ddr3_uphy_16g_dual_rank_800.qip
diff --git a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/hdllib.cfg b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/hdllib.cfg
index 2710516aa8..1b11fbe2fa 100644
--- a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/hdllib.cfg
@@ -2,16 +2,19 @@ hdl_lib_name = ip_stratixiv_ddr3_uphy_4g_800_master
 hdl_library_clause_name = ip_stratixiv_ddr3_uphy_4g_800_master_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
+synth_files =
+    
+test_bench_files = 
+
+
+[modelsim_project_file]
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/compile_ip.tcl
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
 
-synth_files =
-    
-test_bench_files = 
 
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_stratixiv_ddr3_uphy_4g_800_master.qip
diff --git a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/hdllib.cfg b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/hdllib.cfg
index 32d7619a5e..4d64d1ae14 100644
--- a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/hdllib.cfg
@@ -2,15 +2,18 @@ hdl_lib_name = ip_stratixiv_ddr3_uphy_4g_800_slave
 hdl_library_clause_name = ip_stratixiv_ddr3_uphy_4g_800_slave_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_stratixiv_ddr3_uphy_4g_800_slave.qip
diff --git a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/hdllib.cfg b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/hdllib.cfg
index 4a77a9c54c..5b71690a3a 100644
--- a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/hdllib.cfg
@@ -2,16 +2,19 @@ hdl_lib_name = ip_stratixiv_ddr3_uphy_4g_single_rank_800_master
 hdl_library_clause_name = ip_stratixiv_ddr3_uphy_4g_single_rank_800_master_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
+synth_files =
+    
+test_bench_files = 
+
+
+[modelsim_project_file]
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/compile_ip.tcl
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_master/copy_hex_files.tcl
 
-synth_files =
-    
-test_bench_files = 
 
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_stratixiv_ddr3_uphy_4g_single_rank_800_master.qip
diff --git a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_slave/hdllib.cfg b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_slave/hdllib.cfg
index 74afd000ad..09191b848f 100644
--- a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_slave/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_slave/hdllib.cfg
@@ -2,16 +2,19 @@ hdl_lib_name = ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave
 hdl_library_clause_name = ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
+synth_files =
+    
+test_bench_files = 
+
+
+[modelsim_project_file]
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_slave/compile_ip.tcl
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_single_rank_800_slave/copy_hex_files.tcl
 
-synth_files =
-    
-test_bench_files = 
 
+[quartus_project_file]
 quartus_qip_files =
     generated/ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave.qip
diff --git a/libraries/technology/ip_stratixiv/fifo/hdllib.cfg b/libraries/technology/ip_stratixiv/fifo/hdllib.cfg
index e709650d93..67c34076a9 100644
--- a/libraries/technology/ip_stratixiv/fifo/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/fifo/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_stratixiv_fifo
 hdl_library_clause_name = ip_stratixiv_fifo_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -11,3 +10,10 @@ synth_files =
     ip_stratixiv_fifo_sc.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_stratixiv/flash/hdllib.cfg b/libraries/technology/ip_stratixiv/flash/hdllib.cfg
index cc6328f702..47a0434734 100644
--- a/libraries/technology/ip_stratixiv/flash/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/flash/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_stratixiv_flash
 hdl_library_clause_name = ip_stratixiv_flash_lib
 hdl_lib_uses_synth = technology numonyx_m25p128
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -11,5 +10,11 @@ synth_files =
     
 test_bench_files =
 
+
+[modelsim_project_file]
 modelsim_copy_files = 
     $RADIOHDL/libraries/external/numonyx_m25p128/NU_M25P128_V10/sim/memory_file .
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_stratixiv/mac_10g/hdllib.cfg b/libraries/technology/ip_stratixiv/mac_10g/hdllib.cfg
index a63f73b35d..c548304587 100644
--- a/libraries/technology/ip_stratixiv/mac_10g/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/mac_10g/hdllib.cfg
@@ -2,18 +2,21 @@ hdl_lib_name = ip_stratixiv_mac_10g
 hdl_library_clause_name = ip_stratixiv_mac_10g_lib
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/mac_10g/compile_ip.tcl
-
 synth_files =
     
 test_bench_files = 
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/mac_10g/compile_ip.tcl
+
+
+[quartus_project_file]
 quartus_copy_files =
     
 quartus_vhdl_files = 
diff --git a/libraries/technology/ip_stratixiv/mult/hdllib.cfg b/libraries/technology/ip_stratixiv/mult/hdllib.cfg
index f86aebcee4..09c1c605e9 100644
--- a/libraries/technology/ip_stratixiv/mult/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/mult/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_stratixiv_mult
 hdl_library_clause_name = ip_stratixiv_mult_lib
 hdl_lib_uses_synth = technology common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -14,3 +13,10 @@ synth_files =
     ip_stratixiv_mult_add4_rtl.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_0_sim/ip_stratixiv_phy_xaui_0.vhd b/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_0_sim/ip_stratixiv_phy_xaui_0.vhd
index 4e561332de..9655c20d44 100644
--- a/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_0_sim/ip_stratixiv_phy_xaui_0.vhd
+++ b/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_0_sim/ip_stratixiv_phy_xaui_0.vhd
@@ -1,6 +1,6 @@
 -- ip_stratixiv_phy_xaui_0.vhd
 
--- Generated using ACDS version 11.1sp2 259 at 2014.09.29.14:00:54
+-- Generated using ACDS version 11.1sp2 259 at 2016.03.29.08:44:51
 
 library IEEE;
 use IEEE.std_logic_1164.all;
diff --git a/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_0_sim/mentor/msim_setup.tcl b/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_0_sim/mentor/msim_setup.tcl
index e19fa6f7e7..6016835230 100644
--- a/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_0_sim/mentor/msim_setup.tcl
+++ b/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_0_sim/mentor/msim_setup.tcl
@@ -1,5 +1,5 @@
 
-# (C) 2001-2014 Altera Corporation. All rights reserved.
+# (C) 2001-2016 Altera Corporation. All rights reserved.
 # Your use of Altera Corporation's design tools, logic functions and 
 # other software and tools, and its AMPP partner logic functions, and 
 # any output files any of the foregoing (including device programming 
diff --git a/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_soft_sim/ip_stratixiv_phy_xaui_soft.vhd b/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_soft_sim/ip_stratixiv_phy_xaui_soft.vhd
index 2975d799b3..0a66ff3f1e 100644
--- a/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_soft_sim/ip_stratixiv_phy_xaui_soft.vhd
+++ b/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_soft_sim/ip_stratixiv_phy_xaui_soft.vhd
@@ -1,6 +1,6 @@
 -- ip_stratixiv_phy_xaui_soft.vhd
 
--- Generated using ACDS version 11.1sp2 259 at 2014.09.29.14:01:40
+-- Generated using ACDS version 11.1sp2 259 at 2016.03.29.08:45:31
 
 library IEEE;
 use IEEE.std_logic_1164.all;
diff --git a/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_soft_sim/mentor/msim_setup.tcl b/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_soft_sim/mentor/msim_setup.tcl
index 4c03220d0d..2d65d2485f 100644
--- a/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_soft_sim/mentor/msim_setup.tcl
+++ b/libraries/technology/ip_stratixiv/phy_xaui/generated/ip_stratixiv_phy_xaui_soft_sim/mentor/msim_setup.tcl
@@ -1,5 +1,5 @@
 
-# (C) 2001-2014 Altera Corporation. All rights reserved.
+# (C) 2001-2016 Altera Corporation. All rights reserved.
 # Your use of Altera Corporation's design tools, logic functions and 
 # other software and tools, and its AMPP partner logic functions, and 
 # any output files any of the foregoing (including device programming 
diff --git a/libraries/technology/ip_stratixiv/phy_xaui/hdllib.cfg b/libraries/technology/ip_stratixiv/phy_xaui/hdllib.cfg
index 1977238158..06cb12d45e 100644
--- a/libraries/technology/ip_stratixiv/phy_xaui/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/phy_xaui/hdllib.cfg
@@ -2,13 +2,8 @@ hdl_lib_name = ip_stratixiv_phy_xaui
 hdl_library_clause_name = ip_stratixiv_phy_xaui_lib
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
-modelsim_compile_ip_files =
-    $RADIOHDL/libraries/technology/ip_stratixiv/phy_xaui/compile_ip.tcl
-    $RADIOHDL/libraries/technology/ip_stratixiv/phy_xaui/compile_ip_soft.tcl
-
 synth_files =
     ip_stratixiv_phy_xaui_0.vhd
     ip_stratixiv_phy_xaui_1.vhd
@@ -19,10 +14,18 @@ test_bench_files =
     tb_ip_stratixiv_phy_xaui.vhd
     tb_ip_stratixiv_phy_xaui_ppm.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     wave_tb_ip_stratixiv_phy_xaui.do     .
     wave_tb_ip_stratixiv_phy_xaui_ppm.do .
     
+modelsim_compile_ip_files =
+    $RADIOHDL/libraries/technology/ip_stratixiv/phy_xaui/compile_ip.tcl
+    $RADIOHDL/libraries/technology/ip_stratixiv/phy_xaui/compile_ip_soft.tcl
+
+
+[quartus_project_file]
 quartus_copy_files =
     
 quartus_vhdl_files = 
diff --git a/libraries/technology/ip_stratixiv/pll/hdllib.cfg b/libraries/technology/ip_stratixiv/pll/hdllib.cfg
index 7fda9fcc02..a56d2d2e3b 100644
--- a/libraries/technology/ip_stratixiv/pll/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/pll/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_stratixiv_pll
 hdl_library_clause_name = ip_stratixiv_pll_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -10,3 +9,10 @@ synth_files =
     ip_stratixiv_pll_clk200_p6.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_stratixiv/pll_clk25/hdllib.cfg b/libraries/technology/ip_stratixiv/pll_clk25/hdllib.cfg
index c6c2741712..65a5c9fcf6 100644
--- a/libraries/technology/ip_stratixiv/pll_clk25/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/pll_clk25/hdllib.cfg
@@ -2,10 +2,16 @@ hdl_lib_name = ip_stratixiv_pll_clk25
 hdl_library_clause_name = ip_stratixiv_pll_clk25_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
     ip_stratixiv_pll_clk25.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_stratixiv/ram/hdllib.cfg b/libraries/technology/ip_stratixiv/ram/hdllib.cfg
index 0ef6a8342f..b33799a564 100644
--- a/libraries/technology/ip_stratixiv/ram/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ram/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_stratixiv_ram
 hdl_library_clause_name = ip_stratixiv_ram_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -13,3 +12,10 @@ synth_files =
     ip_stratixiv_rom_r.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_stratixiv/transceiver/hdllib.cfg b/libraries/technology/ip_stratixiv/transceiver/hdllib.cfg
index 26d0175c6e..ca35fe298b 100644
--- a/libraries/technology/ip_stratixiv/transceiver/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/transceiver/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_stratixiv_transceiver
 hdl_library_clause_name = ip_stratixiv_transceiver_lib
 hdl_lib_uses_synth = technology
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -29,3 +28,10 @@ synth_files =
     ip_stratixiv_hssi_rx_16b.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/ip_stratixiv/tse_sgmii_gx/hdllib.cfg b/libraries/technology/ip_stratixiv/tse_sgmii_gx/hdllib.cfg
index 155cf6e658..b5969afd7c 100644
--- a/libraries/technology/ip_stratixiv/tse_sgmii_gx/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/tse_sgmii_gx/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_stratixiv_tse_sgmii_gx
 hdl_library_clause_name = ip_stratixiv_tse_sgmii_gx_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -10,6 +9,11 @@ synth_files =
 test_bench_files = 
     ip_stratixiv_tse_sgmii_gx.vho
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 quartus_vhdl_files = 
     ip_stratixiv_tse_sgmii_gx.vhd
 
diff --git a/libraries/technology/ip_stratixiv/tse_sgmii_lvds/hdllib.cfg b/libraries/technology/ip_stratixiv/tse_sgmii_lvds/hdllib.cfg
index 84b356b2d3..7c4dbe9d0b 100644
--- a/libraries/technology/ip_stratixiv/tse_sgmii_lvds/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/tse_sgmii_lvds/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = ip_stratixiv_tse_sgmii_lvds
 hdl_library_clause_name = ip_stratixiv_tse_sgmii_lvds_lib
 hdl_lib_uses_synth = common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_stratixiv
 
 synth_files =
@@ -11,6 +10,11 @@ test_bench_files =
     ip_stratixiv_tse_sgmii_lvds.vho
     tb_ip_stratixiv_tse_sgmii_lvds.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
 quartus_vhdl_files = 
     ip_stratixiv_tse_sgmii_lvds.vhd
 
diff --git a/libraries/technology/ip_virtex4/hdllib.cfg b/libraries/technology/ip_virtex4/hdllib.cfg
index 9f0f32940f..63d38b131a 100644
--- a/libraries/technology/ip_virtex4/hdllib.cfg
+++ b/libraries/technology/ip_virtex4/hdllib.cfg
@@ -2,9 +2,11 @@ hdl_lib_name = ip_virtex4
 hdl_library_clause_name = ip_virtex4_lib
 hdl_lib_uses_synth = 
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = ip_virtex4
 
 synth_files =
         
 test_bench_files =
+
+
+[modelsim_project_file]
diff --git a/libraries/technology/mac_10g/hdllib.cfg b/libraries/technology/mac_10g/hdllib.cfg
index fee6509fd5..840ffab5b6 100644
--- a/libraries/technology/mac_10g/hdllib.cfg
+++ b/libraries/technology/mac_10g/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_mac_10g
 hdl_library_clause_name = tech_mac_10g_lib
 hdl_lib_uses_synth = technology ip_stratixiv_mac_10g ip_arria10_mac_10g ip_arria10_e3sge3_mac_10g common dp
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -24,7 +23,12 @@ test_bench_files =
     tb_tech_mac_10g.vhd
     tb_tb_tech_mac_10g.vhd
 
+
+[modelsim_project_file]
 modelsim_copy_files =
     wave_tb_tech_mac_10g_stratixiv.do .
     wave_tb_tech_mac_10g_arria10.do .
     
+
+[quartus_project_file]
+
diff --git a/libraries/technology/memory/hdllib.cfg b/libraries/technology/memory/hdllib.cfg
index 5795b280e8..e1cdd1cdc4 100644
--- a/libraries/technology/memory/hdllib.cfg
+++ b/libraries/technology/memory/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_memory
 hdl_library_clause_name = tech_memory_lib
 hdl_lib_uses_synth = technology ip_stratixiv_ram ip_arria10_ram ip_arria10_e3sge3_ram
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -14,3 +13,10 @@ synth_files =
     tech_memory_rom_r.vhd
 
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/mult/hdllib.cfg b/libraries/technology/mult/hdllib.cfg
index 6d8901db15..73bc46a0cc 100644
--- a/libraries/technology/mult/hdllib.cfg
+++ b/libraries/technology/mult/hdllib.cfg
@@ -8,7 +8,6 @@ hdl_lib_uses_synth = common
                      ip_arria10_complex_mult_rtl
                      ip_arria10_e3sge3_mult_add4_rtl
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -19,3 +18,10 @@ synth_files =
     tech_mult.vhd
 
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/pll/hdllib.cfg b/libraries/technology/pll/hdllib.cfg
index b22b74085d..25b1d8f50a 100644
--- a/libraries/technology/pll/hdllib.cfg
+++ b/libraries/technology/pll/hdllib.cfg
@@ -13,7 +13,6 @@ hdl_lib_uses_synth = technology
                      ip_arria10_e3sge3_pll_clk125
                      common
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -25,3 +24,10 @@ synth_files =
     tech_pll_clk125.vhd
     
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/transceiver/hdllib.cfg b/libraries/technology/transceiver/hdllib.cfg
index 55f3e3dea7..2b84eb47a4 100644
--- a/libraries/technology/transceiver/hdllib.cfg
+++ b/libraries/technology/transceiver/hdllib.cfg
@@ -2,7 +2,6 @@ hdl_lib_name = tech_transceiver
 hdl_library_clause_name = tech_transceiver_lib
 hdl_lib_uses_synth = technology ip_stratixiv_transceiver common dp
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -22,3 +21,10 @@ synth_files =
 
 test_bench_files =
     tb_sim_transceiver_serdes.vhd
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/tse/hdllib.cfg b/libraries/technology/tse/hdllib.cfg
index 6f10a65cf0..79c9dad152 100644
--- a/libraries/technology/tse/hdllib.cfg
+++ b/libraries/technology/tse/hdllib.cfg
@@ -1,12 +1,11 @@
 hdl_lib_name = tech_tse
 hdl_library_clause_name = tech_tse_lib
 hdl_lib_uses_synth = technology
-               ip_stratixiv_tse_sgmii_lvds ip_stratixiv_tse_sgmii_gx
-               ip_arria10_tse_sgmii_lvds   ip_arria10_tse_sgmii_gx
-               ip_arria10_e3sge3_tse_sgmii_lvds   ip_arria10_e3sge3_tse_sgmii_gx
-               common dp
+                     ip_stratixiv_tse_sgmii_lvds        ip_stratixiv_tse_sgmii_gx
+                     ip_arria10_tse_sgmii_lvds          ip_arria10_tse_sgmii_gx
+                     ip_arria10_e3sge3_tse_sgmii_lvds   ip_arria10_e3sge3_tse_sgmii_gx
+                     common dp
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -22,3 +21,9 @@ test_bench_files =
     tb_tech_tse_pkg.vhd
     tb_tech_tse.vhd
 
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
diff --git a/libraries/technology/xaui/hdllib.cfg b/libraries/technology/xaui/hdllib.cfg
index 2ae45b5fc6..4e4877861d 100644
--- a/libraries/technology/xaui/hdllib.cfg
+++ b/libraries/technology/xaui/hdllib.cfg
@@ -1,13 +1,7 @@
 hdl_lib_name = tech_xaui
 hdl_library_clause_name = tech_xaui_lib
-hdl_lib_uses_synth = technology
-               ip_stratixiv_transceiver
-               ip_stratixiv_phy_xaui
-               tech_transceiver
-               common
-               dp
+hdl_lib_uses_synth = technology ip_stratixiv_transceiver ip_stratixiv_phy_xaui tech_transceiver common dp
 hdl_lib_uses_sim = 
-
 hdl_lib_technology = 
 
 synth_files =
@@ -18,3 +12,10 @@ synth_files =
     tech_xaui.vhd
 
 test_bench_files =
+
+
+[modelsim_project_file]
+
+
+[quartus_project_file]
+
-- 
GitLab