diff --git a/lib/CPUs/JCpu/ghdl/Makefile b/lib/CPUs/JCpu/ghdl/Makefile
deleted file mode 100644
index c1eb39b..0000000
--- a/lib/CPUs/JCpu/ghdl/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-TARGET ?= tb_cpu
-
-include ../src/core/jcpu_core.mk
-
-tb_cpu_SRCS := tb_cpu_itest.vhd itest_irom.vhdl
-tb_cpu_ENTITY_RUN := tb_cpu
-
-tb_reti_issue_SRCS := tb_cpu_irq.vhd reti_issue_irom.vhdl
-tb_reti_issue_ENTITY_RUN := tb_cpu
-
-tb_cpu_embedded_SRCS := tb_cpu_embedded.vhd cpu_embedded.vhd itest_irom.vhdl
-tb_cpu_embedded_ENTITY_RUN := tb_cpu_embedded
-
-tb_mul8x8_SRCS := tb_cpu_embedded.vhd cpu_embedded.vhd mul8x8_irom.vhdl
-tb_mul8x8_ENTITY_RUN := tb_cpu_embedded
-
-SRCS := $(JCPU_CORE_SRCS)
-SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd ../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
-SRCS += $(addprefix ../src/,$($(TARGET)_SRCS))
-
-# Compile
-ENTITY := $($(TARGET)_ENTITY_RUN)
-WITH_GHW := y
-
-include ../../../../Common/make/ghdl.mk
-
diff --git a/lib/CPUs/JCpu/ghdl/Makefile.cpu_embedded b/lib/CPUs/JCpu/ghdl/Makefile.cpu_embedded
new file mode 100644
index 0000000..1213516
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/Makefile.cpu_embedded
@@ -0,0 +1,14 @@
+include ../src/core/jcpu_core.mk
+
+SRCS += $(JCPU_CORE_SRCS)
+SRCS += ../src/itest_irom.vhdl
+SRCS += ../src/cpu_embedded.vhd
+SRCS += ../src/tb_cpu_embedded.vhd
+
+# Compile
+TARGET := cpu_embedded
+ENTITY := tb_cpu_embedded
+WITH_GHW := y
+
+include ../../../../Common/make/ghdl.mk
+
diff --git a/lib/CPUs/JCpu/ghdl/Makefile.cpu_itest b/lib/CPUs/JCpu/ghdl/Makefile.cpu_itest
new file mode 100644
index 0000000..69d53c3
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/Makefile.cpu_itest
@@ -0,0 +1,15 @@
+include ../src/core/jcpu_core.mk
+
+SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd
+SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
+SRCS += $(JCPU_CORE_SRCS)
+SRCS += ../src/itest_irom.vhdl
+SRCS += ../src/tb_cpu_itest.vhd
+
+# Compile
+TARGET := cpu_itest
+ENTITY := tb_cpu
+WITH_GHW := y
+
+include ../../../../Common/make/ghdl.mk
+
diff --git a/lib/CPUs/JCpu/ghdl/Makefile.mul8x8 b/lib/CPUs/JCpu/ghdl/Makefile.mul8x8
new file mode 100644
index 0000000..62df935
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/Makefile.mul8x8
@@ -0,0 +1,14 @@
+include ../src/core/jcpu_core.mk
+
+SRCS += $(JCPU_CORE_SRCS)
+SRCS += ../src/mul8x8_irom.vhdl
+SRCS += ../src/cpu_embedded.vhd
+SRCS += ../src/tb_cpu_embedded.vhd
+
+# Compile
+TARGET := mul8x8
+ENTITY := tb_cpu_embedded
+WITH_GHW := y
+
+include ../../../../Common/make/ghdl.mk
+
diff --git a/lib/CPUs/JCpu/ghdl/Makefile.reti_issue b/lib/CPUs/JCpu/ghdl/Makefile.reti_issue
new file mode 100644
index 0000000..3801f88
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/Makefile.reti_issue
@@ -0,0 +1,15 @@
+include ../src/core/jcpu_core.mk
+
+SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd
+SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
+SRCS += $(JCPU_CORE_SRCS)
+SRCS += ../src/reti_issue_irom.vhdl
+SRCS += ../src/tb_cpu_itest.vhd
+
+# Compile
+TARGET := reti_issue
+ENTITY := tb_cpu
+WITH_GHW := y
+
+include ../../../../Common/make/ghdl.mk
+