34 files changed, 255 insertions, 251 deletions

diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index eee2f6240..e5df2d971 100644
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "common.h"
-#include "common_types.h"
+#include "common/common.h"
+#include "common/common_types.h"
 
 /// Generic ARM11 CPU interface
 class ARM_Interface {
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp
index 82ca5ee8d..db1567498 100644
--- a/src/core/arm/disassembler/arm_disasm.cpp
+++ b/src/core/arm/disassembler/arm_disasm.cpp
@@ -2,7 +2,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "arm_disasm.h"
+
+#include "core/arm/disassembler/arm_disasm.h"
 
 static const char *cond_names[] = {
     "eq",
diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h
index 074149f1b..03b781c6d 100644
--- a/src/core/arm/interpreter/arm_interpreter.h
+++ b/src/core/arm/interpreter/arm_interpreter.h
@@ -24,12 +24,11 @@
 
 #pragma once
 
-#include "common.h"
-#include "common_types.h"
-#include "arm/arm_interface.h"
+#include "common/common.h"
 
-#include "arm/interpreter/armdefs.h"
-#include "arm/interpreter/armemu.h"
+#include "core/arm/arm_interface.h"
+#include "core/arm/interpreter/armdefs.h"
+#include "core/arm/interpreter/armemu.h"
 
 class ARM_Interpreter : virtual public ARM_Interface {
 public:
diff --git a/src/core/arm/interpreter/armcpu.h b/src/core/arm/interpreter/armcpu.h
index d7e336b94..6b5ea8566 100644
--- a/src/core/arm/interpreter/armcpu.h
+++ b/src/core/arm/interpreter/armcpu.h
@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "thread.h"
+#include "common/thread.h"
 
 
 typedef struct ARM_CPU_State_s {
diff --git a/src/core/arm/interpreter/armdefs.h b/src/core/arm/interpreter/armdefs.h
index 0136a52d2..30b5b689c 100644
--- a/src/core/arm/interpreter/armdefs.h
+++ b/src/core/arm/interpreter/armdefs.h
@@ -32,7 +32,7 @@
 //#include "portable/mman.h"
 
 #include "arm_regformat.h"
-#include "platform.h"
+#include "common/platform.h"
 #include "skyeye_defs.h"
 
 //AJ2D--------------------------------------------------------------------------
@@ -82,7 +82,7 @@
 //teawater add DBCT_TEST_SPEED 2005.10.04---------------------------------------
 #include <signal.h>
 
-#include "platform.h"
+#include "common/platform.h"
 
 #if EMU_PLATFORM == PLATFORM_LINUX
 #include <sys/time.h>
diff --git a/src/core/arm/interpreter/armemu.h b/src/core/arm/interpreter/armemu.h
index 2ab317fdd..7391dea7f 100644
--- a/src/core/arm/interpreter/armemu.h
+++ b/src/core/arm/interpreter/armemu.h
@@ -17,7 +17,7 @@
 #ifndef __ARMEMU_H__
 #define __ARMEMU_H__
 
-#include "common.h"
+#include "common/common.h"
 #include "armdefs.h"
 //#include "skyeye.h"
 
diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp
index f48232eec..cdbd02f3c 100644
--- a/src/core/arm/interpreter/arminit.cpp
+++ b/src/core/arm/interpreter/arminit.cpp
@@ -16,7 +16,7 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 
-#include "platform.h"
+#include "common/platform.h"
 #if EMU_PLATFORM == PLATFORM_LINUX
 #include <unistd.h>
 #endif
diff --git a/src/core/arm/interpreter/armmmu.h b/src/core/arm/interpreter/armmmu.h
index c28d8753e..8b24e6151 100644
--- a/src/core/arm/interpreter/armmmu.h
+++ b/src/core/arm/interpreter/armmmu.h
@@ -172,18 +172,18 @@ typedef struct mmu_ops_s
 } mmu_ops_t;
 
 
-#include "arm/mmu/tlb.h"
-#include "arm/mmu/rb.h"
-#include "arm/mmu/wb.h"
-#include "arm/mmu/cache.h"
+#include "core/arm/mmu/tlb.h"
+#include "core/arm/mmu/rb.h"
+#include "core/arm/mmu/wb.h"
+#include "core/arm/mmu/cache.h"
 
 /*special process mmu.h*/
-//#include "arm/mmu/sa_mmu.h"
-//#include "arm/mmu/arm7100_mmu.h"
-//#include "arm/mmu/arm920t_mmu.h"
-//#include "arm/mmu/arm926ejs_mmu.h"
-#include "arm/mmu/arm1176jzf_s_mmu.h"
-//#include "arm/mmu/cortex_a9_mmu.h"
+//#include "core/arm/mmu/sa_mmu.h"
+//#include "core/arm/mmu/arm7100_mmu.h"
+//#include "core/arm/mmu/arm920t_mmu.h"
+//#include "core/arm/mmu/arm926ejs_mmu.h"
+#include "core/arm/mmu/arm1176jzf_s_mmu.h"
+//#include "core/arm/mmu/cortex_a9_mmu.h"
 
 typedef struct mmu_state_t
 {
diff --git a/src/core/arm/interpreter/skyeye_defs.h b/src/core/arm/interpreter/skyeye_defs.h
index 6562e595a..b6713ebad 100644
--- a/src/core/arm/interpreter/skyeye_defs.h
+++ b/src/core/arm/interpreter/skyeye_defs.h
@@ -1,7 +1,7 @@
 #ifndef CORE_ARM_SKYEYE_DEFS_H_
 #define CORE_ARM_SKYEYE_DEFS_H_
 
-#include "common.h"
+#include "common/common.h"
 
 #define MODE32
 #define MODET
diff --git a/src/core/arm/mmu/arm1176jzf_s_mmu.cpp b/src/core/arm/mmu/arm1176jzf_s_mmu.cpp
index 0a3206abb..7e7fbfbfa 100644
--- a/src/core/arm/mmu/arm1176jzf_s_mmu.cpp
+++ b/src/core/arm/mmu/arm1176jzf_s_mmu.cpp
@@ -22,11 +22,11 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "mem_map.h"
+#include "core/mem_map.h"
 
-#include "arm/interpreter/skyeye_defs.h"
+#include "core/arm/interpreter/skyeye_defs.h"
 
-#include "arm/interpreter/armdefs.h"
+#include "core/arm/interpreter/armdefs.h"
 //#include "bank_defs.h"
 #if 0
 #define TLB_SIZE 1024 * 1024
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 540b20f27..28f6b6c58 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -2,12 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "log.h"
-#include "core.h"
-#include "mem_map.h"
-#include "hw/hw.h"
-#include "arm/disassembler/arm_disasm.h"
-#include "arm/interpreter/arm_interpreter.h"
+#include "common/common_types.h"
+#include "common/log.h"
+#include "core/core.h"
+
+#include "core/mem_map.h"
+#include "core/hw/hw.h"
+#include "core/arm/disassembler/arm_disasm.h"
+#include "core/arm/interpreter/arm_interpreter.h"
 
 namespace Core {
 
diff --git a/src/core/core.h b/src/core/core.h
index bae9f3e3d..4b42dabcb 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "arm/arm_interface.h"
-#include "arm/interpreter/armdefs.h"
+#include "core/arm/arm_interface.h"
+#include "core/arm/interpreter/armdefs.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 2edb51214..1800b5512 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -137,59 +137,59 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\arm\disassembler\arm_disasm.cpp" />
-    <ClCompile Include="src\arm\interpreter\armemu.cpp" />
-    <ClCompile Include="src\arm\interpreter\arminit.cpp" />
-    <ClCompile Include="src\arm\interpreter\armmmu.cpp" />
-    <ClCompile Include="src\arm\interpreter\armos.cpp" />
-    <ClCompile Include="src\arm\interpreter\armsupp.cpp" />
-    <ClCompile Include="src\arm\interpreter\armvirt.cpp" />
-    <ClCompile Include="src\arm\interpreter\arm_interpreter.cpp" />
-    <ClCompile Include="src\arm\interpreter\thumbemu.cpp" />
-    <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp" />
-    <ClCompile Include="src\core.cpp" />
-    <ClCompile Include="src\core_timing.cpp" />
-    <ClCompile Include="src\elf\elf_reader.cpp" />
-    <ClCompile Include="src\file_sys\directory_file_system.cpp" />
-    <ClCompile Include="src\file_sys\meta_file_system.cpp" />
-    <ClCompile Include="src\hw\hw.cpp" />
-    <ClCompile Include="src\hw\hw_lcd.cpp" />
-    <ClCompile Include="src\loader.cpp" />
-    <ClCompile Include="src\mem_map.cpp" />
-    <ClCompile Include="src\mem_map_funcs.cpp" />
-    <ClCompile Include="src\system.cpp" />
+    <ClCompile Include="arm\disassembler\arm_disasm.cpp" />
+    <ClCompile Include="arm\interpreter\armemu.cpp" />
+    <ClCompile Include="arm\interpreter\arminit.cpp" />
+    <ClCompile Include="arm\interpreter\armmmu.cpp" />
+    <ClCompile Include="arm\interpreter\armos.cpp" />
+    <ClCompile Include="arm\interpreter\armsupp.cpp" />
+    <ClCompile Include="arm\interpreter\armvirt.cpp" />
+    <ClCompile Include="arm\interpreter\arm_interpreter.cpp" />
+    <ClCompile Include="arm\interpreter\thumbemu.cpp" />
+    <ClCompile Include="arm\mmu\arm1176jzf_s_mmu.cpp" />
+    <ClCompile Include="core.cpp" />
+    <ClCompile Include="core_timing.cpp" />
+    <ClCompile Include="elf\elf_reader.cpp" />
+    <ClCompile Include="file_sys\directory_file_system.cpp" />
+    <ClCompile Include="file_sys\meta_file_system.cpp" />
+    <ClCompile Include="hw\hw.cpp" />
+    <ClCompile Include="hw\hw_lcd.cpp" />
+    <ClCompile Include="loader.cpp" />
+    <ClCompile Include="mem_map.cpp" />
+    <ClCompile Include="mem_map_funcs.cpp" />
+    <ClCompile Include="system.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\arm\arm_interface.h" />
-    <ClInclude Include="src\arm\disassembler\arm_disasm.h" />
-    <ClInclude Include="src\arm\interpreter\armcpu.h" />
-    <ClInclude Include="src\arm\interpreter\armdefs.h" />
-    <ClInclude Include="src\arm\interpreter\armemu.h" />
-    <ClInclude Include="src\arm\interpreter\armmmu.h" />
-    <ClInclude Include="src\arm\interpreter\armos.h" />
-    <ClInclude Include="src\arm\interpreter\arm_interpreter.h" />
-    <ClInclude Include="src\arm\interpreter\arm_regformat.h" />
-    <ClInclude Include="src\arm\interpreter\skyeye_defs.h" />
-    <ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h" />
-    <ClInclude Include="src\arm\mmu\cache.h" />
-    <ClInclude Include="src\arm\mmu\rb.h" />
-    <ClInclude Include="src\arm\mmu\tlb.h" />
-    <ClInclude Include="src\arm\mmu\wb.h" />
-    <ClInclude Include="src\core.h" />
-    <ClInclude Include="src\core_timing.h" />
-    <ClInclude Include="src\elf\elf_reader.h" />
-    <ClInclude Include="src\elf\elf_types.h" />
-    <ClInclude Include="src\file_sys\directory_file_system.h" />
-    <ClInclude Include="src\file_sys\file_sys.h" />
-    <ClInclude Include="src\file_sys\meta_file_system.h" />
-    <ClInclude Include="src\hw\hw.h" />
-    <ClInclude Include="src\hw\hw_lcd.h" />
-    <ClInclude Include="src\loader.h" />
-    <ClInclude Include="src\mem_map.h" />
-    <ClInclude Include="src\system.h" />
+    <ClInclude Include="arm\arm_interface.h" />
+    <ClInclude Include="arm\disassembler\arm_disasm.h" />
+    <ClInclude Include="arm\interpreter\armcpu.h" />
+    <ClInclude Include="arm\interpreter\armdefs.h" />
+    <ClInclude Include="arm\interpreter\armemu.h" />
+    <ClInclude Include="arm\interpreter\armmmu.h" />
+    <ClInclude Include="arm\interpreter\armos.h" />
+    <ClInclude Include="arm\interpreter\arm_interpreter.h" />
+    <ClInclude Include="arm\interpreter\arm_regformat.h" />
+    <ClInclude Include="arm\interpreter\skyeye_defs.h" />
+    <ClInclude Include="arm\mmu\arm1176jzf_s_mmu.h" />
+    <ClInclude Include="arm\mmu\cache.h" />
+    <ClInclude Include="arm\mmu\rb.h" />
+    <ClInclude Include="arm\mmu\tlb.h" />
+    <ClInclude Include="arm\mmu\wb.h" />
+    <ClInclude Include="core.h" />
+    <ClInclude Include="core_timing.h" />
+    <ClInclude Include="elf\elf_reader.h" />
+    <ClInclude Include="elf\elf_types.h" />
+    <ClInclude Include="file_sys\directory_file_system.h" />
+    <ClInclude Include="file_sys\file_sys.h" />
+    <ClInclude Include="file_sys\meta_file_system.h" />
+    <ClInclude Include="hw\hw.h" />
+    <ClInclude Include="hw\hw_lcd.h" />
+    <ClInclude Include="loader.h" />
+    <ClInclude Include="mem_map.h" />
+    <ClInclude Include="system.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
index 0cd208dd6..2efac8127 100644
--- a/src/core/core.vcxproj.filters
+++ b/src/core/core.vcxproj.filters
@@ -1,158 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="src\core.cpp" />
-    <ClCompile Include="src\arm\disassembler\arm_disasm.cpp">
+    <Filter Include="arm">
+      <UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="arm\disassembler">
+      <UniqueIdentifier>{61100188-a726-4024-ab16-95ee242b446e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="arm\mmu">
+      <UniqueIdentifier>{a64d3c8a-747a-491b-b782-6e2622bedf24}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="file_sys">
+      <UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="arm\interpreter">
+      <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="hw">
+      <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="elf">
+      <UniqueIdentifier>{7ae34319-6d72-4d12-bc62-9b438ba9241f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="arm\disassembler\arm_disasm.cpp">
       <Filter>arm\disassembler</Filter>
     </ClCompile>
-    <ClCompile Include="src\mem_map.cpp" />
-    <ClCompile Include="src\mem_map_funcs.cpp" />
-    <ClCompile Include="src\loader.cpp" />
-    <ClCompile Include="src\file_sys\directory_file_system.cpp">
-      <Filter>file_sys</Filter>
-    </ClCompile>
-    <ClCompile Include="src\file_sys\meta_file_system.cpp">
-      <Filter>file_sys</Filter>
-    </ClCompile>
-    <ClCompile Include="src\system.cpp" />
-    <ClCompile Include="src\core_timing.cpp" />
-    <ClCompile Include="src\elf\elf_reader.cpp">
-      <Filter>elf</Filter>
-    </ClCompile>
-    <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp">
-      <Filter>arm\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armemu.cpp">
+    <ClCompile Include="arm\interpreter\arm_interpreter.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\arminit.cpp">
+    <ClCompile Include="arm\interpreter\armemu.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armmmu.cpp">
+    <ClCompile Include="arm\interpreter\arminit.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armos.cpp">
+    <ClCompile Include="arm\interpreter\armmmu.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armsupp.cpp">
+    <ClCompile Include="arm\interpreter\armos.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armvirt.cpp">
+    <ClCompile Include="arm\interpreter\armsupp.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\thumbemu.cpp">
+    <ClCompile Include="arm\interpreter\armvirt.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\arm_interpreter.cpp">
+    <ClCompile Include="arm\interpreter\thumbemu.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\hw\hw.cpp">
+    <ClCompile Include="arm\mmu\arm1176jzf_s_mmu.cpp">
+      <Filter>arm\mmu</Filter>
+    </ClCompile>
+    <ClCompile Include="file_sys\directory_file_system.cpp">
+      <Filter>file_sys</Filter>
+    </ClCompile>
+    <ClCompile Include="file_sys\meta_file_system.cpp">
+      <Filter>file_sys</Filter>
+    </ClCompile>
+    <ClCompile Include="hw\hw.cpp">
       <Filter>hw</Filter>
     </ClCompile>
-    <ClCompile Include="src\hw\hw_lcd.cpp">
+    <ClCompile Include="hw\hw_lcd.cpp">
       <Filter>hw</Filter>
     </ClCompile>
+    <ClCompile Include="elf\elf_reader.cpp">
+      <Filter>elf</Filter>
+    </ClCompile>
+    <ClCompile Include="core.cpp" />
+    <ClCompile Include="loader.cpp" />
+    <ClCompile Include="mem_map.cpp" />
+    <ClCompile Include="mem_map_funcs.cpp" />
+    <ClCompile Include="system.cpp" />
+    <ClCompile Include="core_timing.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Filter Include="arm">
-      <UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\disassembler">
-      <UniqueIdentifier>{61100188-a726-4024-ab16-95ee242b446e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\mmu">
-      <UniqueIdentifier>{a64d3c8a-747a-491b-b782-6e2622bedf24}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="file_sys">
-      <UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="elf">
-      <UniqueIdentifier>{671d3218-3771-4218-b142-1f9a1cc24a51}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hle">
-      <UniqueIdentifier>{794616f8-739f-4643-9c3f-869e50831d4f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\interpreter">
-      <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hw">
-      <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\arm\disassembler\arm_disasm.h">
+    <ClInclude Include="arm\disassembler\arm_disasm.h">
       <Filter>arm\disassembler</Filter>
     </ClInclude>
-    <ClInclude Include="src\mem_map.h" />
-    <ClInclude Include="src\core.h" />
-    <ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h">
+    <ClInclude Include="arm\interpreter\arm_interpreter.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\arm_regformat.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armcpu.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armdefs.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armemu.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armmmu.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armos.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\skyeye_defs.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\mmu\arm1176jzf_s_mmu.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\mmu\cache.h">
+    <ClInclude Include="arm\mmu\cache.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\mmu\rb.h">
+    <ClInclude Include="arm\mmu\rb.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\mmu\tlb.h">
+    <ClInclude Include="arm\mmu\tlb.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\mmu\wb.h">
+    <ClInclude Include="arm\mmu\wb.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\loader.h" />
-    <ClInclude Include="src\file_sys\file_sys.h">
+    <ClInclude Include="file_sys\directory_file_system.h">
       <Filter>file_sys</Filter>
     </ClInclude>
-    <ClInclude Include="src\file_sys\directory_file_system.h">
+    <ClInclude Include="file_sys\file_sys.h">
       <Filter>file_sys</Filter>
     </ClInclude>
-    <ClInclude Include="src\file_sys\meta_file_system.h">
+    <ClInclude Include="file_sys\meta_file_system.h">
       <Filter>file_sys</Filter>
     </ClInclude>
-    <ClInclude Include="src\system.h" />
-    <ClInclude Include="src\core_timing.h" />
-    <ClInclude Include="src\elf\elf_reader.h">
-      <Filter>elf</Filter>
-    </ClInclude>
-    <ClInclude Include="src\elf\elf_types.h">
-      <Filter>elf</Filter>
-    </ClInclude>
-    <ClInclude Include="src\arm\interpreter\arm_regformat.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armcpu.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armdefs.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armemu.h">
-      <Filter>arm\interpreter</Filter>
+    <ClInclude Include="hw\hw.h">
+      <Filter>hw</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armmmu.h">
-      <Filter>arm\interpreter</Filter>
+    <ClInclude Include="hw\hw_lcd.h">
+      <Filter>hw</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armos.h">
-      <Filter>arm\interpreter</Filter>
+    <ClInclude Include="elf\elf_reader.h">
+      <Filter>elf</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\interpreter\skyeye_defs.h">
-      <Filter>arm\interpreter</Filter>
+    <ClInclude Include="elf\elf_types.h">
+      <Filter>elf</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\arm_interface.h">
+    <ClInclude Include="arm\arm_interface.h">
       <Filter>arm</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\interpreter\arm_interpreter.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="src\hw\hw.h">
-      <Filter>hw</Filter>
-    </ClInclude>
-    <ClInclude Include="src\hw\hw_lcd.h">
-      <Filter>hw</Filter>
-    </ClInclude>
+    <ClInclude Include="core.h" />
+    <ClInclude Include="core_timing.h" />
+    <ClInclude Include="loader.h" />
+    <ClInclude Include="mem_map.h" />
+    <ClInclude Include="system.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 78bbaafe2..a4fc0aaa4 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -5,12 +5,13 @@
 #include <vector>
 #include <cstdio>
 
-#include "msg_handler.h"
-#include "std_mutex.h"
-#include "atomic.h"
-#include "core_timing.h"
-#include "core.h"
-#include "chunk_file.h"
+#include "common/msg_handler.h"
+#include "common/std_mutex.h"
+#include "common/atomic.h"
+#include "common/chunk_file.h"
+
+#include "core/core_timing.h"
+#include "core/core.h"
 
 int g_clock_rate_arm11 = 268123480;
 
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index b62acea6c..09fdf7a90 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -17,7 +17,7 @@
 // inside callback:
 //   ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
 
-#include "common.h"
+#include "common/common.h"
 
 class PointerWrap;
 
diff --git a/src/core/elf/elf_reader.cpp b/src/core/elf/elf_reader.cpp
index aef7c13e9..2b03caa0f 100644
--- a/src/core/elf/elf_reader.cpp
+++ b/src/core/elf/elf_reader.cpp
@@ -4,10 +4,11 @@
 
 #include <string>
 
-#include "common.h"
-#include "mem_map.h"
+#include "common/common.h"
+
+#include "core/mem_map.h"
+#include "core/elf/elf_reader.h"
 
-#include "elf/elf_reader.h"
 //#include "Core/Debugger/Debugger_SymbolMap.h"
 //#include "Core/HW/Memmap.h"
 //#include "Core/PowerPC/PPCSymbolDB.h"
diff --git a/src/core/elf/elf_reader.h b/src/core/elf/elf_reader.h
index 9393a589d..3e2869f87 100644
--- a/src/core/elf/elf_reader.h
+++ b/src/core/elf/elf_reader.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "elf/elf_types.h"
+#include "core/elf/elf_types.h"
 
 enum KnownElfTypes
 {
diff --git a/src/core/file_sys/directory_file_system.cpp b/src/core/file_sys/directory_file_system.cpp
index 29369eec4..6c6f33c2b 100644
--- a/src/core/file_sys/directory_file_system.cpp
+++ b/src/core/file_sys/directory_file_system.cpp
@@ -15,13 +15,11 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "chunk_file.h"
-#include "file_util.h"
-#include "directory_file_system.h"
-//#include "ISOFileSystem.h"
-//#include "Core/HLE/sceKernel.h"
-//#include "file/zip_read.h"
-#include "utf8.h"
+#include "common/chunk_file.h"
+#include "common/file_util.h"
+#include "common/utf8.h"
+
+#include "core/file_sys/directory_file_system.h"
 
 #if EMU_PLATFORM == PLATFORM_WINDOWS
 #include <windows.h>
diff --git a/src/core/file_sys/directory_file_system.h b/src/core/file_sys/directory_file_system.h
index a11331a27..9af2854a2 100644
--- a/src/core/file_sys/directory_file_system.h
+++ b/src/core/file_sys/directory_file_system.h
@@ -15,14 +15,13 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#ifndef CORE_FILE_SYS_DIRECTORY_H_
-#define CORE_FILE_SYS_DIRECTORY_H_
+#pragma once
 
 // TODO: Remove the Windows-specific code, FILE is fine there too.
 
 #include <map>
 
-#include "file_sys.h"
+#include "core/file_sys/file_sys.h"
 
 #ifdef _WIN32
 typedef void * HANDLE;
@@ -154,5 +153,3 @@ private:
 
 	std::string GetLocalPath(std::string localpath);
 };
-
-#endif // CORE_FILE_SYS_DIRECTORY_H_
diff --git a/src/core/file_sys/file_sys.h b/src/core/file_sys/file_sys.h
index b27e36c80..bb8503e62 100644
--- a/src/core/file_sys/file_sys.h
+++ b/src/core/file_sys/file_sys.h
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "common.h"
-#include "chunk_file.h"
+#include "common/common.h"
+#include "common/chunk_file.h"
 
 enum FileAccess {
 	FILEACCESS_NONE=0,
diff --git a/src/core/file_sys/meta_file_system.cpp b/src/core/file_sys/meta_file_system.cpp
index f86c3cb18..01048e498 100644
--- a/src/core/file_sys/meta_file_system.cpp
+++ b/src/core/file_sys/meta_file_system.cpp
@@ -17,10 +17,9 @@
 
 #include <set>
 #include <algorithm>
-#include "string_util.h"
-#include "file_sys/meta_file_system.h"
-//#include "Core/HLE/sceKernelThread.h"
-//#include "Core/Reporting.h"
+
+#include "common/string_util.h"
+#include "core/file_sys/meta_file_system.h"
 
 static bool ApplyPathStringToComponentsVector(std::vector<std::string> &vector, const std::string &pathString)
 {
diff --git a/src/core/file_sys/meta_file_system.h b/src/core/file_sys/meta_file_system.h
index 0de23d49c..961f75cda 100644
--- a/src/core/file_sys/meta_file_system.h
+++ b/src/core/file_sys/meta_file_system.h
@@ -17,8 +17,9 @@
 
 #pragma once
 
-#include "std_mutex.h"
-#include "file_sys.h"
+#include "common/std_mutex.h"
+
+#include "core/file_sys/file_sys.h"
 
 class MetaFileSystem : public IHandleAllocator, public IFileSystem
 {
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index 57be4d6a8..44625e3af 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -2,9 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "log.h"
-#include "hw/hw.h"
-#include "hw/hw_lcd.h"
+#include "common/common_types.h"
+#include "common/log.h"
+
+#include "core/hw/hw.h"
+#include "core/hw/hw_lcd.h"
 
 namespace HW {
 
diff --git a/src/core/hw/hw.h b/src/core/hw/hw.h
index 5b0cc8c87..92e9304ca 100644
--- a/src/core/hw/hw.h
+++ b/src/core/hw/hw.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "common_types.h"
+#include "common/common_types.h"
 
 namespace HW {
 
diff --git a/src/core/hw/hw_lcd.cpp b/src/core/hw/hw_lcd.cpp
index ad346c794..fd783a84a 100644
--- a/src/core/hw/hw_lcd.cpp
+++ b/src/core/hw/hw_lcd.cpp
@@ -2,10 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "log.h"
-#include "core.h"
-#include "hw_lcd.h"
-#include "video_core.h"
+#include "common/common_types.h"
+#include "common/log.h"
+
+#include "core/core.h"
+#include "core/hw/hw_lcd.h"
+
+#include "video_core/video_core.h"
 
 namespace LCD {
 
diff --git a/src/core/hw/hw_lcd.h b/src/core/hw/hw_lcd.h
index 30e347ccb..386ed6004 100644
--- a/src/core/hw/hw_lcd.h
+++ b/src/core/hw/hw_lcd.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "common_types.h"
+#include "common/common_types.h"
 
 namespace LCD {
 
diff --git a/src/core/loader.cpp b/src/core/loader.cpp
index 5d039dc94..8c6d54a68 100644
--- a/src/core/loader.cpp
+++ b/src/core/loader.cpp
@@ -2,12 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "file_util.h"
-#include "loader.h"
-#include "system.h"
-#include "core.h"
-#include "file_sys/directory_file_system.h"
-#include "elf/elf_reader.h"
+#include "common/common_types.h"
+#include "common/file_util.h"
+
+#include "core/loader.h"
+#include "core/system.h"
+#include "core/core.h"
+#include "core/file_sys/directory_file_system.h"
+#include "core/elf/elf_reader.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/core/loader.h b/src/core/loader.h
index 46525fcf8..3dd8c471d 100644
--- a/src/core/loader.h
+++ b/src/core/loader.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "common.h"
+#include "common/common.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index 96f77d32e..96f8d0440 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "common.h"
-#include "mem_arena.h"
+#include "common/common.h"
+#include "common/mem_arena.h"
 
-#include "mem_map.h"
-#include "core.h"
+#include "core/mem_map.h"
+#include "core/core.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index ad5abd16d..1a3bd7234 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -6,8 +6,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "common.h"
-#include "common_types.h"
+#include "common/common.h"
+#include "common/common_types.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index 7d8ae2915..4c0e08b3f 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "common.h"
+#include "common/common.h"
 
-#include "mem_map.h"
-#include "hw/hw.h"
+#include "core/mem_map.h"
+#include "core/hw/hw.h"
 
 namespace Memory {
 
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 1fc272d70..edb07fef5 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -2,12 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "core.h"
-#include "hw/hw.h"
-#include "core_timing.h"
-#include "mem_map.h"
-#include "system.h"
-#include "video_core.h"
+#include "core/core.h"
+#include "core/core_timing.h"
+#include "core/mem_map.h"
+#include "core/system.h"
+#include "core/hw/hw.h"
+
+#include "video_core/video_core.h"
 
 namespace System {
 
diff --git a/src/core/system.h b/src/core/system.h
index 8e94e5252..09f1f6ebe 100644
--- a/src/core/system.h
+++ b/src/core/system.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "emu_window.h"
-#include "file_sys/meta_file_system.h"
+#include "common/emu_window.h"
+#include "core/file_sys/meta_file_system.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////