diff --git a/tools/jcpu/eval_scan.rb b/Common/tools/jcpu/eval_scan.rb
similarity index 100%
rename from tools/jcpu/eval_scan.rb
rename to Common/tools/jcpu/eval_scan.rb
diff --git a/tools/jcpu/insrom.rb b/Common/tools/jcpu/insrom.rb
similarity index 100%
rename from tools/jcpu/insrom.rb
rename to Common/tools/jcpu/insrom.rb
diff --git a/tools/jcpu/irom.vhd.tpl b/Common/tools/jcpu/irom.vhd.tpl
similarity index 100%
rename from tools/jcpu/irom.vhd.tpl
rename to Common/tools/jcpu/irom.vhd.tpl
diff --git a/tools/jcpu/irom_ld.vhd.tpl b/Common/tools/jcpu/irom_ld.vhd.tpl
similarity index 100%
rename from tools/jcpu/irom_ld.vhd.tpl
rename to Common/tools/jcpu/irom_ld.vhd.tpl
diff --git a/tools/jcpu/jasm.bak.rb b/Common/tools/jcpu/jasm.bak.rb
similarity index 100%
rename from tools/jcpu/jasm.bak.rb
rename to Common/tools/jcpu/jasm.bak.rb
diff --git a/tools/jcpu/jasm.rb b/Common/tools/jcpu/jasm.rb
similarity index 100%
rename from tools/jcpu/jasm.rb
rename to Common/tools/jcpu/jasm.rb
diff --git a/tools/jcpu/lib/cg.inc.jsm b/Common/tools/jcpu/lib/cg.inc.jsm
similarity index 100%
rename from tools/jcpu/lib/cg.inc.jsm
rename to Common/tools/jcpu/lib/cg.inc.jsm
diff --git a/tools/jcpu/lib/cregs.inc.jsm b/Common/tools/jcpu/lib/cregs.inc.jsm
similarity index 100%
rename from tools/jcpu/lib/cregs.inc.jsm
rename to Common/tools/jcpu/lib/cregs.inc.jsm
diff --git a/tools/jcpu/lib/delays.inc.jsm b/Common/tools/jcpu/lib/delays.inc.jsm
similarity index 100%
rename from tools/jcpu/lib/delays.inc.jsm
rename to Common/tools/jcpu/lib/delays.inc.jsm
diff --git a/tools/jcpu/lib/lcd.inc.jsm b/Common/tools/jcpu/lib/lcd.inc.jsm
similarity index 100%
rename from tools/jcpu/lib/lcd.inc.jsm
rename to Common/tools/jcpu/lib/lcd.inc.jsm
diff --git a/tools/jcpu/lib/mul8x8.inc.jsm b/Common/tools/jcpu/lib/mul8x8.inc.jsm
similarity index 100%
rename from tools/jcpu/lib/mul8x8.inc.jsm
rename to Common/tools/jcpu/lib/mul8x8.inc.jsm
diff --git a/tools/jcpu/lib/uart.inc.jsm b/Common/tools/jcpu/lib/uart.inc.jsm
similarity index 100%
rename from tools/jcpu/lib/uart.inc.jsm
rename to Common/tools/jcpu/lib/uart.inc.jsm
diff --git a/tools/jcpu/lib/utils.inc.jsm b/Common/tools/jcpu/lib/utils.inc.jsm
similarity index 100%
rename from tools/jcpu/lib/utils.inc.jsm
rename to Common/tools/jcpu/lib/utils.inc.jsm
diff --git a/tools/jcpu/opc.list b/Common/tools/jcpu/opc.list
similarity index 100%
rename from tools/jcpu/opc.list
rename to Common/tools/jcpu/opc.list
diff --git a/tools/jcpu/regx.rb b/Common/tools/jcpu/regx.rb
similarity index 100%
rename from tools/jcpu/regx.rb
rename to Common/tools/jcpu/regx.rb
diff --git a/tools/jcpu/rom.tcl.tpl b/Common/tools/jcpu/rom.tcl.tpl
similarity index 100%
rename from tools/jcpu/rom.tcl.tpl
rename to Common/tools/jcpu/rom.tcl.tpl
diff --git a/tools/jcpu/templates.rb b/Common/tools/jcpu/templates.rb
similarity index 100%
rename from tools/jcpu/templates.rb
rename to Common/tools/jcpu/templates.rb
diff --git a/tools/jcpu/xrom.vhd.tpl b/Common/tools/jcpu/xrom.vhd.tpl
similarity index 100%
rename from tools/jcpu/xrom.vhd.tpl
rename to Common/tools/jcpu/xrom.vhd.tpl
diff --git a/tools/jcpu/xrom_ld.vhd.tpl b/Common/tools/jcpu/xrom_ld.vhd.tpl
similarity index 100%
rename from tools/jcpu/xrom_ld.vhd.tpl
rename to Common/tools/jcpu/xrom_ld.vhd.tpl
diff --git a/tools/mips/Makefile b/Common/tools/mips/Makefile
similarity index 100%
rename from tools/mips/Makefile
rename to Common/tools/mips/Makefile
diff --git a/tools/mips/src/flashgen.c b/Common/tools/mips/src/flashgen.c
similarity index 100%
rename from tools/mips/src/flashgen.c
rename to Common/tools/mips/src/flashgen.c
diff --git a/tools/mips/src/packhex.c b/Common/tools/mips/src/packhex.c
similarity index 100%
rename from tools/mips/src/packhex.c
rename to Common/tools/mips/src/packhex.c
diff --git a/tools/mips/src/ramgen.c b/Common/tools/mips/src/ramgen.c
similarity index 100%
rename from tools/mips/src/ramgen.c
rename to Common/tools/mips/src/ramgen.c
diff --git a/tools/mips/src/romgen.c b/Common/tools/mips/src/romgen.c
similarity index 100%
rename from tools/mips/src/romgen.c
rename to Common/tools/mips/src/romgen.c