diff --git a/projects/mips_sys/ise101/mips_sys/project/mips_sys.prj b/projects/mips_sys/ise101/mips_sys/project/mips_sys.prj
index b1d75fa..13d0dd5 100644
--- a/projects/mips_sys/ise101/mips_sys/project/mips_sys.prj
+++ b/projects/mips_sys/ise101/mips_sys/project/mips_sys.prj
@@ -3,6 +3,7 @@ vhdl work "../../src/sdram_config.vhd"
 vhdl work "../../../../lib/VGA_ctrl/src/vga_types.vhd"
 vhdl work "../../../../lib/FIFO/src/gray_counter.vhd"
 vhdl work "../../../../lib/VGA_ctrl/src/vga_sync.vhd"
+vhdl work "../../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_const.vhd"
 vhdl work "../../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_types.vhd"
 vhdl work "../../../../lib/SDRAM/ddr_sdr_v1_5/src/ddr_clk_virtex4.vhd"
 vhdl work "../../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_ctrl.vhd"
diff --git a/projects/mips_sys/sim/tb_mips_sys.fdo b/projects/mips_sys/sim/tb_mips_sys.fdo
index 1167cbd..2fd4ee3 100644
--- a/projects/mips_sys/sim/tb_mips_sys.fdo
+++ b/projects/mips_sys/sim/tb_mips_sys.fdo
@@ -12,6 +12,7 @@ vcom -explicit  -93 "../src/sdram_config_sim.vhd"
 vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_types.vhd"
 vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_instr.vhd"
 vcom -explicit  -93 "../../../lib/FIFO/src/fifo_ctrl_pkg.vhd"
+vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_const.vhd"
 vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_types.vhd"
 vcom -explicit  -93 "../../../lib/misc/utils_pkg.vhd"
 vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/mt46v16m16.vhd"
diff --git a/projects/mips_sys/sim/tb_mips_sys_emac.fdo b/projects/mips_sys/sim/tb_mips_sys_emac.fdo
index 8acbb0f..06b77ee 100644
--- a/projects/mips_sys/sim/tb_mips_sys_emac.fdo
+++ b/projects/mips_sys/sim/tb_mips_sys_emac.fdo
@@ -1,6 +1,10 @@
 ## NOTE:  Do not edit this file.
 ##
+
+if {[file exists work]} {vdel -lib work -all}
+
 vlib work
+
 # Configs
 vcom -explicit  -93 "../src/sdram_config_sim.vhd"
 
@@ -8,13 +12,19 @@ vcom -explicit  -93 "../src/sdram_config_sim.vhd"
 vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_types.vhd"
 vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_instr.vhd"
 vcom -explicit  -93 "../../../lib/FIFO/src/fifo_ctrl_pkg.vhd"
+vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_const.vhd"
 vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_types.vhd"
 vcom -explicit  -93 "../../../lib/misc/utils_pkg.vhd"
 vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/mt46v16m16.vhd"
 
+# Clock Generator
+vcom -explicit  -93 "../src/clockgen.vhd"
+
 # RAMs
-vcom -explicit  -93 "../../../lib/misc/dpram_2w2r.vhd"
-vcom -explicit  -93 "../../../lib/misc/dpram_1w1r.vhd"
+vcom -explicit  -93 "../../../lib/rams/dpram_1w1r2c_ro_sim.vhd"
+vcom -explicit  -93 "../../../lib/rams/dpram_2w2r2c_ra_sim.vhd"
+vcom -explicit  -93 "../../../lib/rams/dpram_1w1r2c_ra_sim.vhd"
+#vcom -explicit  -93 "../../../lib/misc/dpram_1w1r.vhd"
 
 # FIFOS
 vcom -explicit  -93 "../../../lib/FIFO/src/gray_counter.vhd"
@@ -35,7 +45,7 @@ vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_dcache.vhd"
 vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_icache.vhd"
 vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_biu.vhd"
 vcom -explicit  -93 "../../../lib/CPUs/MIPS/src/core/mips_top.vhd"
-vcom -explicit  -93 "../src/bootloader.ROM.vhd"
+vcom -explicit  -93 "../src/bootloader_flash.ROM.vhd"
 vcom -explicit  -93 "../../../lib/misc/rom_wb.vhd"
 
 # VGA
@@ -48,11 +58,8 @@ vcom -explicit  -93 "../../../lib/VGA_ctrl/src/vga_backend.vhd"
 vcom -explicit  -93 "../../../lib/VGA_ctrl/src/vga_frontend64.vhd"
 
 # UART
-vcom -explicit  -93 "../../../lib/uart/bbfifo_16x8.vhd"
-vcom -explicit  -93 "../../../lib/uart/kcuart_rx.vhd"
-vcom -explicit  -93 "../../../lib/uart/kcuart_tx.vhd"
-vcom -explicit  -93 "../../../lib/uart/uart_rx.vhd"
-vcom -explicit  -93 "../../../lib/uart/uart_tx.vhd"
+vcom -explicit  -93 "../../../lib/uart/uart_rx_sim.vhd"
+vcom -explicit  -93 "../../../lib/uart/uart_tx_sim.vhd"
 vcom -explicit  -93 "../../../lib/uart/uart_wb.vhd"
 
 # PS2
@@ -79,11 +86,13 @@ vcom -explicit  -93 "../../../lib/SSRAM/src/CY7C1354B.vhd"
 vcom -explicit  -93 "../../../lib/SSRAM/src/ssram_port_wb.vhd"
 
 # SDRAM
+vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/ddr_clk_virtex4.vhd"
+vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/ddr_phy_virtex4.vhd"
 vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_ctrl.vhd"
 vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_cmd.vhd"
-vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/ddr_phy_virtex4.vhd"
 vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_ctrl_top.vhd"
-vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_ctrl_frontend64_wb.vhd"
+vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/sdram_ctrl_frontend_wb64.vhd"
+vcom -explicit  -93 "../../../lib/SDRAM/ddr_sdr_v1_5/src/ctrl_ddr_wb64.vhd"
 
 # AC-97
 vcom -explicit  -93 "../../../lib/misc/singleshot.vhd"
@@ -101,9 +110,6 @@ vcom -explicit  -93 "../../../lib/emac/src/emac_rx.vhd"
 vcom -explicit  -93 "../../../lib/emac/src/emac_tx.vhd"
 vcom -explicit  -93 "../../../lib/emac/src/emac_top_jb.vhd"
 
-# Clock Generator
-vcom -explicit  -93 "../src/clockgen_virtex4.vhd"
-
 # Top and TB
 vcom -explicit  -93 "../src/mips_sys_sim.vhd"
 vcom -explicit  -93 "../src/tb_mips_sys.vhd"