diff --git a/.gitmodules b/.gitmodules
index 4146a66..03eb331 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "source/quickNES/QuickNES_Core"]
-	path = source/quickNES/QuickNES_Core
+	path = source/quickNES/core
 	url = git@github.com:SergioMartin86/QuickNES_Core.git
diff --git a/source/quickNES/QuickNES_Core b/source/quickNES/core
similarity index 100%
rename from source/quickNES/QuickNES_Core
rename to source/quickNES/core
diff --git a/source/quickNES/meson.build b/source/quickNES/meson.build
index 4fc3e6e..bcdbbf6 100644
--- a/source/quickNES/meson.build
+++ b/source/quickNES/meson.build
@@ -1,70 +1,70 @@
 # quickNES Core sources
 
 quickNESSrc = [
-	'QuickNES_Core/nes_emu/abstract_file.cpp',
-	'QuickNES_Core/nes_emu/apu_state.cpp',
-	'QuickNES_Core/nes_emu/Blip_Buffer.cpp',
-	'QuickNES_Core/nes_emu/Effects_Buffer.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Fme7.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Mmc5.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Namco106.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Vrc6.cpp',
-	'QuickNES_Core/nes_emu/misc_mappers.cpp',
-	'QuickNES_Core/nes_emu/Mapper_15.cpp',
-	'QuickNES_Core/nes_emu/Mapper_60.cpp',
-	'QuickNES_Core/nes_emu/Multi_Buffer.cpp',
-	'QuickNES_Core/nes_emu/Nes_Apu.cpp',
-	'QuickNES_Core/nes_emu/Nes_Buffer.cpp',
-	'QuickNES_Core/nes_emu/Nes_Cart.cpp',
-	'QuickNES_Core/nes_emu/Nes_Core.cpp',
-	'QuickNES_Core/nes_emu/Nes_Cpu.cpp',
-	'QuickNES_Core/nes_emu/nes_data.cpp',
-	'QuickNES_Core/nes_emu/Nes_Effects_Buffer.cpp',
-	'QuickNES_Core/nes_emu/Nes_Emu.cpp',
-	'QuickNES_Core/nes_emu/Nes_File.cpp',
-	'QuickNES_Core/nes_emu/Nes_Fme7_Apu.cpp',
-	'QuickNES_Core/nes_emu/Nes_Mapper.cpp',
-	'QuickNES_Core/nes_emu/nes_mappers.cpp',
-	'QuickNES_Core/nes_emu/Nes_Mmc1.cpp',
-	'QuickNES_Core/nes_emu/Nes_Mmc3.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Misc.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Unrom512.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Vrc1.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Vrc3.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Vrc2_4.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Vrc7.cpp',
-	'QuickNES_Core/nes_emu/Nes_Vrc7.cpp',
-	'QuickNES_Core/nes_emu/emu2413.cpp',
-	'QuickNES_Core/nes_emu/emu2413_state.cpp',
-	'QuickNES_Core/nes_emu/Nes_Namco_Apu.cpp',
-	'QuickNES_Core/nes_emu/Mmc24.cpp',
-	'QuickNES_Core/nes_emu/Nes_Oscs.cpp',
-	'QuickNES_Core/nes_emu/Nes_Ppu.cpp',
-	'QuickNES_Core/nes_emu/Nes_Ppu_Impl.cpp',
-	'QuickNES_Core/nes_emu/Nes_Ppu_Rendering.cpp',
-	'QuickNES_Core/nes_emu/Nes_State.cpp',
-	'QuickNES_Core/nes_emu/nes_util.cpp',
-	'QuickNES_Core/nes_emu/Nes_Vrc6_Apu.cpp',
-	'QuickNES_Core/nes_emu/Data_Reader.cpp',
-	'QuickNES_Core/nes_emu/Mappers.cpp',
-	'QuickNES_Core/nes_emu/Mapper_74x161x162x32.cpp',
-	'QuickNES_Core/nes_emu/Mapper_180.cpp',
-	'QuickNES_Core/nes_emu/Mapper_193.cpp',
-	'QuickNES_Core/nes_emu/Mapper_240.cpp',
-	'QuickNES_Core/nes_emu/Mapper_241.cpp',
-	'QuickNES_Core/nes_emu/Mapper_244.cpp',
-	'QuickNES_Core/nes_emu/Mapper_246.cpp',
-	'QuickNES_Core/nes_emu/Mapper_AveNina.cpp',
-	'QuickNES_Core/nes_emu/Mapper_IremG101.cpp',
-	'QuickNES_Core/nes_emu/Mapper_IremTamS1.cpp',
-	'QuickNES_Core/nes_emu/Mapper_JalecoJF11.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Namco54xx.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Sunsoft1.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Sunsoft2.cpp',
-	'QuickNES_Core/nes_emu/Mapper_TaitoX1005.cpp',
-	'QuickNES_Core/nes_emu/Mapper_TaitoTC0190.cpp',
-	'QuickNES_Core/nes_emu/Mapper_Un1rom.cpp',
-	'QuickNES_Core/nes_emu/nes_ntsc.cpp',
+	'core/nes_emu/abstract_file.cpp',
+	'core/nes_emu/apu_state.cpp',
+	'core/nes_emu/Blip_Buffer.cpp',
+	'core/nes_emu/Effects_Buffer.cpp',
+	'core/nes_emu/Mapper_Fme7.cpp',
+	'core/nes_emu/Mapper_Mmc5.cpp',
+	'core/nes_emu/Mapper_Namco106.cpp',
+	'core/nes_emu/Mapper_Vrc6.cpp',
+	'core/nes_emu/misc_mappers.cpp',
+	'core/nes_emu/Mapper_15.cpp',
+	'core/nes_emu/Mapper_60.cpp',
+	'core/nes_emu/Multi_Buffer.cpp',
+	'core/nes_emu/Nes_Apu.cpp',
+	'core/nes_emu/Nes_Buffer.cpp',
+	'core/nes_emu/Nes_Cart.cpp',
+	'core/nes_emu/Nes_Core.cpp',
+	'core/nes_emu/Nes_Cpu.cpp',
+	'core/nes_emu/nes_data.cpp',
+	'core/nes_emu/Nes_Effects_Buffer.cpp',
+	'core/nes_emu/Nes_Emu.cpp',
+	'core/nes_emu/Nes_File.cpp',
+	'core/nes_emu/Nes_Fme7_Apu.cpp',
+	'core/nes_emu/Nes_Mapper.cpp',
+	'core/nes_emu/nes_mappers.cpp',
+	'core/nes_emu/Nes_Mmc1.cpp',
+	'core/nes_emu/Nes_Mmc3.cpp',
+	'core/nes_emu/Mapper_Misc.cpp',
+	'core/nes_emu/Mapper_Unrom512.cpp',
+	'core/nes_emu/Mapper_Vrc1.cpp',
+	'core/nes_emu/Mapper_Vrc3.cpp',
+	'core/nes_emu/Mapper_Vrc2_4.cpp',
+	'core/nes_emu/Mapper_Vrc7.cpp',
+	'core/nes_emu/Nes_Vrc7.cpp',
+	'core/nes_emu/emu2413.cpp',
+	'core/nes_emu/emu2413_state.cpp',
+	'core/nes_emu/Nes_Namco_Apu.cpp',
+	'core/nes_emu/Mmc24.cpp',
+	'core/nes_emu/Nes_Oscs.cpp',
+	'core/nes_emu/Nes_Ppu.cpp',
+	'core/nes_emu/Nes_Ppu_Impl.cpp',
+	'core/nes_emu/Nes_Ppu_Rendering.cpp',
+	'core/nes_emu/Nes_State.cpp',
+	'core/nes_emu/nes_util.cpp',
+	'core/nes_emu/Nes_Vrc6_Apu.cpp',
+	'core/nes_emu/Data_Reader.cpp',
+	'core/nes_emu/Mappers.cpp',
+	'core/nes_emu/Mapper_74x161x162x32.cpp',
+	'core/nes_emu/Mapper_180.cpp',
+	'core/nes_emu/Mapper_193.cpp',
+	'core/nes_emu/Mapper_240.cpp',
+	'core/nes_emu/Mapper_241.cpp',
+	'core/nes_emu/Mapper_244.cpp',
+	'core/nes_emu/Mapper_246.cpp',
+	'core/nes_emu/Mapper_AveNina.cpp',
+	'core/nes_emu/Mapper_IremG101.cpp',
+	'core/nes_emu/Mapper_IremTamS1.cpp',
+	'core/nes_emu/Mapper_JalecoJF11.cpp',
+	'core/nes_emu/Mapper_Namco54xx.cpp',
+	'core/nes_emu/Mapper_Sunsoft1.cpp',
+	'core/nes_emu/Mapper_Sunsoft2.cpp',
+	'core/nes_emu/Mapper_TaitoX1005.cpp',
+	'core/nes_emu/Mapper_TaitoTC0190.cpp',
+	'core/nes_emu/Mapper_Un1rom.cpp',
+	'core/nes_emu/nes_ntsc.cpp',
 	'Mapper_70.cpp'
 ]
 
@@ -72,6 +72,6 @@ quickNESSrc = [
 
  quickNESDependency = declare_dependency(
   compile_args        : [ '-D_USE_QUICKNES' ],
-  include_directories : include_directories(['.', 'QuickNES_Core/nes_emu']),
+  include_directories : include_directories(['.', 'core/nes_emu']),
   sources             : [ quickNESSrc ]
  )
\ No newline at end of file
diff --git a/source/quickerNES/apu/NESEffectsBuffer.cpp b/source/quickerNES/core/apu/NESEffectsBuffer.cpp
similarity index 100%
rename from source/quickerNES/apu/NESEffectsBuffer.cpp
rename to source/quickerNES/core/apu/NESEffectsBuffer.cpp
diff --git a/source/quickerNES/apu/NESEffectsBuffer.hpp b/source/quickerNES/core/apu/NESEffectsBuffer.hpp
similarity index 100%
rename from source/quickerNES/apu/NESEffectsBuffer.hpp
rename to source/quickerNES/core/apu/NESEffectsBuffer.hpp
diff --git a/source/quickerNES/apu/apu.cpp b/source/quickerNES/core/apu/apu.cpp
similarity index 100%
rename from source/quickerNES/apu/apu.cpp
rename to source/quickerNES/core/apu/apu.cpp
diff --git a/source/quickerNES/apu/apu.hpp b/source/quickerNES/core/apu/apu.hpp
similarity index 100%
rename from source/quickerNES/apu/apu.hpp
rename to source/quickerNES/core/apu/apu.hpp
diff --git a/source/quickerNES/apu/blipBuffer.cpp b/source/quickerNES/core/apu/blipBuffer.cpp
similarity index 100%
rename from source/quickerNES/apu/blipBuffer.cpp
rename to source/quickerNES/core/apu/blipBuffer.cpp
diff --git a/source/quickerNES/apu/blipBuffer.hpp b/source/quickerNES/core/apu/blipBuffer.hpp
similarity index 100%
rename from source/quickerNES/apu/blipBuffer.hpp
rename to source/quickerNES/core/apu/blipBuffer.hpp
diff --git a/source/quickerNES/apu/buffer.cpp b/source/quickerNES/core/apu/buffer.cpp
similarity index 100%
rename from source/quickerNES/apu/buffer.cpp
rename to source/quickerNES/core/apu/buffer.cpp
diff --git a/source/quickerNES/apu/buffer.hpp b/source/quickerNES/core/apu/buffer.hpp
similarity index 100%
rename from source/quickerNES/apu/buffer.hpp
rename to source/quickerNES/core/apu/buffer.hpp
diff --git a/source/quickerNES/apu/effectsBuffer.cpp b/source/quickerNES/core/apu/effectsBuffer.cpp
similarity index 100%
rename from source/quickerNES/apu/effectsBuffer.cpp
rename to source/quickerNES/core/apu/effectsBuffer.cpp
diff --git a/source/quickerNES/apu/effectsBuffer.hpp b/source/quickerNES/core/apu/effectsBuffer.hpp
similarity index 100%
rename from source/quickerNES/apu/effectsBuffer.hpp
rename to source/quickerNES/core/apu/effectsBuffer.hpp
diff --git a/source/quickerNES/apu/fme7/apu.cpp b/source/quickerNES/core/apu/fme7/apu.cpp
similarity index 100%
rename from source/quickerNES/apu/fme7/apu.cpp
rename to source/quickerNES/core/apu/fme7/apu.cpp
diff --git a/source/quickerNES/apu/fme7/apu.hpp b/source/quickerNES/core/apu/fme7/apu.hpp
similarity index 100%
rename from source/quickerNES/apu/fme7/apu.hpp
rename to source/quickerNES/core/apu/fme7/apu.hpp
diff --git a/source/quickerNES/apu/multiBuffer.cpp b/source/quickerNES/core/apu/multiBuffer.cpp
similarity index 100%
rename from source/quickerNES/apu/multiBuffer.cpp
rename to source/quickerNES/core/apu/multiBuffer.cpp
diff --git a/source/quickerNES/apu/multiBuffer.hpp b/source/quickerNES/core/apu/multiBuffer.hpp
similarity index 100%
rename from source/quickerNES/apu/multiBuffer.hpp
rename to source/quickerNES/core/apu/multiBuffer.hpp
diff --git a/source/quickerNES/apu/namco/apu.cpp b/source/quickerNES/core/apu/namco/apu.cpp
similarity index 100%
rename from source/quickerNES/apu/namco/apu.cpp
rename to source/quickerNES/core/apu/namco/apu.cpp
diff --git a/source/quickerNES/apu/namco/apu.hpp b/source/quickerNES/core/apu/namco/apu.hpp
similarity index 100%
rename from source/quickerNES/apu/namco/apu.hpp
rename to source/quickerNES/core/apu/namco/apu.hpp
diff --git a/source/quickerNES/apu/oscs.cpp b/source/quickerNES/core/apu/oscs.cpp
similarity index 100%
rename from source/quickerNES/apu/oscs.cpp
rename to source/quickerNES/core/apu/oscs.cpp
diff --git a/source/quickerNES/apu/oscs.hpp b/source/quickerNES/core/apu/oscs.hpp
similarity index 100%
rename from source/quickerNES/apu/oscs.hpp
rename to source/quickerNES/core/apu/oscs.hpp
diff --git a/source/quickerNES/apu/vrc6/apu.cpp b/source/quickerNES/core/apu/vrc6/apu.cpp
similarity index 100%
rename from source/quickerNES/apu/vrc6/apu.cpp
rename to source/quickerNES/core/apu/vrc6/apu.cpp
diff --git a/source/quickerNES/apu/vrc6/apu.hpp b/source/quickerNES/core/apu/vrc6/apu.hpp
similarity index 100%
rename from source/quickerNES/apu/vrc6/apu.hpp
rename to source/quickerNES/core/apu/vrc6/apu.hpp
diff --git a/source/quickerNES/apu/vrc7/apu.cpp b/source/quickerNES/core/apu/vrc7/apu.cpp
similarity index 100%
rename from source/quickerNES/apu/vrc7/apu.cpp
rename to source/quickerNES/core/apu/vrc7/apu.cpp
diff --git a/source/quickerNES/apu/vrc7/apu.hpp b/source/quickerNES/core/apu/vrc7/apu.hpp
similarity index 100%
rename from source/quickerNES/apu/vrc7/apu.hpp
rename to source/quickerNES/core/apu/vrc7/apu.hpp
diff --git a/source/quickerNES/apu/vrc7/emu2413.cpp b/source/quickerNES/core/apu/vrc7/emu2413.cpp
similarity index 100%
rename from source/quickerNES/apu/vrc7/emu2413.cpp
rename to source/quickerNES/core/apu/vrc7/emu2413.cpp
diff --git a/source/quickerNES/apu/vrc7/emu2413.hpp b/source/quickerNES/core/apu/vrc7/emu2413.hpp
similarity index 100%
rename from source/quickerNES/apu/vrc7/emu2413.hpp
rename to source/quickerNES/core/apu/vrc7/emu2413.hpp
diff --git a/source/quickerNES/apu/vrc7/emu2413_state.cpp b/source/quickerNES/core/apu/vrc7/emu2413_state.cpp
similarity index 100%
rename from source/quickerNES/apu/vrc7/emu2413_state.cpp
rename to source/quickerNES/core/apu/vrc7/emu2413_state.cpp
diff --git a/source/quickerNES/apu/vrc7/emu2413_state.hpp b/source/quickerNES/core/apu/vrc7/emu2413_state.hpp
similarity index 100%
rename from source/quickerNES/apu/vrc7/emu2413_state.hpp
rename to source/quickerNES/core/apu/vrc7/emu2413_state.hpp
diff --git a/source/quickerNES/cart.hpp b/source/quickerNES/core/cart.hpp
similarity index 100%
rename from source/quickerNES/cart.hpp
rename to source/quickerNES/core/cart.hpp
diff --git a/source/quickerNES/core.hpp b/source/quickerNES/core/core.hpp
similarity index 100%
rename from source/quickerNES/core.hpp
rename to source/quickerNES/core/core.hpp
diff --git a/source/quickerNES/cpu.cpp b/source/quickerNES/core/cpu.cpp
similarity index 100%
rename from source/quickerNES/cpu.cpp
rename to source/quickerNES/core/cpu.cpp
diff --git a/source/quickerNES/cpu.hpp b/source/quickerNES/core/cpu.hpp
similarity index 100%
rename from source/quickerNES/cpu.hpp
rename to source/quickerNES/core/cpu.hpp
diff --git a/source/quickerNES/emu.cpp b/source/quickerNES/core/emu.cpp
similarity index 100%
rename from source/quickerNES/emu.cpp
rename to source/quickerNES/core/emu.cpp
diff --git a/source/quickerNES/emu.hpp b/source/quickerNES/core/emu.hpp
similarity index 100%
rename from source/quickerNES/emu.hpp
rename to source/quickerNES/core/emu.hpp
diff --git a/source/quickerNES/mappers/mapper.cpp b/source/quickerNES/core/mappers/mapper.cpp
similarity index 100%
rename from source/quickerNES/mappers/mapper.cpp
rename to source/quickerNES/core/mappers/mapper.cpp
diff --git a/source/quickerNES/mappers/mapper.hpp b/source/quickerNES/core/mappers/mapper.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper.hpp
rename to source/quickerNES/core/mappers/mapper.hpp
diff --git a/source/quickerNES/mappers/mapper000.hpp b/source/quickerNES/core/mappers/mapper000.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper000.hpp
rename to source/quickerNES/core/mappers/mapper000.hpp
diff --git a/source/quickerNES/mappers/mapper001.hpp b/source/quickerNES/core/mappers/mapper001.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper001.hpp
rename to source/quickerNES/core/mappers/mapper001.hpp
diff --git a/source/quickerNES/mappers/mapper002.hpp b/source/quickerNES/core/mappers/mapper002.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper002.hpp
rename to source/quickerNES/core/mappers/mapper002.hpp
diff --git a/source/quickerNES/mappers/mapper003.hpp b/source/quickerNES/core/mappers/mapper003.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper003.hpp
rename to source/quickerNES/core/mappers/mapper003.hpp
diff --git a/source/quickerNES/mappers/mapper004.hpp b/source/quickerNES/core/mappers/mapper004.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper004.hpp
rename to source/quickerNES/core/mappers/mapper004.hpp
diff --git a/source/quickerNES/mappers/mapper005.hpp b/source/quickerNES/core/mappers/mapper005.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper005.hpp
rename to source/quickerNES/core/mappers/mapper005.hpp
diff --git a/source/quickerNES/mappers/mapper007.hpp b/source/quickerNES/core/mappers/mapper007.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper007.hpp
rename to source/quickerNES/core/mappers/mapper007.hpp
diff --git a/source/quickerNES/mappers/mapper009.hpp b/source/quickerNES/core/mappers/mapper009.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper009.hpp
rename to source/quickerNES/core/mappers/mapper009.hpp
diff --git a/source/quickerNES/mappers/mapper010.hpp b/source/quickerNES/core/mappers/mapper010.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper010.hpp
rename to source/quickerNES/core/mappers/mapper010.hpp
diff --git a/source/quickerNES/mappers/mapper011.hpp b/source/quickerNES/core/mappers/mapper011.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper011.hpp
rename to source/quickerNES/core/mappers/mapper011.hpp
diff --git a/source/quickerNES/mappers/mapper015.hpp b/source/quickerNES/core/mappers/mapper015.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper015.hpp
rename to source/quickerNES/core/mappers/mapper015.hpp
diff --git a/source/quickerNES/mappers/mapper019.hpp b/source/quickerNES/core/mappers/mapper019.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper019.hpp
rename to source/quickerNES/core/mappers/mapper019.hpp
diff --git a/source/quickerNES/mappers/mapper021.hpp b/source/quickerNES/core/mappers/mapper021.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper021.hpp
rename to source/quickerNES/core/mappers/mapper021.hpp
diff --git a/source/quickerNES/mappers/mapper022.hpp b/source/quickerNES/core/mappers/mapper022.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper022.hpp
rename to source/quickerNES/core/mappers/mapper022.hpp
diff --git a/source/quickerNES/mappers/mapper023.hpp b/source/quickerNES/core/mappers/mapper023.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper023.hpp
rename to source/quickerNES/core/mappers/mapper023.hpp
diff --git a/source/quickerNES/mappers/mapper024.hpp b/source/quickerNES/core/mappers/mapper024.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper024.hpp
rename to source/quickerNES/core/mappers/mapper024.hpp
diff --git a/source/quickerNES/mappers/mapper025.hpp b/source/quickerNES/core/mappers/mapper025.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper025.hpp
rename to source/quickerNES/core/mappers/mapper025.hpp
diff --git a/source/quickerNES/mappers/mapper026.hpp b/source/quickerNES/core/mappers/mapper026.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper026.hpp
rename to source/quickerNES/core/mappers/mapper026.hpp
diff --git a/source/quickerNES/mappers/mapper030.hpp b/source/quickerNES/core/mappers/mapper030.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper030.hpp
rename to source/quickerNES/core/mappers/mapper030.hpp
diff --git a/source/quickerNES/mappers/mapper032.hpp b/source/quickerNES/core/mappers/mapper032.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper032.hpp
rename to source/quickerNES/core/mappers/mapper032.hpp
diff --git a/source/quickerNES/mappers/mapper033.hpp b/source/quickerNES/core/mappers/mapper033.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper033.hpp
rename to source/quickerNES/core/mappers/mapper033.hpp
diff --git a/source/quickerNES/mappers/mapper034.hpp b/source/quickerNES/core/mappers/mapper034.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper034.hpp
rename to source/quickerNES/core/mappers/mapper034.hpp
diff --git a/source/quickerNES/mappers/mapper060.hpp b/source/quickerNES/core/mappers/mapper060.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper060.hpp
rename to source/quickerNES/core/mappers/mapper060.hpp
diff --git a/source/quickerNES/mappers/mapper066.hpp b/source/quickerNES/core/mappers/mapper066.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper066.hpp
rename to source/quickerNES/core/mappers/mapper066.hpp
diff --git a/source/quickerNES/mappers/mapper069.hpp b/source/quickerNES/core/mappers/mapper069.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper069.hpp
rename to source/quickerNES/core/mappers/mapper069.hpp
diff --git a/source/quickerNES/mappers/mapper070.hpp b/source/quickerNES/core/mappers/mapper070.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper070.hpp
rename to source/quickerNES/core/mappers/mapper070.hpp
diff --git a/source/quickerNES/mappers/mapper071.hpp b/source/quickerNES/core/mappers/mapper071.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper071.hpp
rename to source/quickerNES/core/mappers/mapper071.hpp
diff --git a/source/quickerNES/mappers/mapper073.hpp b/source/quickerNES/core/mappers/mapper073.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper073.hpp
rename to source/quickerNES/core/mappers/mapper073.hpp
diff --git a/source/quickerNES/mappers/mapper075.hpp b/source/quickerNES/core/mappers/mapper075.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper075.hpp
rename to source/quickerNES/core/mappers/mapper075.hpp
diff --git a/source/quickerNES/mappers/mapper078.hpp b/source/quickerNES/core/mappers/mapper078.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper078.hpp
rename to source/quickerNES/core/mappers/mapper078.hpp
diff --git a/source/quickerNES/mappers/mapper079.hpp b/source/quickerNES/core/mappers/mapper079.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper079.hpp
rename to source/quickerNES/core/mappers/mapper079.hpp
diff --git a/source/quickerNES/mappers/mapper085.hpp b/source/quickerNES/core/mappers/mapper085.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper085.hpp
rename to source/quickerNES/core/mappers/mapper085.hpp
diff --git a/source/quickerNES/mappers/mapper086.hpp b/source/quickerNES/core/mappers/mapper086.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper086.hpp
rename to source/quickerNES/core/mappers/mapper086.hpp
diff --git a/source/quickerNES/mappers/mapper087.hpp b/source/quickerNES/core/mappers/mapper087.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper087.hpp
rename to source/quickerNES/core/mappers/mapper087.hpp
diff --git a/source/quickerNES/mappers/mapper088.hpp b/source/quickerNES/core/mappers/mapper088.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper088.hpp
rename to source/quickerNES/core/mappers/mapper088.hpp
diff --git a/source/quickerNES/mappers/mapper089.hpp b/source/quickerNES/core/mappers/mapper089.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper089.hpp
rename to source/quickerNES/core/mappers/mapper089.hpp
diff --git a/source/quickerNES/mappers/mapper093.hpp b/source/quickerNES/core/mappers/mapper093.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper093.hpp
rename to source/quickerNES/core/mappers/mapper093.hpp
diff --git a/source/quickerNES/mappers/mapper094.hpp b/source/quickerNES/core/mappers/mapper094.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper094.hpp
rename to source/quickerNES/core/mappers/mapper094.hpp
diff --git a/source/quickerNES/mappers/mapper097.hpp b/source/quickerNES/core/mappers/mapper097.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper097.hpp
rename to source/quickerNES/core/mappers/mapper097.hpp
diff --git a/source/quickerNES/mappers/mapper113.hpp b/source/quickerNES/core/mappers/mapper113.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper113.hpp
rename to source/quickerNES/core/mappers/mapper113.hpp
diff --git a/source/quickerNES/mappers/mapper140.hpp b/source/quickerNES/core/mappers/mapper140.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper140.hpp
rename to source/quickerNES/core/mappers/mapper140.hpp
diff --git a/source/quickerNES/mappers/mapper152.hpp b/source/quickerNES/core/mappers/mapper152.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper152.hpp
rename to source/quickerNES/core/mappers/mapper152.hpp
diff --git a/source/quickerNES/mappers/mapper154.hpp b/source/quickerNES/core/mappers/mapper154.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper154.hpp
rename to source/quickerNES/core/mappers/mapper154.hpp
diff --git a/source/quickerNES/mappers/mapper156.hpp b/source/quickerNES/core/mappers/mapper156.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper156.hpp
rename to source/quickerNES/core/mappers/mapper156.hpp
diff --git a/source/quickerNES/mappers/mapper180.hpp b/source/quickerNES/core/mappers/mapper180.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper180.hpp
rename to source/quickerNES/core/mappers/mapper180.hpp
diff --git a/source/quickerNES/mappers/mapper184.hpp b/source/quickerNES/core/mappers/mapper184.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper184.hpp
rename to source/quickerNES/core/mappers/mapper184.hpp
diff --git a/source/quickerNES/mappers/mapper190.hpp b/source/quickerNES/core/mappers/mapper190.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper190.hpp
rename to source/quickerNES/core/mappers/mapper190.hpp
diff --git a/source/quickerNES/mappers/mapper193.hpp b/source/quickerNES/core/mappers/mapper193.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper193.hpp
rename to source/quickerNES/core/mappers/mapper193.hpp
diff --git a/source/quickerNES/mappers/mapper206.hpp b/source/quickerNES/core/mappers/mapper206.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper206.hpp
rename to source/quickerNES/core/mappers/mapper206.hpp
diff --git a/source/quickerNES/mappers/mapper207.hpp b/source/quickerNES/core/mappers/mapper207.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper207.hpp
rename to source/quickerNES/core/mappers/mapper207.hpp
diff --git a/source/quickerNES/mappers/mapper232.hpp b/source/quickerNES/core/mappers/mapper232.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper232.hpp
rename to source/quickerNES/core/mappers/mapper232.hpp
diff --git a/source/quickerNES/mappers/mapper240.hpp b/source/quickerNES/core/mappers/mapper240.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper240.hpp
rename to source/quickerNES/core/mappers/mapper240.hpp
diff --git a/source/quickerNES/mappers/mapper241.hpp b/source/quickerNES/core/mappers/mapper241.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper241.hpp
rename to source/quickerNES/core/mappers/mapper241.hpp
diff --git a/source/quickerNES/mappers/mapper244.hpp b/source/quickerNES/core/mappers/mapper244.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper244.hpp
rename to source/quickerNES/core/mappers/mapper244.hpp
diff --git a/source/quickerNES/mappers/mapper246.hpp b/source/quickerNES/core/mappers/mapper246.hpp
similarity index 100%
rename from source/quickerNES/mappers/mapper246.hpp
rename to source/quickerNES/core/mappers/mapper246.hpp
diff --git a/source/quickerNES/ppu/ppu.cpp b/source/quickerNES/core/ppu/ppu.cpp
similarity index 100%
rename from source/quickerNES/ppu/ppu.cpp
rename to source/quickerNES/core/ppu/ppu.cpp
diff --git a/source/quickerNES/ppu/ppu.hpp b/source/quickerNES/core/ppu/ppu.hpp
similarity index 100%
rename from source/quickerNES/ppu/ppu.hpp
rename to source/quickerNES/core/ppu/ppu.hpp
diff --git a/source/quickerNES/ppu/ppuImpl.cpp b/source/quickerNES/core/ppu/ppuImpl.cpp
similarity index 100%
rename from source/quickerNES/ppu/ppuImpl.cpp
rename to source/quickerNES/core/ppu/ppuImpl.cpp
diff --git a/source/quickerNES/ppu/ppuImpl.hpp b/source/quickerNES/core/ppu/ppuImpl.hpp
similarity index 100%
rename from source/quickerNES/ppu/ppuImpl.hpp
rename to source/quickerNES/core/ppu/ppuImpl.hpp
diff --git a/source/quickerNES/ppu/ppuRendering.cpp b/source/quickerNES/core/ppu/ppuRendering.cpp
similarity index 100%
rename from source/quickerNES/ppu/ppuRendering.cpp
rename to source/quickerNES/core/ppu/ppuRendering.cpp
diff --git a/source/quickerNES/ppu/ppuRendering.hpp b/source/quickerNES/core/ppu/ppuRendering.hpp
similarity index 100%
rename from source/quickerNES/ppu/ppuRendering.hpp
rename to source/quickerNES/core/ppu/ppuRendering.hpp
diff --git a/source/quickerNES/ppu/ppuSprites.hpp b/source/quickerNES/core/ppu/ppuSprites.hpp
similarity index 100%
rename from source/quickerNES/ppu/ppuSprites.hpp
rename to source/quickerNES/core/ppu/ppuSprites.hpp
diff --git a/source/quickerNES/meson.build b/source/quickerNES/meson.build
index bbda328..f939322 100644
--- a/source/quickerNES/meson.build
+++ b/source/quickerNES/meson.build
@@ -1,37 +1,37 @@
 # quickerNES Core sources
 
 quickerNESAPUSrc = [
- 'apu/apu.cpp', 
- 'apu/oscs.cpp', 
- 'apu/buffer.cpp', 
- 'apu/blipBuffer.cpp', 
- 'apu/NESEffectsBuffer.cpp', 
- 'apu/effectsBuffer.cpp', 
- 'apu/multiBuffer.cpp',
- 'apu/namco/apu.cpp', 
- 'apu/vrc6/apu.cpp', 
- 'apu/vrc7/emu2413.cpp', 
- 'apu/vrc7/emu2413_state.cpp', 
- 'apu/vrc7/apu.cpp',
- 'apu/fme7/apu.cpp', 
+ 'core/apu/apu.cpp', 
+ 'core/apu/oscs.cpp', 
+ 'core/apu/buffer.cpp', 
+ 'core/apu/blipBuffer.cpp', 
+ 'core/apu/NESEffectsBuffer.cpp', 
+ 'core/apu/effectsBuffer.cpp', 
+ 'core/apu/multiBuffer.cpp',
+ 'core/apu/namco/apu.cpp', 
+ 'core/apu/vrc6/apu.cpp', 
+ 'core/apu/vrc7/emu2413.cpp', 
+ 'core/apu/vrc7/emu2413_state.cpp', 
+ 'core/apu/vrc7/apu.cpp',
+ 'core/apu/fme7/apu.cpp', 
 ]
 
 quickerNESPPUSrc = [
- 'ppu/ppu.cpp', 
- 'ppu/ppuImpl.cpp', 
- 'ppu/ppuRendering.cpp',
+ 'core/ppu/ppu.cpp', 
+ 'core/ppu/ppuImpl.cpp', 
+ 'core/ppu/ppuRendering.cpp',
 ]
 
 quickerNESSrc = quickerNESAPUSrc + quickerNESPPUSrc + [
- 'mappers/mapper.cpp', 
- 'emu.cpp', 
- 'cpu.cpp'
+ 'core/mappers/mapper.cpp', 
+ 'core/emu.cpp', 
+ 'core/cpu.cpp'
 ]
 
 # quickerNES Core Configuration
 
  quickerNESDependency = declare_dependency(
   compile_args        : [ '-D_USE_QUICKERNES', '-D_PAGE_SIZE="' + pageSize.to_string() + '"'],
-  include_directories : include_directories(['.']),
+  include_directories : include_directories(['.', 'core']),
   sources             : [ quickerNESSrc ]
  )
\ No newline at end of file
diff --git a/source/quickerNES/quickerNESInstance.hpp b/source/quickerNES/quickerNESInstance.hpp
index 747d1b5..a226b73 100644
--- a/source/quickerNES/quickerNESInstance.hpp
+++ b/source/quickerNES/quickerNESInstance.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <quickerNES/emu.hpp>
+#include <core/emu.hpp>
 #include <emuInstance.hpp>
 
 namespace quickerNES