diff --git a/files.qip b/files.qip
index 1887661..4801a20 100644
--- a/files.qip
+++ b/files.qip
@@ -1,24 +1,15 @@
 set_global_assignment -name QIP_FILE rtl/amber/amber.qip
+set_global_assignment -name QIP_FILE rtl/vidc/vidc.qip
+set_global_assignment -name QIP_FILE rtl/fdc/fdc.qip
+set_global_assignment -name QIP_FILE rtl/rtc/rtc.qip
 set_global_assignment -name VERILOG_FILE rtl/sdram.v
-set_global_assignment -name VERILOG_FILE rtl/vidc_audio.v
-set_global_assignment -name VERILOG_FILE rtl/vidc_dmachannel.v
-set_global_assignment -name VERILOG_FILE rtl/vidc_fifo.v
-set_global_assignment -name VERILOG_FILE rtl/vidc_timing.v
-set_global_assignment -name VERILOG_FILE rtl/vidc.v
-set_global_assignment -name VERILOG_FILE rtl/fdc1772.v
-set_global_assignment -name VERILOG_FILE rtl/floppy.v
+set_global_assignment -name VHDL_FILE rtl/bram.vhd
 set_global_assignment -name SYSTEMVERILOG_FILE rtl/ide.sv
 set_global_assignment -name VERILOG_FILE rtl/latches.v
-set_global_assignment -name VERILOG_FILE rtl/serialInterface.v
-set_global_assignment -name VERILOG_FILE rtl/registerInterface.v
-set_global_assignment -name VERILOG_FILE rtl/i2cSlave.v
 set_global_assignment -name VERILOG_FILE rtl/ioc_irq.v
 set_global_assignment -name VERILOG_FILE rtl/ioc.v
 set_global_assignment -name VERILOG_FILE rtl/memc_translator.v
 set_global_assignment -name VERILOG_FILE rtl/memc.v
-set_global_assignment -name VERILOG_FILE rtl/sram_line_en.v
-set_global_assignment -name VERILOG_FILE rtl/sram_byte_en.v
-set_global_assignment -name VHDL_FILE rtl/bram.vhd
 set_global_assignment -name VERILOG_FILE rtl/archimedes_top.v
 set_global_assignment -name VERILOG_FILE rtl/hps_ext.v
 set_global_assignment -name SDC_FILE Archie.sdc
diff --git a/rtl/amber/amber.qip b/rtl/amber/amber.qip
index 239d6fd..a9e4450 100644
--- a/rtl/amber/amber.qip
+++ b/rtl/amber/amber.qip
@@ -1,3 +1,4 @@
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_config_defines.v ]
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_barrel_shift.v ]
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_wishbone.v ]
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_register_bank.v ]
@@ -5,8 +6,9 @@ set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_mul
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_fetch.v ]
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_execute.v ]
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_decode.v ]
-set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_core.v ]
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_coprocessor.v ]
-set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_config_defines.v ]
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_cache.v ]
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_alu.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) sram_byte_en.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) sram_line_en.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) a23_core.v ]
diff --git a/rtl/sram_byte_en.v b/rtl/amber/sram_byte_en.v
similarity index 100%
rename from rtl/sram_byte_en.v
rename to rtl/amber/sram_byte_en.v
diff --git a/rtl/sram_line_en.v b/rtl/amber/sram_line_en.v
similarity index 100%
rename from rtl/sram_line_en.v
rename to rtl/amber/sram_line_en.v
diff --git a/rtl/audio.v b/rtl/audio.v
deleted file mode 100644
index f3c5d3b..0000000
--- a/rtl/audio.v
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// audio.v
-// 
-// Archie audio subsystem implementation for the MiST board
-// http://code.google.com/p/mist-board/
-// 
-// Copyright (c) 2015 Stephen Leary <stephen@vavi.co.uk> 
-// 
-// This source file is free software: you can redistribute it and/or modify 
-// it under the terms of the GNU General Public License as published 
-// by the Free Software Foundation, either version 3 of the License, or 
-// (at your option) any later version. 
-// 
-// This source file is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License 
-// along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-
-module audio(
-	input  	rst,
-	input 	clk,      // 32 MHz
-
-	input	[15:0] audio_data_r,
-	input	[15:0] audio_data_l,
-	
-	output 	audio_r,
-	output 	audio_l
-);
-
-sigma_delta_dac sigma_delta_dac_l (
-	.DACout 		(audio_l),
-	.DACin		(audio_data_l[15:0]),
-	.CLK 			(clk),
-	.RESET 		(rst)
-);
-
-sigma_delta_dac sigma_delta_dac_r (
-	.DACout     (audio_r),
-	.DACin    	(audio_data_r[15:0]),
-	.CLK      	(clk),
-	.RESET    	(rst)
-);
-
-endmodule
\ No newline at end of file
diff --git a/rtl/fdc/fdc.qip b/rtl/fdc/fdc.qip
new file mode 100644
index 0000000..c5a3500
--- /dev/null
+++ b/rtl/fdc/fdc.qip
@@ -0,0 +1,2 @@
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) floppy.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) fdc1772.v ]
diff --git a/rtl/fdc1772.v b/rtl/fdc/fdc1772.v
similarity index 100%
rename from rtl/fdc1772.v
rename to rtl/fdc/fdc1772.v
diff --git a/rtl/floppy.v b/rtl/fdc/floppy.v
similarity index 100%
rename from rtl/floppy.v
rename to rtl/fdc/floppy.v
diff --git a/rtl/ide.sv b/rtl/ide.sv
index 82dc66b..9d070aa 100644
--- a/rtl/ide.sv
+++ b/rtl/ide.sv
@@ -17,6 +17,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+// altera message_off 10030
 module ide (
 	input             clk, // system clock.
 	input             reset,
diff --git a/rtl/cmos.mif b/rtl/rtc/cmos.mif
similarity index 100%
rename from rtl/cmos.mif
rename to rtl/rtc/cmos.mif
diff --git a/rtl/i2cSlave.v b/rtl/rtc/i2cSlave.v
similarity index 100%
rename from rtl/i2cSlave.v
rename to rtl/rtc/i2cSlave.v
diff --git a/rtl/i2cSlave_define.v b/rtl/rtc/i2cSlave_define.v
similarity index 100%
rename from rtl/i2cSlave_define.v
rename to rtl/rtc/i2cSlave_define.v
diff --git a/rtl/registerInterface.v b/rtl/rtc/registerInterface.v
similarity index 98%
rename from rtl/registerInterface.v
rename to rtl/rtc/registerInterface.v
index ff550e3..c4cce34 100644
--- a/rtl/registerInterface.v
+++ b/rtl/rtc/registerInterface.v
@@ -56,7 +56,7 @@ module registerInterface
 );
 
 wire [7:0] mem_out;
-spram #(8,8,"rtl/cmos.mif","CMOS") memory
+spram #(8,8,"rtl/rtc/cmos.mif","CMOS") memory
 (
 	.clock(clk),
 	.address(addr),
diff --git a/rtl/rtc/rtc.qip b/rtl/rtc/rtc.qip
new file mode 100644
index 0000000..383701c
--- /dev/null
+++ b/rtl/rtc/rtc.qip
@@ -0,0 +1,4 @@
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) i2cSlave.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) i2cSlave_define.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) serialInterface.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) registerInterface.v ]
diff --git a/rtl/serialInterface.v b/rtl/rtc/serialInterface.v
similarity index 99%
rename from rtl/serialInterface.v
rename to rtl/rtc/serialInterface.v
index 5a237cc..a39efcb 100644
--- a/rtl/serialInterface.v
+++ b/rtl/rtc/serialInterface.v
@@ -52,7 +52,6 @@
 ////                                                              ////
 //////////////////////////////////////////////////////////////////////
 //
-`include "timescale.v"
 `include "i2cSlave_define.v"
 
 module serialInterface (clearStartStopDet, clk, dataIn, dataOut, regAddr, rst, scl, sdaIn, sdaOut, startStopDetState, writeEn);
diff --git a/rtl/timescale.v b/rtl/timescale.v
deleted file mode 100644
index edd8d7a..0000000
--- a/rtl/timescale.v
+++ /dev/null
@@ -1,5 +0,0 @@
-//////////////////////////////////////////////////////////////////////
-// timescale.v                                              
-//////////////////////////////////////////////////////////////////////
-`timescale 1ns / 1ps
-
diff --git a/rtl/vidc/vidc.qip b/rtl/vidc/vidc.qip
new file mode 100644
index 0000000..669c685
--- /dev/null
+++ b/rtl/vidc/vidc.qip
@@ -0,0 +1,5 @@
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) vidc_dmachannel.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) vidc_fifo.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) vidc_timing.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) vidc_audio.v ]
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) vidc.v ]
diff --git a/rtl/vidc.v b/rtl/vidc/vidc.v
similarity index 100%
rename from rtl/vidc.v
rename to rtl/vidc/vidc.v
diff --git a/rtl/vidc_audio.v b/rtl/vidc/vidc_audio.v
similarity index 100%
rename from rtl/vidc_audio.v
rename to rtl/vidc/vidc_audio.v
diff --git a/rtl/vidc_dmachannel.v b/rtl/vidc/vidc_dmachannel.v
similarity index 100%
rename from rtl/vidc_dmachannel.v
rename to rtl/vidc/vidc_dmachannel.v
diff --git a/rtl/vidc_fifo.v b/rtl/vidc/vidc_fifo.v
similarity index 100%
rename from rtl/vidc_fifo.v
rename to rtl/vidc/vidc_fifo.v
diff --git a/rtl/vidc_timing.v b/rtl/vidc/vidc_timing.v
similarity index 100%
rename from rtl/vidc_timing.v
rename to rtl/vidc/vidc_timing.v