Homogeneizing folder structure

.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

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 ]
  )

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 ]
  )