diff --git a/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg b/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg
index bf0806a30a8780ed93b31427d1f5240542481f40..aca6130321cceff79074351a827198d6b787fdb5 100644
--- a/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg
+++ b/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_top_level_entity =
 
 synth_files =   
diff --git a/libraries/dsp/bf/hdllib.cfg b/libraries/dsp/bf/hdllib.cfg
index dd53999b7159901a8f49a5cc17124986cef773b9..29c634ce6f868621837a19d40f02a81f621c1f7b 100644
--- a/libraries/dsp/bf/hdllib.cfg
+++ b/libraries/dsp/bf/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     src/vhdl/bf_pkg.vhd 
     src/vhdl/bf_unit.vhd 
diff --git a/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg b/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
index 235a94993d21105ea64963fa4ba9328fcffc548d..2ad5d02508a211388b24948667b25a471ed3593c 100644
--- a/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
+++ b/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_top_level_entity =
 
 quartus_copy_files =
diff --git a/libraries/dsp/correlator/hdllib.cfg b/libraries/dsp/correlator/hdllib.cfg
index 7404455df5d5209d2d82176a3a07b1204df9437a..fc1fcbc8e95135debfa15104488db20deb2e09a6 100644
--- a/libraries/dsp/correlator/hdllib.cfg
+++ b/libraries/dsp/correlator/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $SVN/RadioHDL/trunk/libraries/dsp/correlator/src/vhdl/corr_carousel.vhd
     $SVN/RadioHDL/trunk/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd
diff --git a/libraries/dsp/fft/hdllib.cfg b/libraries/dsp/fft/hdllib.cfg
index e0baabae1335802967bda4f6c24425e9b9262131..024002761d27f892bfd2d9b94160312173b067f2 100644
--- a/libraries/dsp/fft/hdllib.cfg
+++ b/libraries/dsp/fft/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/dsp/fft/src/vhdl/fft_pkg.vhd 
     $UNB/Firmware/dsp/fft/src/vhdl/fft_sepa.vhd 
diff --git a/libraries/dsp/filter/hdllib.cfg b/libraries/dsp/filter/hdllib.cfg
index 0c4b4c52ab52a3e20ed8eaaa2df9aa42b8647401..1d45a369213a5023c5ad24f202728f847f117fac 100644
--- a/libraries/dsp/filter/hdllib.cfg
+++ b/libraries/dsp/filter/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/dsp/filter/src/vhdl/fil_pkg.vhd 
     $UNB/Firmware/dsp/filter/src/vhdl/fil_ppf_ctrl.vhd 
diff --git a/libraries/dsp/rTwoSDF/hdllib.cfg b/libraries/dsp/rTwoSDF/hdllib.cfg
index 43ab5d22febbe6aa928b2c8f89ebf4384ddb9dc2..62c9eec519d942f687d7454e0b26b3651566f9c6 100644
--- a/libraries/dsp/rTwoSDF/hdllib.cfg
+++ b/libraries/dsp/rTwoSDF/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files = 
     src/vhdl/twiddlesPkg.vhd 
     src/vhdl/rTwoSDFPkg.vhd 
diff --git a/libraries/dsp/st/hdllib.cfg b/libraries/dsp/st/hdllib.cfg
index 7bdbf21232403812da738a5a193bd8f6144642a9..a4221e42cd632aca0f723be5edfc24d5a485212f 100644
--- a/libraries/dsp/st/hdllib.cfg
+++ b/libraries/dsp/st/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files = 
     $UNB/Firmware/modules/Lofar/st/src/vhdl/st_acc.vhd 
     $UNB/Firmware/modules/Lofar/st/src/vhdl/st_ctrl.vhd 
diff --git a/libraries/dsp/wpfb/hdllib.cfg b/libraries/dsp/wpfb/hdllib.cfg
index e657495e72ed8a3f6efbeeae88c712364517cd6f..71911aed254681662b23941ecab42afa69e6e0b7 100644
--- a/libraries/dsp/wpfb/hdllib.cfg
+++ b/libraries/dsp/wpfb/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files = 
     src/vhdl/wpfb_pkg.vhd 
     src/vhdl/wpfb_unit.vhd
@@ -17,4 +14,5 @@ test_bench_files =
     tb/vhdl/tb_mmf_wpfb_unit.vhd 
 
 modelsim_copy_files =
-    $UNB/Firmware/dsp/filter/build/data data
+    modelsim/wave_tb_mmf_wpfb_unit.do     .
+    $UNB/Firmware/dsp/filter/build/data   data