diff --git a/lib/CPUs/JCpu/ghdl/Makefile.cpu_embedded b/lib/CPUs/JCpu/ghdl/cpu_embedded.Makefile
similarity index 100%
rename from lib/CPUs/JCpu/ghdl/Makefile.cpu_embedded
rename to lib/CPUs/JCpu/ghdl/cpu_embedded.Makefile
diff --git a/lib/CPUs/JCpu/ghdl/cpu_embedded.gtkw b/lib/CPUs/JCpu/ghdl/cpu_embedded.gtkw
new file mode 100644
index 0000000..63eb800
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/cpu_embedded.gtkw
@@ -0,0 +1,24 @@
+[*]
+[*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI
+[*] Sun Mar 21 20:24:10 2021
+[*]
+[dumpfile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/cpu_embedded/cpu_embedded.ghw"
+[dumpfile_mtime] "Sun Mar 21 20:24:02 2021"
+[dumpfile_size] 23928
+[savefile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/cpu_embedded/cpu_embedded.gtkw"
+[timestart] 0
+[size] 1000 600
+[pos] -1 -1
+*-28.221537 367000000 -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] top.
+[treeopen] top.tb_cpu_embedded.
+[sst_width] 233
+[signals_width] 78
+[sst_expanded] 1
+[sst_vpaned_height] 144
+@28
+top.tb_cpu_embedded.uut.clk
+@29
+top.tb_cpu_embedded.uut.rst
+[pattern_trace] 1
+[pattern_trace] 0
diff --git a/lib/CPUs/JCpu/ghdl/Makefile.cpu_itest b/lib/CPUs/JCpu/ghdl/cpu_itest.Makefile
similarity index 100%
rename from lib/CPUs/JCpu/ghdl/Makefile.cpu_itest
rename to lib/CPUs/JCpu/ghdl/cpu_itest.Makefile
diff --git a/lib/CPUs/JCpu/ghdl/cpu_itest.gtkw b/lib/CPUs/JCpu/ghdl/cpu_itest.gtkw
new file mode 100644
index 0000000..c31ce17
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/cpu_itest.gtkw
@@ -0,0 +1,26 @@
+[*]
+[*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI
+[*] Sun Mar 21 20:23:20 2021
+[*]
+[dumpfile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/cpu_itest/cpu_itest.ghw"
+[dumpfile_mtime] "Sun Mar 21 20:23:14 2021"
+[dumpfile_size] 23880
+[savefile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/cpu_itest/cpu_itest.gtkw"
+[timestart] 0
+[size] 1000 600
+[pos] -1 -1
+*-28.353857 33340 -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] top.
+[treeopen] top.tb_cpu.
+[treeopen] top.tb_cpu.uut.
+[treeopen] top.tb_cpu.uut.inst_pc.
+[sst_width] 233
+[signals_width] 134
+[sst_expanded] 1
+[sst_vpaned_height] 144
+@22
+#{top.tb_cpu.xmem_din[7:0]} top.tb_cpu.xmem_din[7] top.tb_cpu.xmem_din[6] top.tb_cpu.xmem_din[5] top.tb_cpu.xmem_din[4] top.tb_cpu.xmem_din[3] top.tb_cpu.xmem_din[2] top.tb_cpu.xmem_din[1] top.tb_cpu.xmem_din[0]
+@23
+#{top.tb_cpu.uut.inst_pc.pc_next[11:0]} top.tb_cpu.uut.inst_pc.pc_next[11] top.tb_cpu.uut.inst_pc.pc_next[10] top.tb_cpu.uut.inst_pc.pc_next[9] top.tb_cpu.uut.inst_pc.pc_next[8] top.tb_cpu.uut.inst_pc.pc_next[7] top.tb_cpu.uut.inst_pc.pc_next[6] top.tb_cpu.uut.inst_pc.pc_next[5] top.tb_cpu.uut.inst_pc.pc_next[4] top.tb_cpu.uut.inst_pc.pc_next[3] top.tb_cpu.uut.inst_pc.pc_next[2] top.tb_cpu.uut.inst_pc.pc_next[1] top.tb_cpu.uut.inst_pc.pc_next[0]
+[pattern_trace] 1
+[pattern_trace] 0
diff --git a/lib/CPUs/JCpu/ghdl/Makefile.mul8x8 b/lib/CPUs/JCpu/ghdl/mul8x8.Makefile
similarity index 100%
rename from lib/CPUs/JCpu/ghdl/Makefile.mul8x8
rename to lib/CPUs/JCpu/ghdl/mul8x8.Makefile
diff --git a/lib/CPUs/JCpu/ghdl/Makefile.reti_issue b/lib/CPUs/JCpu/ghdl/reti_issue.Makefile
similarity index 100%
rename from lib/CPUs/JCpu/ghdl/Makefile.reti_issue
rename to lib/CPUs/JCpu/ghdl/reti_issue.Makefile
diff --git a/lib/CPUs/JCpu/ghdl/reti_issue.gtkw b/lib/CPUs/JCpu/ghdl/reti_issue.gtkw
new file mode 100644
index 0000000..533a785
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/reti_issue.gtkw
@@ -0,0 +1,24 @@
+[*]
+[*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI
+[*] Sun Mar 21 20:25:04 2021
+[*]
+[dumpfile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/reti_issue/reti_issue.ghw"
+[dumpfile_mtime] "Sun Mar 21 20:25:01 2021"
+[dumpfile_size] 22085
+[savefile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/reti_issue/reti_issue.gtkw"
+[timestart] 0
+[size] 1000 600
+[pos] -1 -1
+*-28.221537 563000000 -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] top.
+[treeopen] top.tb_cpu.
+[sst_width] 233
+[signals_width] 78
+[sst_expanded] 1
+[sst_vpaned_height] 144
+@28
+top.tb_cpu.uut.clk
+@29
+top.tb_cpu.uut.rst
+[pattern_trace] 1
+[pattern_trace] 0