Index: /sandbox/MultiChannelUSB/Paella.qsf
===================================================================
--- /sandbox/MultiChannelUSB/Paella.qsf	(revision 107)
+++ /sandbox/MultiChannelUSB/Paella.qsf	(revision 108)
@@ -57,5 +57,4 @@
 set_global_assignment -name VERILOG_FILE sys_pll.v
 set_global_assignment -name VERILOG_FILE control.v
-set_global_assignment -name VERILOG_FILE uwt_bior31.v
 set_global_assignment -name VERILOG_FILE analyser.v
 set_global_assignment -name VERILOG_FILE amplitude.v
@@ -74,5 +73,4 @@
 set_global_assignment -name USE_TIMEQUEST_TIMING_ANALYZER OFF
 set_global_assignment -name ENABLE_CLOCK_LATENCY ON
-set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
 set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top
 set_global_assignment -name PARTITION_COLOR 16764057 -section_id Top
@@ -329,2 +327,4 @@
 set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to RAM_DQB[6]
 set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to RAM_DQB[7]
+
+set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
Index: /sandbox/MultiChannelUSB/Paella.v
===================================================================
--- /sandbox/MultiChannelUSB/Paella.v	(revision 107)
+++ /sandbox/MultiChannelUSB/Paella.v	(revision 108)
@@ -282,5 +282,5 @@
 		.bus_busy(bus_busy[1]));
 
-	cic1 #(.size(3), .width(12)) cic3_unit (
+	cic_filter #(.size(3), .width(12)) cic_filter_unit (
 		.clock(sys_clock),
 		.frame(sys_frame),
@@ -297,30 +297,4 @@
 			assign sys_data[j] = (cfg_bits[1][4*j]) ? (adc_data[j] ^ 12'hfff) : (adc_data[j]);
 
-			uwt_bior31 #(.L(1)) uwt_1_unit (
-				.clock(sys_clock),
-				.frame(sys_frame),
-				.reset(1'b0),
-				.x({20'h00000, sys_data[j]}),
-				.d(uwt_d1[j]),
-				.a(uwt_a1[j]),
-				.flag(uwt_flag1[j]));
-		
-			uwt_bior31 #(.L(2)) uwt_2_unit (
-				.clock(sys_clock),
-				.frame(sys_frame),
-				.reset(1'b0),
-				.x(uwt_a1[j]),
-				.d(uwt_d2[j]),
-				.a(uwt_a2[j]),
-				.flag(uwt_flag2[j]));
-		
-			uwt_bior31 #(.L(3)) uwt_3_unit (
-				.clock(sys_clock),
-				.frame(sys_frame),
-				.reset(1'b0),
-				.x(uwt_a2[j]),
-				.d(uwt_d3[j]),
-				.a(uwt_a3[j]),
-				.flag(uwt_flag3[j]));
 	
 			analyser analyser_unit (
Index: /sandbox/MultiChannelUSB/cic_filter.v
===================================================================
--- /sandbox/MultiChannelUSB/cic_filter.v	(revision 107)
+++ /sandbox/MultiChannelUSB/cic_filter.v	(revision 108)
@@ -1,3 +1,3 @@
-module cic1
+module cic_filter
 	#(
 		parameter	size	=	3, // number of channels
Index: /sandbox/MultiChannelUSB/test.v
===================================================================
--- /sandbox/MultiChannelUSB/test.v	(revision 107)
+++ /sandbox/MultiChannelUSB/test.v	(revision 108)
@@ -24,5 +24,5 @@
 		.clock_enable_input_a("BYPASS"),
 		.clock_enable_output_a("BYPASS"),
-		.init_file("test_mwd.mif"),
+		.init_file("test.mif"),
 		.intended_device_family("Cyclone III"),
 		.lpm_hint("ENABLE_RUNTIME_MOD=NO"),