diff --git a/lib/CPUs/JCpu/src/Makefile b/lib/CPUs/JCpu/sim/Makefile
similarity index 76%
rename from lib/CPUs/JCpu/src/Makefile
rename to lib/CPUs/JCpu/sim/Makefile
index 0a5205a..1e6dd26 100644
--- a/lib/CPUs/JCpu/src/Makefile
+++ b/lib/CPUs/JCpu/sim/Makefile
@@ -1,6 +1,6 @@
 NAME ?= tb_cpu
 
-include core/jcpu_core.mk
+include ../src/core/jcpu_core.mk
 
 tb_cpu_SRCS := tb_cpu_itest.vhd itest_irom.vhdl
 tb_cpu_ENTITY_RUN := tb_cpu
@@ -15,8 +15,10 @@ tb_mul8x8_SRCS := tb_cpu_embedded.vhd cpu_embedded.vhd mul8x8_irom.vhdl
 tb_mul8x8_ENTITY_RUN := tb_cpu_embedded
 
 
-SRCS := ../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd ../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
-SRCS += $(JCPU_CORE_SRCS) $($(NAME)_SRCS)
+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/,$($(NAME)_SRCS))
+
 
 ENTITY_RUN = $($(NAME)_ENTITY_RUN)