diff --git a/projects/mips_sys/sim/tb_mips_sys.fdo b/projects/mips_sys/sim/tb_mips_sys.fdo
index 934bff7..e4c7d53 100644
--- a/projects/mips_sys/sim/tb_mips_sys.fdo
+++ b/projects/mips_sys/sim/tb_mips_sys.fdo
@@ -39,8 +39,8 @@ vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_bui.vhd"
 vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_top.vhd"
 vcom -explicit  -93 "../src/ram_sim.vhd"
 vcom -explicit  -93 "../src/bootloader.ROM.vhd"
-vcom -explicit  -93 "../src/ram_wb.vhd"
-vcom -explicit  -93 "../src/rom_wb.vhd"
+vcom -explicit  -93 "../../../lib/misc/ram_wb.vhd"
+vcom -explicit  -93 "../../../lib/misc/rom_wb.vhd"
 
 # VGA
 vcom -explicit  -93 "../../../lib/VGA_ctrl/src/fonts/char_rom_c64.vhd"
@@ -63,7 +63,7 @@ vcom -explicit  -93 "../../../lib/uart/uart_tx.vhd"
 vcom -explicit  -93 "../../../lib/uart/uart_wb.vhd"
 
 # GPIO
-vcom -explicit  -93 "../src/gpio_wb.vhd"
+vcom -explicit  -93 "../../../lib/misc/gpio_wb.vhd"
 
 # LCD
 vcom -explicit  -93 "../../../lib/misc/lcd_port.vhd"
@@ -71,11 +71,12 @@ vcom -explicit  -93 "../../../lib/misc/lcd_port.vhd"
 # Flash and USB
 vcom -explicit  -93 "../src/sys_types.vhd"
 vcom -explicit  -93 "../../../lib/misc/async_port_wb.vhd"
+vcom -explicit  -93 "../../../lib/misc/flash_port_wb.vhd"
 
 # Sync SRAM
-vcom -explicit  -93 "../src/package_utility.vhd"
-vcom -explicit  -93 "../src/CY7C1354B.vhd"
-vcom -explicit  -93 "../src/ssram_frontend_wb.vhd"
+vcom -explicit  -93 "../../../lib/SSRAM/src/package_utility.vhd"
+vcom -explicit  -93 "../../../lib/SSRAM/src/CY7C1354B.vhd"
+vcom -explicit  -93 "../../../lib/SSRAM/src/ssram_port_wb.vhd"
 
 # SDRAM
 vcom -explicit  -93 "../../../lib/misc/clockgen_virtex4.vhd"
diff --git a/projects/mips_sys/sim/tb_mips_sys.wdo b/projects/mips_sys/sim/tb_mips_sys.wdo
index dbea432..e1f1514 100644
--- a/projects/mips_sys/sim/tb_mips_sys.wdo
+++ b/projects/mips_sys/sim/tb_mips_sys.wdo
@@ -53,12 +53,13 @@ add wave -noupdate -format Logic /tb_mips_sys/uut/ack_i
 add wave -noupdate -format Logic /tb_mips_sys/uut/srdy_i
 add wave -noupdate -format Logic /tb_mips_sys/uut/mrdy_o
 add wave -noupdate -format Literal /tb_mips_sys/uut/mem_area
+add wave -noupdate -format Logic /tb_mips_sys/uut/clk
 add wave -noupdate -divider Arbiter
 add wave -noupdate -format Literal /tb_mips_sys/uut/arb_idx
 add wave -noupdate -format Literal /tb_mips_sys/uut/arb_req
 add wave -noupdate -format Literal /tb_mips_sys/uut/arb_gnt
 add wave -noupdate -divider {CPU Master}
-add wave -noupdate -format Logic /tb_mips_sys/uut/ack_i_cpu
+add wave -noupdate -format Logic /tb_mips_sys/uut/clk
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/mdat_i
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/mdat_o_cpu
 add wave -noupdate -format Logic /tb_mips_sys/uut/mrdy_o_cpu
@@ -68,8 +69,10 @@ add wave -noupdate -format Logic /tb_mips_sys/uut/we_o_cpu
 add wave -noupdate -format Logic /tb_mips_sys/uut/cyc_o_cpu
 add wave -noupdate -format Logic /tb_mips_sys/uut/stb_o_cpu
 add wave -noupdate -format Logic /tb_mips_sys/uut/srdy_i_cpu
+add wave -noupdate -format Logic /tb_mips_sys/uut/ack_i_cpu
+add wave -noupdate -format Literal /tb_mips_sys/uut/inst_mips_top/inst_bui/s
 add wave -noupdate -divider {VGA Master}
-add wave -noupdate -format Logic /tb_mips_sys/uut/ack_i_vga
+add wave -noupdate -format Logic /tb_mips_sys/uut/clk
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/mdat_i
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/mdat_o_vga
 add wave -noupdate -format Logic /tb_mips_sys/uut/mrdy_o_vga
@@ -79,6 +82,7 @@ add wave -noupdate -format Logic /tb_mips_sys/uut/we_o_vga
 add wave -noupdate -format Logic /tb_mips_sys/uut/cyc_o_vga
 add wave -noupdate -format Logic /tb_mips_sys/uut/stb_o_vga
 add wave -noupdate -format Logic /tb_mips_sys/uut/srdy_i_vga
+add wave -noupdate -format Logic /tb_mips_sys/uut/ack_i_vga
 add wave -noupdate -format Logic /tb_mips_sys/uut/inst_vga_frontend/fifo_full
 add wave -noupdate -format Logic /tb_mips_sys/uut/inst_vga_frontend/fifo_empty
 add wave -noupdate -format Logic /tb_mips_sys/uut/inst_vga_frontend/fifo_almost_empty
@@ -157,6 +161,12 @@ add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/sys_flash_ssr
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/sys_flash_ssram_a
 add wave -noupdate -format Logic /tb_mips_sys/sys_flash_ce
 add wave -noupdate -format Logic /tb_mips_sys/sys_flash_rstn
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/flash_a
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/flash_do
+add wave -noupdate -format Logic /tb_mips_sys/uut/flash_oe_n
+add wave -noupdate -format Logic /tb_mips_sys/uut/flash_we_n
+add wave -noupdate -format Logic /tb_mips_sys/uut/flash_d_drv
+add wave -noupdate -format Logic /tb_mips_sys/uut/flash_bsy
 add wave -noupdate -divider {Sync SRAM}
 add wave -noupdate -format Logic /tb_mips_sys/sys_ssram_clk
 add wave -noupdate -format Logic /tb_mips_sys/sys_ssram_cke_n
@@ -170,6 +180,12 @@ add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/sys_flash_ssr
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/sys_flash_ssram_a
 add wave -noupdate -format Logic /tb_mips_sys/uut/sys_flash_ssram_we_n
 add wave -noupdate -format Logic /tb_mips_sys/uut/sys_flash_ssram_oe_n
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/ssram_a
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/ssram_do
+add wave -noupdate -format Logic /tb_mips_sys/uut/ssram_oe_n
+add wave -noupdate -format Logic /tb_mips_sys/uut/ssram_we_n
+add wave -noupdate -format Logic /tb_mips_sys/uut/ssram_d_drv
+add wave -noupdate -format Logic /tb_mips_sys/uut/ssram_bsy
 add wave -noupdate -divider {MIPS TOP}
 add wave -noupdate -format Logic /tb_mips_sys/uut/clk
 add wave -noupdate -format Literal /tb_mips_sys/uut/inst_mips_top/inst_pipeline/hdu
@@ -315,7 +331,7 @@ add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/inst_mips
 add wave -noupdate -format Logic /tb_mips_sys/uut/inst_mips_top/inst_bui/inst_dcache/tram_re
 add wave -noupdate -format Logic /tb_mips_sys/uut/inst_mips_top/inst_bui/inst_dcache/tram_we
 TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 2} {49999842932 ps} 0} {{Cursor 100} {973266423 ps} 0}
+WaveRestoreCursors {{Cursor 2} {49999842932 ps} 0} {{Cursor 100} {971060308 ps} 0}
 configure wave -namecolwidth 218
 configure wave -valuecolwidth 130
 configure wave -justifyvalue left
@@ -329,4 +345,4 @@ configure wave -gridperiod 100
 configure wave -griddelta 40
 configure wave -timeline 1
 update
-WaveRestoreZoom {973174006 ps} {973377973 ps}
+WaveRestoreZoom {970843856 ps} {971236215 ps}