diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/NinjaKun_MiST.qpf b/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST.qpf
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/NinjaKun_MiST.qpf
rename to Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST.qpf
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/NinjaKun_MiST.qsf b/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST.qsf
similarity index 97%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/NinjaKun_MiST.qsf
rename to Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST.qsf
index b93f9a52..993f6a71 100644
--- a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/NinjaKun_MiST.qsf
+++ b/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST.qsf
@@ -237,9 +237,9 @@ set_global_assignment -name VERILOG_FILE rtl/z80ip.v
 set_global_assignment -name VHDL_FILE rtl/dpram.vhd
 set_global_assignment -name VERILOG_FILE rtl/pll.v
 set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdram.sv
-set_global_assignment -name VHDL_FILE ../../../common/Sound/ym2149/vol_table_array.vhd
-set_global_assignment -name VHDL_FILE ../../../common/Sound/ym2149/YM2149.vhd
-set_global_assignment -name QIP_FILE ../../../common/mist/mist.qip
-set_global_assignment -name QIP_FILE ../../../common/CPU/T80/T80.qip
+set_global_assignment -name VHDL_FILE ../../common/Sound/ym2149/vol_table_array.vhd
+set_global_assignment -name VHDL_FILE ../../common/Sound/ym2149/YM2149.vhd
+set_global_assignment -name QIP_FILE ../../common/mist/mist.qip
+set_global_assignment -name QIP_FILE ../../common/CPU/T80/T80.qip
 set_global_assignment -name SMART_RECOMPILE ON
 set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
\ No newline at end of file
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/NinjaKun_MiST.sdc b/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST.sdc
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/NinjaKun_MiST.sdc
rename to Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST.sdc
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/README.txt b/Arcade_MiST/Nova2001_Hardware/README.txt
similarity index 97%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/README.txt
rename to Arcade_MiST/Nova2001_Hardware/README.txt
index a147acba..d54b6169 100644
--- a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/README.txt
+++ b/Arcade_MiST/Nova2001_Hardware/README.txt
@@ -2,6 +2,8 @@
 -- 
 -- Arcade: Ninja Kun port to MiST by Slingshot
 -- 29 December 2019
+-- Added Nova 2001, Raiders5 and Penguin-Kun Wars
+-- 15 June 2021
 -- 
 ---------------------------------------------------------------------------------
 -- 
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/clean.bat b/Arcade_MiST/Nova2001_Hardware/clean.bat
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/clean.bat
rename to Arcade_MiST/Nova2001_Hardware/clean.bat
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/meta/Ninjakun.mra b/Arcade_MiST/Nova2001_Hardware/meta/Ninjakun.mra
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/meta/Ninjakun.mra
rename to Arcade_MiST/Nova2001_Hardware/meta/Ninjakun.mra
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/meta/Nova 2001.mra b/Arcade_MiST/Nova2001_Hardware/meta/Nova 2001.mra
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/meta/Nova 2001.mra
rename to Arcade_MiST/Nova2001_Hardware/meta/Nova 2001.mra
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/meta/Penguin-Kun Wars (US).mra b/Arcade_MiST/Nova2001_Hardware/meta/Penguin-Kun Wars (US).mra
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/meta/Penguin-Kun Wars (US).mra
rename to Arcade_MiST/Nova2001_Hardware/meta/Penguin-Kun Wars (US).mra
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/meta/Raiders5.mra b/Arcade_MiST/Nova2001_Hardware/meta/Raiders5.mra
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/meta/Raiders5.mra
rename to Arcade_MiST/Nova2001_Hardware/meta/Raiders5.mra
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/NinjaKun_MiST.sv b/Arcade_MiST/Nova2001_Hardware/rtl/NinjaKun_MiST.sv
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/NinjaKun_MiST.sv
rename to Arcade_MiST/Nova2001_Hardware/rtl/NinjaKun_MiST.sv
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/build_id.tcl b/Arcade_MiST/Nova2001_Hardware/rtl/build_id.tcl
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/build_id.tcl
rename to Arcade_MiST/Nova2001_Hardware/rtl/build_id.tcl
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/defs.v b/Arcade_MiST/Nova2001_Hardware/rtl/defs.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/defs.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/defs.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/dpram.vhd b/Arcade_MiST/Nova2001_Hardware/rtl/dpram.vhd
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/dpram.vhd
rename to Arcade_MiST/Nova2001_Hardware/rtl/dpram.vhd
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/hvgen.v b/Arcade_MiST/Nova2001_Hardware/rtl/hvgen.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/hvgen.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/hvgen.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_adec.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_adec.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_adec.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_adec.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_cpumux.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_cpumux.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_cpumux.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_cpumux.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_input.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_input.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_input.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_input.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_io_video.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_io_video.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_io_video.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_io_video.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_irqgen.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_irqgen.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_irqgen.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_irqgen.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_main.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_main.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_main.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_main.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_psg.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_psg.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_psg.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_psg.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_sadec.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_sadec.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_sadec.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_sadec.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_sprite.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_sprite.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_sprite.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_sprite.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_top.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_top.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_top.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_top.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_video.v b/Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_video.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/ninjakun_video.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/ninjakun_video.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/pll.qip b/Arcade_MiST/Nova2001_Hardware/rtl/pll.qip
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/pll.qip
rename to Arcade_MiST/Nova2001_Hardware/rtl/pll.qip
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/pll.v b/Arcade_MiST/Nova2001_Hardware/rtl/pll.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/pll.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/pll.v
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/sdram.sv b/Arcade_MiST/Nova2001_Hardware/rtl/sdram.sv
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/sdram.sv
rename to Arcade_MiST/Nova2001_Hardware/rtl/sdram.sv
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/spram.vhd b/Arcade_MiST/Nova2001_Hardware/rtl/spram.vhd
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/spram.vhd
rename to Arcade_MiST/Nova2001_Hardware/rtl/spram.vhd
diff --git a/Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/z80ip.v b/Arcade_MiST/Nova2001_Hardware/rtl/z80ip.v
similarity index 100%
rename from Arcade_MiST/Nova2001_Hardware/NinjaKun_MiST/rtl/z80ip.v
rename to Arcade_MiST/Nova2001_Hardware/rtl/z80ip.v