diff --git a/Makefile b/Makefile
index 4138ee665..2949988f2 100644
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,7 @@ sequences =  $(wildcard tb/sequences/*/*.sv)
 test_pkg =tb/test/mem_arbiter/mem_arbiter_sequence_pkg.sv  $(wildcard tb/test/*/*.sv)
 
 # this list contains the standalone components
-src = alu.sv if_stage.sv compressed_decoder.sv	mem_arbiter.sv	decoder.sv			  \
-	  fetch_fifo.sv commit_stage.sv prefetch_buffer.sv regfile.sv	            	  \
-	  ptw.sv tlb.sv store_queue.sv mmu.sv lsu.sv fifo.sv ex_stage.sv   		    	  \
-	  scoreboard.sv issue_read_operands.sv  id_stage.sv util/cluster_clock_gating.sv  \
-	  ariane.sv
+src = $(wildcard src/util/*.sv) $(wildcard src/*.sv)
 
 tbs =  tb/alu_tb.sv tb/mem_arbiter_tb.sv tb/core_tb.sv tb/scoreboard_tb.sv tb/store_queue_tb.sv tb/fifo_tb.sv
 
@@ -78,7 +74,7 @@ lint:
 	${list_incdir}
 
 clean:
-	rm -rf work/
+	rm -rf work/ *.ucdb
 
 .PHONY:
 	build lint
\ No newline at end of file
diff --git a/alu.sv b/src/alu.sv
similarity index 100%
rename from alu.sv
rename to src/alu.sv
diff --git a/ariane.sv b/src/ariane.sv
similarity index 100%
rename from ariane.sv
rename to src/ariane.sv
diff --git a/bht.sv b/src/bht.sv
similarity index 100%
rename from bht.sv
rename to src/bht.sv
diff --git a/commit_stage.sv b/src/commit_stage.sv
similarity index 100%
rename from commit_stage.sv
rename to src/commit_stage.sv
diff --git a/compressed_decoder.sv b/src/compressed_decoder.sv
similarity index 100%
rename from compressed_decoder.sv
rename to src/compressed_decoder.sv
diff --git a/csr_regfile.sv b/src/csr_regfile.sv
similarity index 100%
rename from csr_regfile.sv
rename to src/csr_regfile.sv
diff --git a/decoder.sv b/src/decoder.sv
similarity index 100%
rename from decoder.sv
rename to src/decoder.sv
diff --git a/ex_stage.sv b/src/ex_stage.sv
similarity index 100%
rename from ex_stage.sv
rename to src/ex_stage.sv
diff --git a/fetch_fifo.sv b/src/fetch_fifo.sv
similarity index 100%
rename from fetch_fifo.sv
rename to src/fetch_fifo.sv
diff --git a/fifo.sv b/src/fifo.sv
similarity index 100%
rename from fifo.sv
rename to src/fifo.sv
diff --git a/id_stage.sv b/src/id_stage.sv
similarity index 100%
rename from id_stage.sv
rename to src/id_stage.sv
diff --git a/if_stage.sv b/src/if_stage.sv
similarity index 100%
rename from if_stage.sv
rename to src/if_stage.sv
diff --git a/issue_read_operands.sv b/src/issue_read_operands.sv
similarity index 100%
rename from issue_read_operands.sv
rename to src/issue_read_operands.sv
diff --git a/lsu.sv b/src/lsu.sv
similarity index 100%
rename from lsu.sv
rename to src/lsu.sv
diff --git a/mem_arbiter.sv b/src/mem_arbiter.sv
similarity index 100%
rename from mem_arbiter.sv
rename to src/mem_arbiter.sv
diff --git a/mmu.sv b/src/mmu.sv
similarity index 100%
rename from mmu.sv
rename to src/mmu.sv
diff --git a/mult.sv b/src/mult.sv
similarity index 100%
rename from mult.sv
rename to src/mult.sv
diff --git a/pcgen.sv b/src/pcgen.sv
similarity index 100%
rename from pcgen.sv
rename to src/pcgen.sv
diff --git a/prefetch_buffer.sv b/src/prefetch_buffer.sv
similarity index 100%
rename from prefetch_buffer.sv
rename to src/prefetch_buffer.sv
diff --git a/ptw.sv b/src/ptw.sv
similarity index 100%
rename from ptw.sv
rename to src/ptw.sv
diff --git a/regfile.sv b/src/regfile.sv
similarity index 100%
rename from regfile.sv
rename to src/regfile.sv
diff --git a/regfile_ff.sv b/src/regfile_ff.sv
similarity index 100%
rename from regfile_ff.sv
rename to src/regfile_ff.sv
diff --git a/scoreboard.sv b/src/scoreboard.sv
similarity index 100%
rename from scoreboard.sv
rename to src/scoreboard.sv
diff --git a/store_queue.sv b/src/store_queue.sv
similarity index 100%
rename from store_queue.sv
rename to src/store_queue.sv
diff --git a/tlb.sv b/src/tlb.sv
similarity index 100%
rename from tlb.sv
rename to src/tlb.sv
diff --git a/util/cluster_clock_gating.sv b/src/util/cluster_clock_gating.sv
similarity index 100%
rename from util/cluster_clock_gating.sv
rename to src/util/cluster_clock_gating.sv