Remove unnecessary Src/ folders

.gitignore

@@ -3,7 +3,7 @@ Thumbs.db
 # Ignore Finder view option files created by OS X
 .DS_Store
 # Ignore autogenerated source files
-Source/Core/Common/Src/scmrev.h
+Source/Core/Common/scmrev.h
 # Ignore files output by build
 /[Bb]uild/
 /[Bb]inary/

CMakeLists.txt

@@ -493,16 +493,16 @@ endif()
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #
-include_directories(Source/Core/AudioCommon/Src)
-include_directories(Source/Core/Common/Src)
-include_directories(Source/Core/Core/Src)
-include_directories(Source/Core/DebuggerUICommon/Src)
-include_directories(Source/Core/DebuggerWX/Src)
-include_directories(Source/Core/DiscIO/Src)
-include_directories(Source/Core/DolphinWX/Src)
-include_directories(Source/Core/InputCommon/Src)
-include_directories(Source/Core/VideoCommon/Src)
-include_directories(Source/Core/VideoUICommon/Src)
+include_directories(Source/Core/AudioCommon)
+include_directories(Source/Core/Common)
+include_directories(Source/Core/Core)
+include_directories(Source/Core/DebuggerUICommon)
+include_directories(Source/Core/DebuggerWX)
+include_directories(Source/Core/DiscIO)
+include_directories(Source/Core/DolphinWX)
+include_directories(Source/Core/InputCommon)
+include_directories(Source/Core/VideoCommon)
+include_directories(Source/Core/VideoUICommon)
 
 ########################################
 # Process externals and setup their include directories
@@ -762,13 +762,13 @@ else()
 	set(DOLPHIN_WC_IS_MASTER "0")
 endif()
 
-file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h
+file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h
 	"#define SCM_REV_STR \"" ${DOLPHIN_WC_REVISION} "\"\n"
 	"#define SCM_DESC_STR \"" ${DOLPHIN_WC_DESCRIBE} "\"\n"
 	"#define SCM_BRANCH_STR \"" ${DOLPHIN_WC_BRANCH} "\"\n"
 	"#define SCM_IS_MASTER " ${DOLPHIN_WC_IS_MASTER} "\n"
 	)
-include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src")
+include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common")
 
 
 ########################################

Source/Core/AudioCommon/AudioCommon.cpp

@@ -15,8 +15,8 @@
 #include "OpenALStream.h"
 #include "PulseAudioStream.h"
 #include "OpenSLESStream.h"
-#include "../../Core/Src/Movie.h"
-#include "../../Core/Src/ConfigManager.h"
+#include "../Core/Movie.h"
+#include "../Core/ConfigManager.h"
 
 // This shouldn't be a global, at least not here.
 SoundStream *soundStream = nullptr;

Source/Core/AudioCommon/AudioCommon.vcxproj

@@ -43,40 +43,40 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="Src\aldlist.cpp" />
-    <ClCompile Include="Src\AudioCommon.cpp" />
-    <ClCompile Include="Src\DPL2Decoder.cpp" />
-    <ClCompile Include="Src\DSoundStream.cpp" />
-    <ClCompile Include="Src\Mixer.cpp" />
-    <ClCompile Include="Src\NullSoundStream.cpp" />
-    <ClCompile Include="Src\OpenALStream.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
+    <ClCompile Include="aldlist.cpp" />
+    <ClCompile Include="AudioCommon.cpp" />
+    <ClCompile Include="DPL2Decoder.cpp" />
+    <ClCompile Include="DSoundStream.cpp" />
+    <ClCompile Include="Mixer.cpp" />
+    <ClCompile Include="NullSoundStream.cpp" />
+    <ClCompile Include="OpenALStream.cpp" />
+    <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Src\WaveFile.cpp" />
-    <ClCompile Include="Src\XAudio2Stream.cpp" />
-    <ClCompile Include="Src\XAudio2_7Stream.cpp">
+    <ClCompile Include="WaveFile.cpp" />
+    <ClCompile Include="XAudio2Stream.cpp" />
+    <ClCompile Include="XAudio2_7Stream.cpp">
       <AdditionalIncludeDirectories Condition="Exists('$(DXSDK_DIR)')">$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\aldlist.h" />
-    <ClInclude Include="Src\AlsaSoundStream.h" />
-    <ClInclude Include="Src\AOSoundStream.h" />
-    <ClInclude Include="Src\AudioCommon.h" />
-    <ClInclude Include="Src\CoreAudioSoundStream.h" />
-    <ClInclude Include="Src\DPL2Decoder.h" />
-    <ClInclude Include="Src\DSoundStream.h" />
-    <ClInclude Include="Src\Mixer.h" />
-    <ClInclude Include="Src\NullSoundStream.h" />
-    <ClInclude Include="Src\OpenALStream.h" />
-    <ClInclude Include="Src\OpenSLESStream.h" />
-    <ClInclude Include="Src\PulseAudioStream.h" />
-    <ClInclude Include="Src\SoundStream.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\WaveFile.h" />
-    <ClInclude Include="Src\XAudio2Stream.h" />
-    <ClInclude Include="Src\XAudio2_7Stream.h" />
+    <ClInclude Include="aldlist.h" />
+    <ClInclude Include="AlsaSoundStream.h" />
+    <ClInclude Include="AOSoundStream.h" />
+    <ClInclude Include="AudioCommon.h" />
+    <ClInclude Include="CoreAudioSoundStream.h" />
+    <ClInclude Include="DPL2Decoder.h" />
+    <ClInclude Include="DSoundStream.h" />
+    <ClInclude Include="Mixer.h" />
+    <ClInclude Include="NullSoundStream.h" />
+    <ClInclude Include="OpenALStream.h" />
+    <ClInclude Include="OpenSLESStream.h" />
+    <ClInclude Include="PulseAudioStream.h" />
+    <ClInclude Include="SoundStream.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="WaveFile.h" />
+    <ClInclude Include="XAudio2Stream.h" />
+    <ClInclude Include="XAudio2_7Stream.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

Source/Core/AudioCommon/AudioCommon.vcxproj.filters

@@ -6,64 +6,64 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\aldlist.cpp" />
-    <ClCompile Include="Src\AudioCommon.cpp" />
-    <ClCompile Include="Src\DPL2Decoder.cpp" />
-    <ClCompile Include="Src\Mixer.cpp" />
-    <ClCompile Include="Src\WaveFile.cpp" />
-    <ClCompile Include="Src\DSoundStream.cpp">
+    <ClCompile Include="aldlist.cpp" />
+    <ClCompile Include="AudioCommon.cpp" />
+    <ClCompile Include="DPL2Decoder.cpp" />
+    <ClCompile Include="Mixer.cpp" />
+    <ClCompile Include="WaveFile.cpp" />
+    <ClCompile Include="DSoundStream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
-    <ClCompile Include="Src\NullSoundStream.cpp">
+    <ClCompile Include="NullSoundStream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
-    <ClCompile Include="Src\OpenALStream.cpp">
+    <ClCompile Include="OpenALStream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
-    <ClCompile Include="Src\XAudio2Stream.cpp">
+    <ClCompile Include="XAudio2Stream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\XAudio2_7Stream.cpp">
+    <ClCompile Include="stdafx.cpp" />
+    <ClCompile Include="XAudio2_7Stream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\aldlist.h" />
-    <ClInclude Include="Src\AudioCommon.h" />
-    <ClInclude Include="Src\DPL2Decoder.h" />
-    <ClInclude Include="Src\Mixer.h" />
-    <ClInclude Include="Src\SoundStream.h" />
-    <ClInclude Include="Src\WaveFile.h" />
-    <ClInclude Include="Src\AOSoundStream.h">
+    <ClInclude Include="aldlist.h" />
+    <ClInclude Include="AudioCommon.h" />
+    <ClInclude Include="DPL2Decoder.h" />
+    <ClInclude Include="Mixer.h" />
+    <ClInclude Include="SoundStream.h" />
+    <ClInclude Include="WaveFile.h" />
+    <ClInclude Include="AOSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\DSoundStream.h">
+    <ClInclude Include="DSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\NullSoundStream.h">
+    <ClInclude Include="NullSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\OpenALStream.h">
+    <ClInclude Include="OpenALStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\XAudio2Stream.h">
+    <ClInclude Include="XAudio2Stream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\XAudio2_7Stream.h">
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="XAudio2_7Stream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\PulseAudioStream.h">
+    <ClInclude Include="PulseAudioStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\OpenSLESStream.h">
+    <ClInclude Include="OpenSLESStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\CoreAudioSoundStream.h">
+    <ClInclude Include="CoreAudioSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\AlsaSoundStream.h">
+    <ClInclude Include="AlsaSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
   </ItemGroup>

Source/Core/AudioCommon/CMakeLists.txt

@@ -1,43 +1,43 @@
-set(SRCS	Src/AudioCommon.cpp
-			Src/DPL2Decoder.cpp
-			Src/Mixer.cpp
-			Src/WaveFile.cpp
-			Src/NullSoundStream.cpp)
+set(SRCS	AudioCommon.cpp
+			DPL2Decoder.cpp
+			Mixer.cpp
+			WaveFile.cpp
+			NullSoundStream.cpp)
 
 set(LIBS "")
 
 if(ANDROID)
-	set(SRCS ${SRCS} Src/OpenSLESStream.cpp)
+	set(SRCS ${SRCS} OpenSLESStream.cpp)
 	set(LIBS ${LIBS} OpenSLES)
 endif(ANDROID)
 
 if(ALSA_FOUND)
-	set(SRCS ${SRCS} Src/AlsaSoundStream.cpp)
+	set(SRCS ${SRCS} AlsaSoundStream.cpp)
 	set(LIBS ${LIBS} ${ALSA_LIBRARIES})
 endif(ALSA_FOUND)
 
 if(AO_FOUND)
-	set(SRCS ${SRCS} Src/AOSoundStream.cpp)
+	set(SRCS ${SRCS} AOSoundStream.cpp)
 	set(LIBS ${LIBS} ${AO_LIBRARIES})
 endif(AO_FOUND)
 
 if(OPENAL_FOUND)
-	set(SRCS ${SRCS} Src/OpenALStream.cpp Src/aldlist.cpp)
+	set(SRCS ${SRCS} OpenALStream.cpp aldlist.cpp)
 	set(LIBS ${LIBS} ${OPENAL_LIBRARY} SoundTouch )
 endif(OPENAL_FOUND)
 
 if(PULSEAUDIO_FOUND)
-	set(SRCS ${SRCS} Src/PulseAudioStream.cpp)
+	set(SRCS ${SRCS} PulseAudioStream.cpp)
 	set(LIBS ${LIBS} ${PULSEAUDIO_LIBRARIES})
 endif(PULSEAUDIO_FOUND)
 
 if(WIN32)
-	set(SRCS ${SRCS} Src/DSoundStream.cpp)
-	set(SRCS ${SRCS} Src/XAudio2Stream.cpp)
+	set(SRCS ${SRCS} DSoundStream.cpp)
+	set(SRCS ${SRCS} XAudio2Stream.cpp)
 endif(WIN32)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	set(SRCS ${SRCS} Src/CoreAudioSoundStream.cpp)
+	set(SRCS ${SRCS} CoreAudioSoundStream.cpp)
 endif()
 
 add_dolphin_library(audiocommon "${SRCS}" "${LIBS}")

Source/Core/AudioCommon/Mixer.cpp

@@ -6,12 +6,12 @@
 #include "Mixer.h"
 #include "AudioCommon.h"
 #include "CPUDetect.h"
-#include "../../Core/Src/Host.h"
+#include "../Core/Host.h"
 
-#include "../../Core/Src/HW/AudioInterface.h"
+#include "../Core/HW/AudioInterface.h"
 
 // UGLINESS
-#include "../../Core/Src/PowerPC/PowerPC.h"
+#include "../Core/PowerPC/PowerPC.h"
 
 #if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
 #include <tmmintrin.h>

Source/Core/AudioCommon/NullSoundStream.cpp

@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include "NullSoundStream.h"
-#include "../../Core/Src/HW/SystemTimers.h"
-#include "../../Core/Src/HW/AudioInterface.h"
+#include "../Core/HW/SystemTimers.h"
+#include "../Core/HW/AudioInterface.h"
 
 void NullSound::SoundLoop()
 {

Source/Core/AudioCommon/WaveFile.cpp

@@ -4,7 +4,7 @@
 
 #include "Common.h"
 #include "WaveFile.h"
-#include "../../Core/Src/ConfigManager.h"
+#include "../Core/ConfigManager.h"
 
 enum {BUF_SIZE = 32*1024};
 

Source/Core/AudioCommon/aldlist.cpp

@@ -25,8 +25,8 @@
 #include "Common.h"
 #include "aldlist.h"
 #ifdef _WIN32
-#include "../../../../Externals/OpenAL/include/al.h"
-#include "../../../../Externals/OpenAL/include/alc.h"
+#include "../../../Externals/OpenAL/include/al.h"
+#include "../../../Externals/OpenAL/include/alc.h"
 #elif defined(__APPLE__)
 #include <al.h>
 #include <alc.h>

Source/Core/Common/BreakPoints.cpp

@@ -5,7 +5,7 @@
 #include "Common.h"
 #include "DebugInterface.h"
 #include "BreakPoints.h"
-#include "../../Core/Src/PowerPC/JitCommon/JitBase.h"
+#include "../Core/PowerPC/JitCommon/JitBase.h"
 
 #include <sstream>
 #include <algorithm>

Source/Core/Common/CMakeLists.txt

@@ -1,52 +1,52 @@
-set(SRCS	Src/BreakPoints.cpp
-			Src/CDUtils.cpp
-			Src/ColorUtil.cpp
-			Src/ConsoleListener.cpp
-			Src/FileSearch.cpp
-			Src/FileUtil.cpp
-			Src/Hash.cpp
-			Src/IniFile.cpp
-			Src/LogManager.cpp
-			Src/MathUtil.cpp
-			Src/MemArena.cpp
-			Src/MemoryUtil.cpp
-			Src/Misc.cpp
-			Src/MsgHandler.cpp
-			Src/NandPaths.cpp
-			Src/SettingsHandler.cpp
-			Src/SDCardUtil.cpp
-			Src/StringUtil.cpp
-			Src/SymbolDB.cpp
-			Src/SysConf.cpp
-			Src/Thread.cpp
-			Src/Timer.cpp
-			Src/Version.cpp
-			Src/x64ABI.cpp
-			Src/x64Analyzer.cpp
-			Src/x64Emitter.cpp
-			Src/Crypto/bn.cpp
-			Src/Crypto/ec.cpp)
+set(SRCS	BreakPoints.cpp
+			CDUtils.cpp
+			ColorUtil.cpp
+			ConsoleListener.cpp
+			FileSearch.cpp
+			FileUtil.cpp
+			Hash.cpp
+			IniFile.cpp
+			LogManager.cpp
+			MathUtil.cpp
+			MemArena.cpp
+			MemoryUtil.cpp
+			Misc.cpp
+			MsgHandler.cpp
+			NandPaths.cpp
+			SettingsHandler.cpp
+			SDCardUtil.cpp
+			StringUtil.cpp
+			SymbolDB.cpp
+			SysConf.cpp
+			Thread.cpp
+			Timer.cpp
+			Version.cpp
+			x64ABI.cpp
+			x64Analyzer.cpp
+			x64Emitter.cpp
+			Crypto/bn.cpp
+			Crypto/ec.cpp)
 
 if(_M_ARM) #ARM
 	set(SRCS	${SRCS}
-				Src/ArmCPUDetect.cpp
-				Src/ArmEmitter.cpp)
+				ArmCPUDetect.cpp
+				ArmEmitter.cpp)
 else()
 	if(NOT _M_GENERIC) #X86
 		set(SRCS	${SRCS}
-					Src/x64FPURoundMode.cpp
+					x64FPURoundMode.cpp
 					)
 	endif()
-	set(SRCS ${SRCS} Src/x64CPUDetect.cpp)
+	set(SRCS ${SRCS} x64CPUDetect.cpp)
 endif()
 if(_M_GENERIC) #Generic
 	set(SRCS	${SRCS}
-				Src/GenericFPURoundMode.cpp)
+				GenericFPURoundMode.cpp)
 endif()
 if(WIN32)
-	set(SRCS ${SRCS} Src/ExtendedTrace.cpp)
+	set(SRCS ${SRCS} ExtendedTrace.cpp)
 endif(WIN32)
 
-enable_precompiled_headers(Src/stdafx.h Src/stdafx.cpp SRCS)
+enable_precompiled_headers(stdafx.h stdafx.cpp SRCS)
 
 add_dolphin_library(common "${SRCS}" "${CMAKE_THREAD_LIBS_INIT}")

Source/Core/Common/Common.vcxproj

@@ -43,87 +43,87 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClInclude Include="Src\Atomic.h" />
-    <ClInclude Include="Src\Atomic_GCC.h" />
-    <ClInclude Include="Src\Atomic_Win32.h" />
-    <ClInclude Include="Src\BreakPoints.h" />
-    <ClInclude Include="Src\CDUtils.h" />
-    <ClInclude Include="Src\ChunkFile.h" />
-    <ClInclude Include="Src\ColorUtil.h" />
-    <ClInclude Include="Src\Common.h" />
-    <ClInclude Include="Src\CommonFuncs.h" />
-    <ClInclude Include="Src\CommonPaths.h" />
-    <ClInclude Include="Src\CommonTypes.h" />
-    <ClInclude Include="Src\ConsoleListener.h" />
-    <ClInclude Include="Src\CPUDetect.h" />
-    <ClInclude Include="Src\Crypto\tools.h" />
-    <ClInclude Include="Src\DebugInterface.h" />
-    <ClInclude Include="Src\ExtendedTrace.h" />
-    <ClInclude Include="Src\FifoQueue.h" />
-    <ClInclude Include="Src\FileSearch.h" />
-    <ClInclude Include="Src\FileUtil.h" />
-    <ClInclude Include="Src\FixedSizeQueue.h" />
-    <ClInclude Include="Src\FPURoundMode.h" />
-    <ClInclude Include="Src\Hash.h" />
-    <ClInclude Include="Src\IniFile.h" />
-    <ClInclude Include="Src\LinearDiskCache.h" />
-    <ClInclude Include="Src\Log.h" />
-    <ClInclude Include="Src\LogManager.h" />
-    <ClInclude Include="Src\MathUtil.h" />
-    <ClInclude Include="Src\MemArena.h" />
-    <ClInclude Include="Src\MemoryUtil.h" />
-    <ClInclude Include="Src\MsgHandler.h" />
-    <ClInclude Include="Src\NandPaths.h" />
-    <ClInclude Include="Src\SDCardUtil.h" />
-    <ClInclude Include="Src\SettingsHandler.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\StdConditionVariable.h" />
-    <ClInclude Include="Src\StdMutex.h" />
-    <ClInclude Include="Src\StdThread.h" />
-    <ClInclude Include="Src\StringUtil.h" />
-    <ClInclude Include="Src\SymbolDB.h" />
-    <ClInclude Include="Src\SysConf.h" />
-    <ClInclude Include="Src\Thread.h" />
-    <ClInclude Include="Src\Timer.h" />
-    <ClInclude Include="Src\x64ABI.h" />
-    <ClInclude Include="Src\x64Analyzer.h" />
-    <ClInclude Include="Src\x64Emitter.h" />
+    <ClInclude Include="Atomic.h" />
+    <ClInclude Include="Atomic_GCC.h" />
+    <ClInclude Include="Atomic_Win32.h" />
+    <ClInclude Include="BreakPoints.h" />
+    <ClInclude Include="CDUtils.h" />
+    <ClInclude Include="ChunkFile.h" />
+    <ClInclude Include="ColorUtil.h" />
+    <ClInclude Include="Common.h" />
+    <ClInclude Include="CommonFuncs.h" />
+    <ClInclude Include="CommonPaths.h" />
+    <ClInclude Include="CommonTypes.h" />
+    <ClInclude Include="ConsoleListener.h" />
+    <ClInclude Include="CPUDetect.h" />
+    <ClInclude Include="Crypto\tools.h" />
+    <ClInclude Include="DebugInterface.h" />
+    <ClInclude Include="ExtendedTrace.h" />
+    <ClInclude Include="FifoQueue.h" />
+    <ClInclude Include="FileSearch.h" />
+    <ClInclude Include="FileUtil.h" />
+    <ClInclude Include="FixedSizeQueue.h" />
+    <ClInclude Include="FPURoundMode.h" />
+    <ClInclude Include="Hash.h" />
+    <ClInclude Include="IniFile.h" />
+    <ClInclude Include="LinearDiskCache.h" />
+    <ClInclude Include="Log.h" />
+    <ClInclude Include="LogManager.h" />
+    <ClInclude Include="MathUtil.h" />
+    <ClInclude Include="MemArena.h" />
+    <ClInclude Include="MemoryUtil.h" />
+    <ClInclude Include="MsgHandler.h" />
+    <ClInclude Include="NandPaths.h" />
+    <ClInclude Include="SDCardUtil.h" />
+    <ClInclude Include="SettingsHandler.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="StdConditionVariable.h" />
+    <ClInclude Include="StdMutex.h" />
+    <ClInclude Include="StdThread.h" />
+    <ClInclude Include="StringUtil.h" />
+    <ClInclude Include="SymbolDB.h" />
+    <ClInclude Include="SysConf.h" />
+    <ClInclude Include="Thread.h" />
+    <ClInclude Include="Timer.h" />
+    <ClInclude Include="x64ABI.h" />
+    <ClInclude Include="x64Analyzer.h" />
+    <ClInclude Include="x64Emitter.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\BreakPoints.cpp" />
-    <ClCompile Include="Src\CDUtils.cpp" />
-    <ClCompile Include="Src\ColorUtil.cpp" />
-    <ClCompile Include="Src\ConsoleListener.cpp" />
-    <ClCompile Include="Src\Crypto\bn.cpp" />
-    <ClCompile Include="Src\Crypto\ec.cpp" />
-    <ClCompile Include="Src\ExtendedTrace.cpp" />
-    <ClCompile Include="Src\FileSearch.cpp" />
-    <ClCompile Include="Src\FileUtil.cpp" />
-    <ClCompile Include="Src\Hash.cpp" />
-    <ClCompile Include="Src\IniFile.cpp" />
-    <ClCompile Include="Src\LogManager.cpp" />
-    <ClCompile Include="Src\MathUtil.cpp" />
-    <ClCompile Include="Src\MemArena.cpp" />
-    <ClCompile Include="Src\MemoryUtil.cpp" />
-    <ClCompile Include="Src\Misc.cpp" />
-    <ClCompile Include="Src\MsgHandler.cpp" />
-    <ClCompile Include="Src\NandPaths.cpp" />
-    <ClCompile Include="Src\SDCardUtil.cpp" />
-    <ClCompile Include="Src\SettingsHandler.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
+    <ClCompile Include="BreakPoints.cpp" />
+    <ClCompile Include="CDUtils.cpp" />
+    <ClCompile Include="ColorUtil.cpp" />
+    <ClCompile Include="ConsoleListener.cpp" />
+    <ClCompile Include="Crypto\bn.cpp" />
+    <ClCompile Include="Crypto\ec.cpp" />
+    <ClCompile Include="ExtendedTrace.cpp" />
+    <ClCompile Include="FileSearch.cpp" />
+    <ClCompile Include="FileUtil.cpp" />
+    <ClCompile Include="Hash.cpp" />
+    <ClCompile Include="IniFile.cpp" />
+    <ClCompile Include="LogManager.cpp" />
+    <ClCompile Include="MathUtil.cpp" />
+    <ClCompile Include="MemArena.cpp" />
+    <ClCompile Include="MemoryUtil.cpp" />
+    <ClCompile Include="Misc.cpp" />
+    <ClCompile Include="MsgHandler.cpp" />
+    <ClCompile Include="NandPaths.cpp" />
+    <ClCompile Include="SDCardUtil.cpp" />
+    <ClCompile Include="SettingsHandler.cpp" />
+    <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Src\StringUtil.cpp" />
-    <ClCompile Include="Src\SymbolDB.cpp" />
-    <ClCompile Include="Src\SysConf.cpp" />
-    <ClCompile Include="Src\Thread.cpp" />
-    <ClCompile Include="Src\Timer.cpp" />
-    <ClCompile Include="Src\Version.cpp" />
-    <ClCompile Include="Src\x64ABI.cpp" />
-    <ClCompile Include="Src\x64Analyzer.cpp" />
-    <ClCompile Include="Src\x64CPUDetect.cpp" />
-    <ClCompile Include="Src\x64Emitter.cpp" />
-    <ClCompile Include="Src\x64FPURoundMode.cpp" />
+    <ClCompile Include="StringUtil.cpp" />
+    <ClCompile Include="SymbolDB.cpp" />
+    <ClCompile Include="SysConf.cpp" />
+    <ClCompile Include="Thread.cpp" />
+    <ClCompile Include="Timer.cpp" />
+    <ClCompile Include="Version.cpp" />
+    <ClCompile Include="x64ABI.cpp" />
+    <ClCompile Include="x64Analyzer.cpp" />
+    <ClCompile Include="x64CPUDetect.cpp" />
+    <ClCompile Include="x64Emitter.cpp" />
+    <ClCompile Include="x64FPURoundMode.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

Source/Core/Common/Common.vcxproj.filters

@@ -9,101 +9,101 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\Atomic.h" />
-    <ClInclude Include="Src\Atomic_GCC.h" />
-    <ClInclude Include="Src\Atomic_Win32.h" />
-    <ClInclude Include="Src\BreakPoints.h" />
-    <ClInclude Include="Src\CDUtils.h" />
-    <ClInclude Include="Src\ChunkFile.h" />
-    <ClInclude Include="Src\ColorUtil.h" />
-    <ClInclude Include="Src\Common.h" />
-    <ClInclude Include="Src\CommonFuncs.h" />
-    <ClInclude Include="Src\CommonPaths.h" />
-    <ClInclude Include="Src\CommonTypes.h" />
-    <ClInclude Include="Src\CPUDetect.h" />
-    <ClInclude Include="Src\DebugInterface.h" />
-    <ClInclude Include="Src\ExtendedTrace.h" />
-    <ClInclude Include="Src\FifoQueue.h" />
-    <ClInclude Include="Src\FileSearch.h" />
-    <ClInclude Include="Src\FileUtil.h" />
-    <ClInclude Include="Src\FixedSizeQueue.h" />
-    <ClInclude Include="Src\FPURoundMode.h" />
-    <ClInclude Include="Src\Hash.h" />
-    <ClInclude Include="Src\IniFile.h" />
-    <ClInclude Include="Src\LinearDiskCache.h" />
-    <ClInclude Include="Src\MathUtil.h" />
-    <ClInclude Include="Src\MemArena.h" />
-    <ClInclude Include="Src\MemoryUtil.h" />
-    <ClInclude Include="Src\MsgHandler.h" />
-    <ClInclude Include="Src\NandPaths.h" />
-    <ClInclude Include="Src\SDCardUtil.h" />
-    <ClInclude Include="Src\SettingsHandler.h" />
-    <ClInclude Include="Src\StdConditionVariable.h" />
-    <ClInclude Include="Src\StdMutex.h" />
-    <ClInclude Include="Src\StdThread.h" />
-    <ClInclude Include="Src\StringUtil.h" />
-    <ClInclude Include="Src\SymbolDB.h" />
-    <ClInclude Include="Src\SysConf.h" />
-    <ClInclude Include="Src\Thread.h" />
-    <ClInclude Include="Src\Timer.h" />
-    <ClInclude Include="Src\x64ABI.h" />
-    <ClInclude Include="Src\x64Analyzer.h" />
-    <ClInclude Include="Src\x64Emitter.h" />
-    <ClInclude Include="Src\Crypto\tools.h">
+    <ClInclude Include="Atomic.h" />
+    <ClInclude Include="Atomic_GCC.h" />
+    <ClInclude Include="Atomic_Win32.h" />
+    <ClInclude Include="BreakPoints.h" />
+    <ClInclude Include="CDUtils.h" />
+    <ClInclude Include="ChunkFile.h" />
+    <ClInclude Include="ColorUtil.h" />
+    <ClInclude Include="Common.h" />
+    <ClInclude Include="CommonFuncs.h" />
+    <ClInclude Include="CommonPaths.h" />
+    <ClInclude Include="CommonTypes.h" />
+    <ClInclude Include="CPUDetect.h" />
+    <ClInclude Include="DebugInterface.h" />
+    <ClInclude Include="ExtendedTrace.h" />
+    <ClInclude Include="FifoQueue.h" />
+    <ClInclude Include="FileSearch.h" />
+    <ClInclude Include="FileUtil.h" />
+    <ClInclude Include="FixedSizeQueue.h" />
+    <ClInclude Include="FPURoundMode.h" />
+    <ClInclude Include="Hash.h" />
+    <ClInclude Include="IniFile.h" />
+    <ClInclude Include="LinearDiskCache.h" />
+    <ClInclude Include="MathUtil.h" />
+    <ClInclude Include="MemArena.h" />
+    <ClInclude Include="MemoryUtil.h" />
+    <ClInclude Include="MsgHandler.h" />
+    <ClInclude Include="NandPaths.h" />
+    <ClInclude Include="SDCardUtil.h" />
+    <ClInclude Include="SettingsHandler.h" />
+    <ClInclude Include="StdConditionVariable.h" />
+    <ClInclude Include="StdMutex.h" />
+    <ClInclude Include="StdThread.h" />
+    <ClInclude Include="StringUtil.h" />
+    <ClInclude Include="SymbolDB.h" />
+    <ClInclude Include="SysConf.h" />
+    <ClInclude Include="Thread.h" />
+    <ClInclude Include="Timer.h" />
+    <ClInclude Include="x64ABI.h" />
+    <ClInclude Include="x64Analyzer.h" />
+    <ClInclude Include="x64Emitter.h" />
+    <ClInclude Include="Crypto\tools.h">
       <Filter>Crypto</Filter>
     </ClInclude>
-    <ClInclude Include="Src\ConsoleListener.h">
+    <ClInclude Include="ConsoleListener.h">
       <Filter>Logging</Filter>
     </ClInclude>
-    <ClInclude Include="Src\Log.h">
+    <ClInclude Include="Log.h">
       <Filter>Logging</Filter>
     </ClInclude>
-    <ClInclude Include="Src\LogManager.h">
+    <ClInclude Include="LogManager.h">
       <Filter>Logging</Filter>
     </ClInclude>
-    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\BreakPoints.cpp" />
-    <ClCompile Include="Src\CDUtils.cpp" />
-    <ClCompile Include="Src\ColorUtil.cpp" />
-    <ClCompile Include="Src\ExtendedTrace.cpp" />
-    <ClCompile Include="Src\FileSearch.cpp" />
-    <ClCompile Include="Src\FileUtil.cpp" />
-    <ClCompile Include="Src\Hash.cpp" />
-    <ClCompile Include="Src\IniFile.cpp" />
-    <ClCompile Include="Src\MathUtil.cpp" />
-    <ClCompile Include="Src\MemArena.cpp" />
-    <ClCompile Include="Src\MemoryUtil.cpp" />
-    <ClCompile Include="Src\Misc.cpp" />
-    <ClCompile Include="Src\MsgHandler.cpp" />
-    <ClCompile Include="Src\NandPaths.cpp" />
-    <ClCompile Include="Src\SDCardUtil.cpp" />
-    <ClCompile Include="Src\SettingsHandler.cpp" />
-    <ClCompile Include="Src\StringUtil.cpp" />
-    <ClCompile Include="Src\SymbolDB.cpp" />
-    <ClCompile Include="Src\SysConf.cpp" />
-    <ClCompile Include="Src\Thread.cpp" />
-    <ClCompile Include="Src\Timer.cpp" />
-    <ClCompile Include="Src\Version.cpp" />
-    <ClCompile Include="Src\x64ABI.cpp" />
-    <ClCompile Include="Src\x64Analyzer.cpp" />
-    <ClCompile Include="Src\x64CPUDetect.cpp" />
-    <ClCompile Include="Src\x64Emitter.cpp" />
-    <ClCompile Include="Src\x64FPURoundMode.cpp" />
-    <ClCompile Include="Src\Crypto\bn.cpp">
+    <ClCompile Include="BreakPoints.cpp" />
+    <ClCompile Include="CDUtils.cpp" />
+    <ClCompile Include="ColorUtil.cpp" />
+    <ClCompile Include="ExtendedTrace.cpp" />
+    <ClCompile Include="FileSearch.cpp" />
+    <ClCompile Include="FileUtil.cpp" />
+    <ClCompile Include="Hash.cpp" />
+    <ClCompile Include="IniFile.cpp" />
+    <ClCompile Include="MathUtil.cpp" />
+    <ClCompile Include="MemArena.cpp" />
+    <ClCompile Include="MemoryUtil.cpp" />
+    <ClCompile Include="Misc.cpp" />
+    <ClCompile Include="MsgHandler.cpp" />
+    <ClCompile Include="NandPaths.cpp" />
+    <ClCompile Include="SDCardUtil.cpp" />
+    <ClCompile Include="SettingsHandler.cpp" />
+    <ClCompile Include="StringUtil.cpp" />
+    <ClCompile Include="SymbolDB.cpp" />
+    <ClCompile Include="SysConf.cpp" />
+    <ClCompile Include="Thread.cpp" />
+    <ClCompile Include="Timer.cpp" />
+    <ClCompile Include="Version.cpp" />
+    <ClCompile Include="x64ABI.cpp" />
+    <ClCompile Include="x64Analyzer.cpp" />
+    <ClCompile Include="x64CPUDetect.cpp" />
+    <ClCompile Include="x64Emitter.cpp" />
+    <ClCompile Include="x64FPURoundMode.cpp" />
+    <ClCompile Include="Crypto\bn.cpp">
       <Filter>Crypto</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Crypto\ec.cpp">
+    <ClCompile Include="Crypto\ec.cpp">
       <Filter>Crypto</Filter>
     </ClCompile>
-    <ClCompile Include="Src\ConsoleListener.cpp">
+    <ClCompile Include="ConsoleListener.cpp">
       <Filter>Logging</Filter>
     </ClCompile>
-    <ClCompile Include="Src\LogManager.cpp">
+    <ClCompile Include="LogManager.cpp">
       <Filter>Logging</Filter>
     </ClCompile>
-    <ClCompile Include="Src\stdafx.cpp" />
+    <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />