diff --git a/lib/CPUs/MIPS/ghdl/mips_core.inc b/lib/CPUs/MIPS/ghdl/mips_core.inc
new file mode 100644
index 0000000..6e00d2c
--- /dev/null
+++ b/lib/CPUs/MIPS/ghdl/mips_core.inc
@@ -0,0 +1,31 @@
+# -----------------------------------------------------------
+PKG_NAME := MIPS_CORE
+ROOT_PATH := ../../../..
+LIB_PATH := $(ROOT_PATH)/lib
+CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
+SRC_PATH := $(LIB_PATH)/CPUs/MIPS/src/core
+
+# -----------------------------------------------------------
+SRCS := $(SRC_PATH)/mips_types.vhd
+SRCS += $(SRC_PATH)/mips_instr.vhd
+SRCS += $(SRC_PATH)/mips_alu.vhd
+SRCS += $(SRC_PATH)/mips_bcu.vhd
+SRCS += $(SRC_PATH)/mips_biu.vhd
+SRCS += $(SRC_PATH)/mips_cop.vhd
+SRCS += $(SRC_PATH)/mips_dcache.vhd
+SRCS += $(SRC_PATH)/mips_icache.vhd
+SRCS += $(SRC_PATH)/mips_muldiv.vhd
+SRCS += $(SRC_PATH)/mips_pipeline.vhd
+SRCS += $(SRC_PATH)/mips_reg.vhd
+SRCS += $(SRC_PATH)/mips_shifter.vhd
+SRCS += $(SRC_PATH)/mips_top.vhd
+
+# -----------------------------------------------------------
+$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
+
+SRCS := 
+CUR_PATH :=
+SRC_PATH := 
+ROOT_PATH := 
+LIB_PATH := 
+
diff --git a/lib/CPUs/MIPS/ghdl/mips_top.gtkw b/lib/CPUs/MIPS/ghdl/tb_mips_top.gtkw
similarity index 60%
rename from lib/CPUs/MIPS/ghdl/mips_top.gtkw
rename to lib/CPUs/MIPS/ghdl/tb_mips_top.gtkw
index 2237183..be78a06 100644
--- a/lib/CPUs/MIPS/ghdl/mips_top.gtkw
+++ b/lib/CPUs/MIPS/ghdl/tb_mips_top.gtkw
@@ -1,21 +1,21 @@
 [*]
 [*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI
-[*] Sat Mar 20 09:13:29 2021
+[*] Tue Mar 23 20:38:28 2021
 [*]
-[dumpfile] "/home/jens/work/vhdl/trunk/lib/CPUs/MIPS/ghdl/build/tb_mips_top.vcd"
-[dumpfile_mtime] "Sat Mar 20 09:08:27 2021"
-[dumpfile_size] 394934034
-[savefile] "/home/jens/work/vhdl/trunk/lib/CPUs/MIPS/ghdl/build/tb_mips_top.gtkw"
+[dumpfile] "/home/jens/work/vhdl/trunk/lib/CPUs/MIPS/ghdl/build/tb_mips_top/tb_mips_top.vcd"
+[dumpfile_mtime] "Tue Mar 23 20:38:01 2021"
+[dumpfile_size] 395823834
+[savefile] "/home/jens/work/vhdl/trunk/lib/CPUs/MIPS/ghdl/build/tb_mips_top/tb_mips_top.gtkw"
 [timestart] 0
-[size] 1000 600
-[pos] -1 -1
-*-28.999506 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+[size] 1856 1136
+[pos] -51 -51
+*-37.625370 355000000000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
 [treeopen] tb_mips_top.
 [treeopen] tb_mips_top.inst_uart.
 [sst_width] 233
-[signals_width] 158
+[signals_width] 288
 [sst_expanded] 1
-[sst_vpaned_height] 144
+[sst_vpaned_height] 330
 @28
 tb_mips_top.clk
 tb_mips_top.rst
diff --git a/lib/CPUs/MIPS/ghdl/mips_top.Makefile b/lib/CPUs/MIPS/ghdl/tb_mips_top.make
similarity index 63%
rename from lib/CPUs/MIPS/ghdl/mips_top.Makefile
rename to lib/CPUs/MIPS/ghdl/tb_mips_top.make
index ac512b8..12858cd 100644
--- a/lib/CPUs/MIPS/ghdl/mips_top.Makefile
+++ b/lib/CPUs/MIPS/ghdl/tb_mips_top.make
@@ -1,21 +1,19 @@
-include ../src/core/mips.mk
+include mips_core.inc
+include ../../../../lib/FIFO/ghdl/fifo_sync.inc
+include ../../../../lib/FIFO/ghdl/fifo_async.inc
 
 # RAMS
 SRCS += ../../../rams/dpram_2w2r2c_ra_sim.vhd
 SRCS += ../../../rams/dpram_1w1r2c_ra_sim.vhd
 
 # FIFOS
-SRCS += ../../../FIFO/src/fifo_ctrl_pkg.vhd
-SRCS += ../../../FIFO/src/gray_counter.vhd
-SRCS += ../../../FIFO/src/fifo_sync_ctrl.vhd
-SRCS += ../../../FIFO/src/fifo_sync.vhd
-SRCS += ../../../FIFO/src/fifo_async_ctrl.vhd
-SRCS += ../../../FIFO/src/fifo_async.vhd
+SRCS += $(FIFO_SYNC_SRCS)
+SRCS += $(FIFO_ASYNC_SRCS)
 
 # UART
-SRCS += ../../../uart/uart_types.vhd
-SRCS += ../../../uart/uart_sim.vhd
-SRCS += ../../../uart/uart_wb.vhd
+SRCS += ../../../uart/src/uart_types.vhd
+SRCS += ../../../uart/src/sim/uart.vhd
+SRCS += ../../../uart/src/uart_wb.vhd
 
 # GPIO
 SRCS += ../../../misc/gpio_wb.vhd
@@ -38,7 +36,7 @@ SRCS += $(MIPS_CORE_SRCS)
 SRCS += ../src/tb_mips_top.vhd
 
 # Compile
-TARGET := mips_top
+TARGET := tb_mips_top
 ENTITY = tb_mips_top
 RUN_TIME := 1500us
 WITH_VCD := y
diff --git a/lib/CPUs/MIPS/src/core/mips.mk b/lib/CPUs/MIPS/src/core/mips.mk
deleted file mode 100644
index 728a60c..0000000
--- a/lib/CPUs/MIPS/src/core/mips.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-_PKG_NAME := MIPS_CORE
-
-_CURDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
-
-_SRC := mips_types.vhd
-_SRC += mips_instr.vhd
-_SRC += mips_alu.vhd
-_SRC += mips_bcu.vhd
-_SRC += mips_biu.vhd
-_SRC += mips_cop.vhd
-_SRC += mips_dcache.vhd
-_SRC += mips_icache.vhd
-_SRC += mips_muldiv.vhd
-_SRC += mips_pipeline.vhd
-_SRC += mips_reg.vhd
-_SRC += mips_shifter.vhd
-_SRC += mips_top.vhd
-
-
-$(_PKG_NAME)_SRCS := $(addprefix $(_CURDIR)/,$(_SRC))
-
-undefine $(_SRC)
-