diff --git a/rtl/mini/picorv32.v b/rtl/mini/core/picorv32.v
similarity index 100%
rename from rtl/mini/picorv32.v
rename to rtl/mini/core/picorv32.v
diff --git a/rtl/mini/filelist/core.fl b/rtl/mini/filelist/core.fl
new file mode 100644
index 00000000..5fafb4e0
--- /dev/null
+++ b/rtl/mini/filelist/core.fl
@@ -0,0 +1 @@
+../core/picorv32.v
\ No newline at end of file
diff --git a/rtl/mini/filelist/ip.fl b/rtl/mini/filelist/ip.fl
index 7370d63e..b89f60e3 100644
--- a/rtl/mini/filelist/ip.fl
+++ b/rtl/mini/filelist/ip.fl
@@ -1,8 +1,7 @@
 ../ip/onchip_ram.v
 ../ip/simpleuart.v
 ../ip/counter_timer.v
-../ip/rs232.v
-../ip/rcu.v
+
 ../ip/cust/register.v
 ../ip/cust/lfsr.v
 ../ip/cust/fifo.v
@@ -10,6 +9,7 @@
 ../ip/cust/clk_int_div.v
 ../ip/cust/edge_det.v
 ../ip/cust/rst_sync.v
+
 ../ip/cust/archinfo.v
 ../ip/cust/rng.v
 ../ip/cust/uart.v
@@ -29,7 +29,9 @@
 ../ip/cust/apb_spi_master/spi_master_rx.v
 ../ip/cust/apb_spi_master/spi_master_tx.v
 ../ip/cust/apb_spi_master/apb_spi_master.v
+
 ../ip/mem2apb.v
 ../ip/natv_ip_wrapper.v
 ../ip/apb_ip_wrapper.v
-../ip/bus.v
\ No newline at end of file
+../ip/bus.v
+../ip/rcu.v
\ No newline at end of file
diff --git a/rtl/mini/filelist/soc.fl b/rtl/mini/filelist/soc.fl
deleted file mode 100644
index 233b0ca9..00000000
--- a/rtl/mini/filelist/soc.fl
+++ /dev/null
@@ -1,3 +0,0 @@
-../retrosoc_asic.v
-../retrosoc.v
-../picorv32.v
\ No newline at end of file
diff --git a/rtl/mini/filelist/tb.fl b/rtl/mini/filelist/tb.fl
index b9cfabb2..24a63581 100644
--- a/rtl/mini/filelist/tb.fl
+++ b/rtl/mini/filelist/tb.fl
@@ -1,4 +1,5 @@
 ../ip/cust/spfs_model/N25Qxxx.v
 ../ip/kdb_model.v
 ../ip/psram_model.v
-../retrosoc_tb.v
\ No newline at end of file
+../ip/rs232.v
+../tb/retrosoc_tb.v
\ No newline at end of file
diff --git a/rtl/mini/filelist/top.fl b/rtl/mini/filelist/top.fl
new file mode 100644
index 00000000..10523e3c
--- /dev/null
+++ b/rtl/mini/filelist/top.fl
@@ -0,0 +1,2 @@
+../top/retrosoc_asic.v
+../top/retrosoc.v
\ No newline at end of file
diff --git a/rtl/mini/retrosoc_tb.v b/rtl/mini/tb/retrosoc_tb.v
similarity index 100%
rename from rtl/mini/retrosoc_tb.v
rename to rtl/mini/tb/retrosoc_tb.v
diff --git a/rtl/mini/retrosoc_tb_tiny.v b/rtl/mini/tb/retrosoc_tb_tiny.v
similarity index 100%
rename from rtl/mini/retrosoc_tb_tiny.v
rename to rtl/mini/tb/retrosoc_tb_tiny.v
diff --git a/rtl/mini/retrosoc.v b/rtl/mini/top/retrosoc.v
similarity index 99%
rename from rtl/mini/retrosoc.v
rename to rtl/mini/top/retrosoc.v
index bf9810fe..1ee950a7 100644
--- a/rtl/mini/retrosoc.v
+++ b/rtl/mini/top/retrosoc.v
@@ -34,7 +34,6 @@ module retrosoc #(
 ) (
     input         clk_i,
     input         rst_n_i,
-    //sram if including clk_i and rst_n_i above,
     output [14:0] ram_addr_o,
     output [31:0] ram_wdata_o,
     output [ 3:0] ram_wstrb_o,
diff --git a/rtl/mini/retrosoc_asic.v b/rtl/mini/top/retrosoc_asic.v
similarity index 100%
rename from rtl/mini/retrosoc_asic.v
rename to rtl/mini/top/retrosoc_asic.v
diff --git a/rtl/mini/retrosoc_asic_tiny.v b/rtl/mini/top/retrosoc_asic_tiny.v
similarity index 100%
rename from rtl/mini/retrosoc_asic_tiny.v
rename to rtl/mini/top/retrosoc_asic_tiny.v
diff --git a/rtl/mini/retrosoc_tiny.v b/rtl/mini/top/retrosoc_tiny.v
similarity index 100%
rename from rtl/mini/retrosoc_tiny.v
rename to rtl/mini/top/retrosoc_tiny.v
diff --git a/rtl/mini/vcs.mk b/rtl/mini/vcs.mk
index ab9f9f55..9ee3e7a1 100644
--- a/rtl/mini/vcs.mk
+++ b/rtl/mini/vcs.mk
@@ -14,7 +14,8 @@ RTL_INC  := +incdir+../ip \
             +incdir+../ip/cust/spfs_model
 
 
-RTL_FLIST := -f ../filelist/soc.fl \
+RTL_FLIST := -f ../filelist/top.fl \
+             -f ../filelist/core.fl \
              -f ../filelist/ip.fl \
              -f ../filelist/tech.fl \
              -f ../filelist/pdk_s110.fl