diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..eb36a72
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+TARGETS = $(shell find lib/ -name "*.make")
+INSTR := $(foreach number,$(TARGETS),make -C $(shell dirname $(number)) -f $(shell basename $(number)) $(MAKECMDGOALS) &&) true
+
+all:
+	$(INSTR)
+
+elaborate:
+	$(INSTR)
+	
+run:
+	$(INSTR)
+
+clean:
+	$(INSTR)
+
diff --git a/lib/CPUs/MIPS/ghdl/tb_mips_top.make b/lib/CPUs/MIPS/ghdl/tb_mips_top.make
index 12858cd..0caa4b8 100644
--- a/lib/CPUs/MIPS/ghdl/tb_mips_top.make
+++ b/lib/CPUs/MIPS/ghdl/tb_mips_top.make
@@ -3,8 +3,8 @@ 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
+SRCS += ../../../rams/sim/dpram_2w2r2c_ra.vhd
+SRCS += ../../../rams/sim/dpram_1w1r2c_ra.vhd
 
 # FIFOS
 SRCS += $(FIFO_SYNC_SRCS)
diff --git a/lib/FIFO/ghdl/fifo_async.inc b/lib/FIFO/ghdl/fifo_async.inc
index abe17ba..2d05041 100644
--- a/lib/FIFO/ghdl/fifo_async.inc
+++ b/lib/FIFO/ghdl/fifo_async.inc
@@ -5,7 +5,7 @@ LIB_PATH := $(ROOT_PATH)/lib
 CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
 # -----------------------------------------------------------
-SRCS := $(LIB_PATH)/rams/dpram_1w1r2c_ra_sim.vhd
+SRCS := $(LIB_PATH)/rams/sim/dpram_1w1r2c_ra.vhd
 SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd
 SRCS += $(LIB_PATH)/FIFO/src/gray_counter.vhd
 SRCS += $(LIB_PATH)/FIFO/src/fifo_async_ctrl.vhd
diff --git a/lib/FIFO/ghdl/fifo_sync.inc b/lib/FIFO/ghdl/fifo_sync.inc
index 85255ff..eab5106 100644
--- a/lib/FIFO/ghdl/fifo_sync.inc
+++ b/lib/FIFO/ghdl/fifo_sync.inc
@@ -5,7 +5,7 @@ LIB_PATH := $(ROOT_PATH)/lib
 CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
 # -----------------------------------------------------------
-SRCS := $(LIB_PATH)/rams/dpram_1w1r2c_ra_sim.vhd
+SRCS := $(LIB_PATH)/rams/sim/dpram_1w1r2c_ra.vhd
 SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd
 SRCS += $(LIB_PATH)/FIFO/src/fifo_sync_ctrl.vhd
 SRCS += $(LIB_PATH)/FIFO/src/fifo_sync.vhd
diff --git a/lib/emac/ghdl/emac_rx.inc b/lib/emac/ghdl/emac_rx.inc
index a26e404..75e3d3b 100644
--- a/lib/emac/ghdl/emac_rx.inc
+++ b/lib/emac/ghdl/emac_rx.inc
@@ -8,7 +8,7 @@ CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
 # -----------------------------------------------------------
 SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
-SRCS += $(LIB_PATH)/rams/dpram_1w1r2c_ro_sim.vhd
+SRCS += $(LIB_PATH)/rams/sim/dpram_1w1r2c_ro.vhd
 SRCS += $(FIFO_ASYNC_SRCS)
 SRCS += $(LIB_PATH)/emac/src/sipo.vhd
 SRCS += $(LIB_PATH)/emac/src/crc32.vhd
diff --git a/lib/emac/ghdl/emac_tx.inc b/lib/emac/ghdl/emac_tx.inc
index c606545..cba2d3f 100644
--- a/lib/emac/ghdl/emac_tx.inc
+++ b/lib/emac/ghdl/emac_tx.inc
@@ -9,7 +9,7 @@ CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
 # -----------------------------------------------------------
 SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
-SRCS += $(LIB_PATH)/rams/dpram_1w1r2c_ro_sim.vhd
+SRCS += $(LIB_PATH)/rams/sim/dpram_1w1r2c_ro.vhd
 SRCS += $(FIFO_SYNC_SRCS)
 SRCS += $(FIFO_ASYNC_SRCS)
 SRCS += $(LIB_PATH)/emac/src/piso.vhd
diff --git a/lib/filter/ghdl/fir_semi_parallel.inc b/lib/filter/ghdl/fir_semi_parallel.inc
index 8c14cd6..4939e9b 100644
--- a/lib/filter/ghdl/fir_semi_parallel.inc
+++ b/lib/filter/ghdl/fir_semi_parallel.inc
@@ -6,7 +6,7 @@ CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
 # -----------------------------------------------------------
 SRCS := $(LIB_PATH)/misc/utils_pkg.vhd
-SRCS += $(LIB_PATH)/rams/dpram_1w1r2c_ro_sim.vhd
+SRCS += $(LIB_PATH)/rams/sim/dpram_1w1r2c_ro.vhd
 SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
 SRCS += $(LIB_PATH)/filter/src/filter_pkg.vhd
 SRCS += $(LIB_PATH)/filter/src/fir_pkg.vhd