diff --git a/configure b/configure
index c571fe945..83b29f557 100755
--- a/configure
+++ b/configure
@@ -345,9 +345,6 @@ arm-riscos-aof)
 psp)
 	EXEEXT=".elf"
 	;;
-gp2x)
-	EXEEXT=""
-	;;
 *)
 	EXEEXT=""
 	;;
@@ -796,6 +793,7 @@ echo
 find_sdlconfig
 
 SRC="src"
+SRC_OS="$SRC/os"
 CORE="$SRC/emucore"
 COMMON="$SRC/common"
 TIA="$SRC/emucore/tia"
@@ -831,26 +829,26 @@ LD=$CXX
 case $_host_os in
 		unix)
 			DEFINES="$DEFINES -DBSPF_UNIX"
-			MODULES="$MODULES $SRC/unix"
-			INCLUDES="$INCLUDES -I$SRC/unix"
+			MODULES="$MODULES $SRC_OS/unix"
+			INCLUDES="$INCLUDES -I$SRC_OS/unix"
 			;;
 		darwin)
 			DEFINES="$DEFINES -DBSPF_UNIX -DMACOS_KEYS"
-			MODULES="$MODULES $SRC/unix"
-			INCLUDES="$INCLUDES -I$SRC/unix"
+			MODULES="$MODULES $SRC_OS/unix"
+			INCLUDES="$INCLUDES -I$SRC_OS/unix"
 			if test "$have_clang" == yes; then
 				CXXFLAGS="$CXXFLAGS -Wno-poison-system-directories"
 			fi
 			;;
     retron77)
       DEFINES="$DEFINES -DBSPF_UNIX -DRETRON77"
-      MODULES="$MODULES $SRC/unix $SRC/unix/r77"
-      INCLUDES="$INCLUDES -I$SRC/unix -I$SRC/unix/r77"
+      MODULES="$MODULES $SRC_OS/unix $SRC_OS/unix/r77"
+      INCLUDES="$INCLUDES -I$SRC_OS/unix -I$SRC_OS/unix/r77"
       ;;
 		win32)
 			DEFINES="$DEFINES -DBSPF_WINDOWS"
-			MODULES="$MODULES $SRC/windows"
-			INCLUDES="$INCLUDES -I$SRC/windows"
+			MODULES="$MODULES $SRC_OS/windows"
+			INCLUDES="$INCLUDES -I$SRC_OS/windows"
 			LIBS="$LIBS -lmingw32 -lwinmm"
 			;;
 		*)
diff --git a/src/libretro/EventHandlerLIBRETRO.hxx b/src/os/libretro/EventHandlerLIBRETRO.hxx
similarity index 100%
rename from src/libretro/EventHandlerLIBRETRO.hxx
rename to src/os/libretro/EventHandlerLIBRETRO.hxx
diff --git a/src/libretro/FBBackendLIBRETRO.hxx b/src/os/libretro/FBBackendLIBRETRO.hxx
similarity index 100%
rename from src/libretro/FBBackendLIBRETRO.hxx
rename to src/os/libretro/FBBackendLIBRETRO.hxx
diff --git a/src/libretro/FBSurfaceLIBRETRO.hxx b/src/os/libretro/FBSurfaceLIBRETRO.hxx
similarity index 100%
rename from src/libretro/FBSurfaceLIBRETRO.hxx
rename to src/os/libretro/FBSurfaceLIBRETRO.hxx
diff --git a/src/libretro/FSNodeLIBRETRO.cxx b/src/os/libretro/FSNodeLIBRETRO.cxx
similarity index 100%
rename from src/libretro/FSNodeLIBRETRO.cxx
rename to src/os/libretro/FSNodeLIBRETRO.cxx
diff --git a/src/libretro/FSNodeLIBRETRO.hxx b/src/os/libretro/FSNodeLIBRETRO.hxx
similarity index 100%
rename from src/libretro/FSNodeLIBRETRO.hxx
rename to src/os/libretro/FSNodeLIBRETRO.hxx
diff --git a/src/libretro/Makefile b/src/os/libretro/Makefile
similarity index 99%
rename from src/libretro/Makefile
rename to src/os/libretro/Makefile
index a17099234..d8695faef 100644
--- a/src/libretro/Makefile
+++ b/src/os/libretro/Makefile
@@ -538,7 +538,7 @@ else
    CXXFLAGS += -D__WIN32__
 endif
 
-CORE_DIR := ..
+CORE_DIR := ../..
 
 ifeq ($(DEBUG), 1)
    ifneq (,$(findstring msvc,$(platform)))
@@ -580,7 +580,7 @@ else ifneq (,$(findstring msvc,$(platform)))
    CODE_DEFINES =
 else
    WARNINGS_DEFINES = -Wall -W -Wno-unused-parameter
-   CODE_DEFINES = 
+   CODE_DEFINES =
 endif
 
 CXXFLAGS += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic)
diff --git a/src/libretro/Makefile.common b/src/os/libretro/Makefile.common
similarity index 92%
rename from src/libretro/Makefile.common
rename to src/os/libretro/Makefile.common
index 782ce2e4c..cc07e56c8 100644
--- a/src/libretro/Makefile.common
+++ b/src/os/libretro/Makefile.common
@@ -1,14 +1,14 @@
 LIBRETRO_COMM_DIR = $(CORE_DIR)/../libretro-common
-INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/json -I$(CORE_DIR)/httplib -I$(CORE_DIR)/sqlite
+INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/os/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/json -I$(CORE_DIR)/httplib -I$(CORE_DIR)/sqlite
 
 ifneq (,$(findstring msvc2003,$(platform)))
 INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc
 endif
 
 SOURCES_CXX := \
-	$(CORE_DIR)/libretro/libretro.cxx \
-	$(CORE_DIR)/libretro/FSNodeLIBRETRO.cxx \
-	$(CORE_DIR)/libretro/StellaLIBRETRO.cxx \
+	$(CORE_DIR)/os/libretro/libretro.cxx \
+	$(CORE_DIR)/os/libretro/FSNodeLIBRETRO.cxx \
+	$(CORE_DIR)/os/libretro/StellaLIBRETRO.cxx \
 	$(CORE_DIR)/common/AudioQueue.cxx \
 	$(CORE_DIR)/common/AudioSettings.cxx \
 	$(CORE_DIR)/common/Base.cxx \
diff --git a/src/libretro/OSystemLIBRETRO.hxx b/src/os/libretro/OSystemLIBRETRO.hxx
similarity index 100%
rename from src/libretro/OSystemLIBRETRO.hxx
rename to src/os/libretro/OSystemLIBRETRO.hxx
diff --git a/src/libretro/SoundLIBRETRO.hxx b/src/os/libretro/SoundLIBRETRO.hxx
similarity index 100%
rename from src/libretro/SoundLIBRETRO.hxx
rename to src/os/libretro/SoundLIBRETRO.hxx
diff --git a/src/libretro/Stella.vcxproj b/src/os/libretro/Stella.vcxproj
similarity index 100%
rename from src/libretro/Stella.vcxproj
rename to src/os/libretro/Stella.vcxproj
diff --git a/src/libretro/StellaLIBRETRO.cxx b/src/os/libretro/StellaLIBRETRO.cxx
similarity index 100%
rename from src/libretro/StellaLIBRETRO.cxx
rename to src/os/libretro/StellaLIBRETRO.cxx
diff --git a/src/libretro/StellaLIBRETRO.hxx b/src/os/libretro/StellaLIBRETRO.hxx
similarity index 100%
rename from src/libretro/StellaLIBRETRO.hxx
rename to src/os/libretro/StellaLIBRETRO.hxx
diff --git a/src/libretro/jni/Android.mk b/src/os/libretro/jni/Android.mk
similarity index 91%
rename from src/libretro/jni/Android.mk
rename to src/os/libretro/jni/Android.mk
index 644f983ae..a43b28239 100644
--- a/src/libretro/jni/Android.mk
+++ b/src/os/libretro/jni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 CORE_DIR := $(LOCAL_PATH)/../..
 
-include $(CORE_DIR)/libretro/Makefile.common
+include $(CORE_DIR)/os/libretro/Makefile.common
 
 COREFLAGS := -DANDROID -D__LIB_RETRO__ -DHAVE_STRINGS_H -DSOUND_SUPPORT $(INCFLAGS)
 
diff --git a/src/libretro/jni/Application.mk b/src/os/libretro/jni/Application.mk
similarity index 100%
rename from src/libretro/jni/Application.mk
rename to src/os/libretro/jni/Application.mk
diff --git a/src/libretro/libretro.cxx b/src/os/libretro/libretro.cxx
similarity index 100%
rename from src/libretro/libretro.cxx
rename to src/os/libretro/libretro.cxx
diff --git a/src/libretro/libretro.h b/src/os/libretro/libretro.h
similarity index 100%
rename from src/libretro/libretro.h
rename to src/os/libretro/libretro.h
diff --git a/src/libretro/link.T b/src/os/libretro/link.T
similarity index 100%
rename from src/libretro/link.T
rename to src/os/libretro/link.T
diff --git a/src/macos/.gitignore b/src/os/macos/.gitignore
similarity index 100%
rename from src/macos/.gitignore
rename to src/os/macos/.gitignore
diff --git a/src/macos/AboutBox.h b/src/os/macos/AboutBox.h
similarity index 100%
rename from src/macos/AboutBox.h
rename to src/os/macos/AboutBox.h
diff --git a/src/macos/AboutBox.m b/src/os/macos/AboutBox.m
similarity index 100%
rename from src/macos/AboutBox.m
rename to src/os/macos/AboutBox.m
diff --git a/src/macos/AboutBox.nib/designable.nib b/src/os/macos/AboutBox.nib/designable.nib
similarity index 100%
rename from src/macos/AboutBox.nib/designable.nib
rename to src/os/macos/AboutBox.nib/designable.nib
diff --git a/src/macos/AboutBox.nib/keyedobjects.nib b/src/os/macos/AboutBox.nib/keyedobjects.nib
similarity index 100%
rename from src/macos/AboutBox.nib/keyedobjects.nib
rename to src/os/macos/AboutBox.nib/keyedobjects.nib
diff --git a/src/macos/AboutBoxTextView.h b/src/os/macos/AboutBoxTextView.h
similarity index 100%
rename from src/macos/AboutBoxTextView.h
rename to src/os/macos/AboutBoxTextView.h
diff --git a/src/macos/AboutBoxTextView.m b/src/os/macos/AboutBoxTextView.m
similarity index 100%
rename from src/macos/AboutBoxTextView.m
rename to src/os/macos/AboutBoxTextView.m
diff --git a/src/macos/Cart.icns b/src/os/macos/Cart.icns
similarity index 100%
rename from src/macos/Cart.icns
rename to src/os/macos/Cart.icns
diff --git a/src/macos/Create_build.sh b/src/os/macos/Create_build.sh
similarity index 100%
rename from src/macos/Create_build.sh
rename to src/os/macos/Create_build.sh
diff --git a/src/macos/Credits.html b/src/os/macos/Credits.html
similarity index 100%
rename from src/macos/Credits.html
rename to src/os/macos/Credits.html
diff --git a/src/macos/Info-Stella.plist b/src/os/macos/Info-Stella.plist
similarity index 100%
rename from src/macos/Info-Stella.plist
rename to src/os/macos/Info-Stella.plist
diff --git a/src/macos/OSystemMACOS.cxx b/src/os/macos/OSystemMACOS.cxx
similarity index 100%
rename from src/macos/OSystemMACOS.cxx
rename to src/os/macos/OSystemMACOS.cxx
diff --git a/src/macos/OSystemMACOS.hxx b/src/os/macos/OSystemMACOS.hxx
similarity index 100%
rename from src/macos/OSystemMACOS.hxx
rename to src/os/macos/OSystemMACOS.hxx
diff --git a/src/macos/SDLMain.h b/src/os/macos/SDLMain.h
similarity index 100%
rename from src/macos/SDLMain.h
rename to src/os/macos/SDLMain.h
diff --git a/src/macos/SDLMain.m b/src/os/macos/SDLMain.m
similarity index 100%
rename from src/macos/SDLMain.m
rename to src/os/macos/SDLMain.m
diff --git a/src/macos/SDLMain.nib/designable.nib b/src/os/macos/SDLMain.nib/designable.nib
similarity index 100%
rename from src/macos/SDLMain.nib/designable.nib
rename to src/os/macos/SDLMain.nib/designable.nib
diff --git a/src/macos/SDLMain.nib/keyedobjects.nib b/src/os/macos/SDLMain.nib/keyedobjects.nib
similarity index 100%
rename from src/macos/SDLMain.nib/keyedobjects.nib
rename to src/os/macos/SDLMain.nib/keyedobjects.nib
diff --git a/src/macos/SerialPortMACOS.cxx b/src/os/macos/SerialPortMACOS.cxx
similarity index 100%
rename from src/macos/SerialPortMACOS.cxx
rename to src/os/macos/SerialPortMACOS.cxx
diff --git a/src/macos/SerialPortMACOS.hxx b/src/os/macos/SerialPortMACOS.hxx
similarity index 100%
rename from src/macos/SerialPortMACOS.hxx
rename to src/os/macos/SerialPortMACOS.hxx
diff --git a/src/macos/SettingsRepositoryMACOS.hxx b/src/os/macos/SettingsRepositoryMACOS.hxx
similarity index 100%
rename from src/macos/SettingsRepositoryMACOS.hxx
rename to src/os/macos/SettingsRepositoryMACOS.hxx
diff --git a/src/macos/SettingsRepositoryMACOS.mm b/src/os/macos/SettingsRepositoryMACOS.mm
similarity index 100%
rename from src/macos/SettingsRepositoryMACOS.mm
rename to src/os/macos/SettingsRepositoryMACOS.mm
diff --git a/src/macos/Stella.icns b/src/os/macos/Stella.icns
similarity index 100%
rename from src/macos/Stella.icns
rename to src/os/macos/Stella.icns
diff --git a/src/macos/en.lproj/InfoPlist.strings b/src/os/macos/en.lproj/InfoPlist.strings
similarity index 100%
rename from src/macos/en.lproj/InfoPlist.strings
rename to src/os/macos/en.lproj/InfoPlist.strings
diff --git a/src/macos/stella.xcodeproj/project.pbxproj b/src/os/macos/stella.xcodeproj/project.pbxproj
similarity index 100%
rename from src/macos/stella.xcodeproj/project.pbxproj
rename to src/os/macos/stella.xcodeproj/project.pbxproj
diff --git a/src/macos/template.dmg.gz b/src/os/macos/template.dmg.gz
similarity index 100%
rename from src/macos/template.dmg.gz
rename to src/os/macos/template.dmg.gz
diff --git a/src/unix/FSNodePOSIX.cxx b/src/os/unix/FSNodePOSIX.cxx
similarity index 100%
rename from src/unix/FSNodePOSIX.cxx
rename to src/os/unix/FSNodePOSIX.cxx
diff --git a/src/unix/FSNodePOSIX.hxx b/src/os/unix/FSNodePOSIX.hxx
similarity index 100%
rename from src/unix/FSNodePOSIX.hxx
rename to src/os/unix/FSNodePOSIX.hxx
diff --git a/src/unix/OSystemUNIX.cxx b/src/os/unix/OSystemUNIX.cxx
similarity index 100%
rename from src/unix/OSystemUNIX.cxx
rename to src/os/unix/OSystemUNIX.cxx
diff --git a/src/unix/OSystemUNIX.hxx b/src/os/unix/OSystemUNIX.hxx
similarity index 100%
rename from src/unix/OSystemUNIX.hxx
rename to src/os/unix/OSystemUNIX.hxx
diff --git a/src/unix/SerialPortUNIX.cxx b/src/os/unix/SerialPortUNIX.cxx
similarity index 100%
rename from src/unix/SerialPortUNIX.cxx
rename to src/os/unix/SerialPortUNIX.cxx
diff --git a/src/unix/SerialPortUNIX.hxx b/src/os/unix/SerialPortUNIX.hxx
similarity index 100%
rename from src/unix/SerialPortUNIX.hxx
rename to src/os/unix/SerialPortUNIX.hxx
diff --git a/src/os/unix/module.mk b/src/os/unix/module.mk
new file mode 100644
index 000000000..782d3e98a
--- /dev/null
+++ b/src/os/unix/module.mk
@@ -0,0 +1,12 @@
+MODULE := src/os/unix
+
+MODULE_OBJS := \
+	src/os/unix/FSNodePOSIX.o \
+	src/os/unix/OSystemUNIX.o \
+	src/os/unix/SerialPortUNIX.o
+
+MODULE_DIRS += \
+	src/os/unix
+
+# Include common rules
+include $(srcdir)/common.rules
diff --git a/src/unix/r77/OSystemR77.cxx b/src/os/unix/r77/OSystemR77.cxx
similarity index 100%
rename from src/unix/r77/OSystemR77.cxx
rename to src/os/unix/r77/OSystemR77.cxx
diff --git a/src/unix/r77/OSystemR77.hxx b/src/os/unix/r77/OSystemR77.hxx
similarity index 100%
rename from src/unix/r77/OSystemR77.hxx
rename to src/os/unix/r77/OSystemR77.hxx
diff --git a/src/unix/r77/SettingsR77.cxx b/src/os/unix/r77/SettingsR77.cxx
similarity index 100%
rename from src/unix/r77/SettingsR77.cxx
rename to src/os/unix/r77/SettingsR77.cxx
diff --git a/src/unix/r77/SettingsR77.hxx b/src/os/unix/r77/SettingsR77.hxx
similarity index 100%
rename from src/unix/r77/SettingsR77.hxx
rename to src/os/unix/r77/SettingsR77.hxx
diff --git a/src/unix/r77/module.mk b/src/os/unix/r77/module.mk
similarity index 100%
rename from src/unix/r77/module.mk
rename to src/os/unix/r77/module.mk
diff --git a/src/unix/stella.desktop b/src/os/unix/stella.desktop
similarity index 100%
rename from src/unix/stella.desktop
rename to src/os/unix/stella.desktop
diff --git a/src/unix/stella.spec b/src/os/unix/stella.spec
similarity index 100%
rename from src/unix/stella.spec
rename to src/os/unix/stella.spec
diff --git a/src/windows/Create_Builds.bat b/src/os/windows/Create_Builds.bat
similarity index 100%
rename from src/windows/Create_Builds.bat
rename to src/os/windows/Create_Builds.bat
diff --git a/src/windows/FSNodeWINDOWS.cxx b/src/os/windows/FSNodeWINDOWS.cxx
similarity index 100%
rename from src/windows/FSNodeWINDOWS.cxx
rename to src/os/windows/FSNodeWINDOWS.cxx
diff --git a/src/windows/FSNodeWINDOWS.hxx b/src/os/windows/FSNodeWINDOWS.hxx
similarity index 100%
rename from src/windows/FSNodeWINDOWS.hxx
rename to src/os/windows/FSNodeWINDOWS.hxx
diff --git a/src/windows/HomeFinder.hxx b/src/os/windows/HomeFinder.hxx
similarity index 100%
rename from src/windows/HomeFinder.hxx
rename to src/os/windows/HomeFinder.hxx
diff --git a/src/windows/OSystemWINDOWS.cxx b/src/os/windows/OSystemWINDOWS.cxx
similarity index 100%
rename from src/windows/OSystemWINDOWS.cxx
rename to src/os/windows/OSystemWINDOWS.cxx
diff --git a/src/windows/OSystemWINDOWS.hxx b/src/os/windows/OSystemWINDOWS.hxx
similarity index 100%
rename from src/windows/OSystemWINDOWS.hxx
rename to src/os/windows/OSystemWINDOWS.hxx
diff --git a/src/windows/SerialPortWINDOWS.cxx b/src/os/windows/SerialPortWINDOWS.cxx
similarity index 100%
rename from src/windows/SerialPortWINDOWS.cxx
rename to src/os/windows/SerialPortWINDOWS.cxx
diff --git a/src/windows/SerialPortWINDOWS.hxx b/src/os/windows/SerialPortWINDOWS.hxx
similarity index 100%
rename from src/windows/SerialPortWINDOWS.hxx
rename to src/os/windows/SerialPortWINDOWS.hxx
diff --git a/src/windows/Stella.sln b/src/os/windows/Stella.sln
similarity index 100%
rename from src/windows/Stella.sln
rename to src/os/windows/Stella.sln
diff --git a/src/windows/Stella.vcxproj b/src/os/windows/Stella.vcxproj
similarity index 71%
rename from src/windows/Stella.vcxproj
rename to src/os/windows/Stella.vcxproj
index 83336a1af..3582b857f 100755
--- a/src/windows/Stella.vcxproj
+++ b/src/os/windows/Stella.vcxproj
@@ -249,7 +249,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;..\..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -283,7 +283,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -320,7 +320,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;..\..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -356,7 +356,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -390,7 +390,7 @@
     <ClCompile>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;..\..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -425,7 +425,7 @@
     <ClCompile>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;..\..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -460,7 +460,7 @@
     <ClCompile>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -499,7 +499,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;..\..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -538,7 +538,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;..\..\httplib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -577,7 +577,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\zlib;..\..\libpng;..\..\json;..\..\common\repository\sqlite;..\..\sqlite;..\..\nanojpeg;..\..\tinyexif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -608,338 +608,338 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\common\AudioQueue.cxx" />
-    <ClCompile Include="..\common\AudioSettings.cxx" />
-    <ClCompile Include="..\common\audio\ConvolutionBuffer.cxx" />
-    <ClCompile Include="..\common\audio\HighPass.cxx" />
-    <ClCompile Include="..\common\audio\LanczosResampler.cxx" />
-    <ClCompile Include="..\common\audio\SimpleResampler.cxx" />
-    <ClCompile Include="..\common\Base.cxx" />
-    <ClCompile Include="..\common\DevSettingsHandler.cxx" />
-    <ClCompile Include="..\common\EventHandlerSDL2.cxx" />
-    <ClCompile Include="..\common\FBBackendSDL2.cxx" />
-    <ClCompile Include="..\common\FBSurfaceSDL2.cxx" />
-    <ClCompile Include="..\common\FpsMeter.cxx" />
-    <ClCompile Include="..\common\FSNodeZIP.cxx" />
-    <ClCompile Include="..\common\HighScoresManager.cxx" />
-    <ClCompile Include="..\common\JoyMap.cxx" />
-    <ClCompile Include="..\common\JPGLibrary.cxx" />
-    <ClCompile Include="..\common\KeyMap.cxx" />
-    <ClCompile Include="..\common\Logger.cxx" />
-    <ClCompile Include="..\common\main.cxx" />
-    <ClCompile Include="..\common\MouseControl.cxx" />
-    <ClCompile Include="..\common\PaletteHandler.cxx" />
-    <ClCompile Include="..\common\PhosphorHandler.cxx" />
-    <ClCompile Include="..\common\PhysicalJoystick.cxx" />
-    <ClCompile Include="..\common\PJoystickHandler.cxx" />
-    <ClCompile Include="..\common\PKeyboardHandler.cxx" />
-    <ClCompile Include="..\common\repository\CompositeKeyValueRepository.cxx" />
-    <ClCompile Include="..\common\repository\CompositeKVRJsonAdapter.cxx" />
-    <ClCompile Include="..\common\repository\KeyValueRepositoryConfigfile.cxx" />
-    <ClCompile Include="..\common\repository\KeyValueRepositoryJsonFile.cxx" />
-    <ClCompile Include="..\common\repository\KeyValueRepositoryPropertyFile.cxx" />
-    <ClCompile Include="..\common\repository\sqlite\AbstractKeyValueRepositorySqlite.cxx" />
-    <ClCompile Include="..\common\repository\sqlite\CompositeKeyValueRepositorySqlite.cxx" />
-    <ClCompile Include="..\common\repository\sqlite\KeyValueRepositorySqlite.cxx" />
-    <ClCompile Include="..\common\repository\sqlite\SqliteDatabase.cxx" />
-    <ClCompile Include="..\common\repository\sqlite\SqliteStatement.cxx" />
-    <ClCompile Include="..\common\repository\sqlite\SqliteTransaction.cxx" />
-    <ClCompile Include="..\common\repository\sqlite\StellaDb.cxx" />
-    <ClCompile Include="..\common\RewindManager.cxx" />
-    <ClCompile Include="..\common\sdl_blitter\BilinearBlitter.cxx" />
-    <ClCompile Include="..\common\sdl_blitter\BlitterFactory.cxx" />
-    <ClCompile Include="..\common\sdl_blitter\QisBlitter.cxx" />
-    <ClCompile Include="..\common\StaggeredLogger.cxx" />
-    <ClCompile Include="..\common\StateManager.cxx" />
-    <ClCompile Include="..\common\ThreadDebugging.cxx" />
-    <ClCompile Include="..\common\TimerManager.cxx" />
-    <ClCompile Include="..\common\tv_filters\AtariNTSC.cxx" />
-    <ClCompile Include="..\common\tv_filters\NTSCFilter.cxx" />
-    <ClCompile Include="..\common\VideoModeHandler.cxx" />
-    <ClCompile Include="..\common\ZipHandler.cxx" />
-    <ClCompile Include="..\debugger\BreakpointMap.cxx">
+    <ClCompile Include="..\..\common\AudioQueue.cxx" />
+    <ClCompile Include="..\..\common\AudioSettings.cxx" />
+    <ClCompile Include="..\..\common\audio\ConvolutionBuffer.cxx" />
+    <ClCompile Include="..\..\common\audio\HighPass.cxx" />
+    <ClCompile Include="..\..\common\audio\LanczosResampler.cxx" />
+    <ClCompile Include="..\..\common\audio\SimpleResampler.cxx" />
+    <ClCompile Include="..\..\common\Base.cxx" />
+    <ClCompile Include="..\..\common\DevSettingsHandler.cxx" />
+    <ClCompile Include="..\..\common\EventHandlerSDL2.cxx" />
+    <ClCompile Include="..\..\common\FBBackendSDL2.cxx" />
+    <ClCompile Include="..\..\common\FBSurfaceSDL2.cxx" />
+    <ClCompile Include="..\..\common\FpsMeter.cxx" />
+    <ClCompile Include="..\..\common\FSNodeZIP.cxx" />
+    <ClCompile Include="..\..\common\HighScoresManager.cxx" />
+    <ClCompile Include="..\..\common\JoyMap.cxx" />
+    <ClCompile Include="..\..\common\JPGLibrary.cxx" />
+    <ClCompile Include="..\..\common\KeyMap.cxx" />
+    <ClCompile Include="..\..\common\Logger.cxx" />
+    <ClCompile Include="..\..\common\main.cxx" />
+    <ClCompile Include="..\..\common\MouseControl.cxx" />
+    <ClCompile Include="..\..\common\PaletteHandler.cxx" />
+    <ClCompile Include="..\..\common\PhosphorHandler.cxx" />
+    <ClCompile Include="..\..\common\PhysicalJoystick.cxx" />
+    <ClCompile Include="..\..\common\PJoystickHandler.cxx" />
+    <ClCompile Include="..\..\common\PKeyboardHandler.cxx" />
+    <ClCompile Include="..\..\common\repository\CompositeKeyValueRepository.cxx" />
+    <ClCompile Include="..\..\common\repository\CompositeKVRJsonAdapter.cxx" />
+    <ClCompile Include="..\..\common\repository\KeyValueRepositoryConfigfile.cxx" />
+    <ClCompile Include="..\..\common\repository\KeyValueRepositoryJsonFile.cxx" />
+    <ClCompile Include="..\..\common\repository\KeyValueRepositoryPropertyFile.cxx" />
+    <ClCompile Include="..\..\common\repository\sqlite\AbstractKeyValueRepositorySqlite.cxx" />
+    <ClCompile Include="..\..\common\repository\sqlite\CompositeKeyValueRepositorySqlite.cxx" />
+    <ClCompile Include="..\..\common\repository\sqlite\KeyValueRepositorySqlite.cxx" />
+    <ClCompile Include="..\..\common\repository\sqlite\SqliteDatabase.cxx" />
+    <ClCompile Include="..\..\common\repository\sqlite\SqliteStatement.cxx" />
+    <ClCompile Include="..\..\common\repository\sqlite\SqliteTransaction.cxx" />
+    <ClCompile Include="..\..\common\repository\sqlite\StellaDb.cxx" />
+    <ClCompile Include="..\..\common\RewindManager.cxx" />
+    <ClCompile Include="..\..\common\sdl_blitter\BilinearBlitter.cxx" />
+    <ClCompile Include="..\..\common\sdl_blitter\BlitterFactory.cxx" />
+    <ClCompile Include="..\..\common\sdl_blitter\QisBlitter.cxx" />
+    <ClCompile Include="..\..\common\StaggeredLogger.cxx" />
+    <ClCompile Include="..\..\common\StateManager.cxx" />
+    <ClCompile Include="..\..\common\ThreadDebugging.cxx" />
+    <ClCompile Include="..\..\common\TimerManager.cxx" />
+    <ClCompile Include="..\..\common\tv_filters\AtariNTSC.cxx" />
+    <ClCompile Include="..\..\common\tv_filters\NTSCFilter.cxx" />
+    <ClCompile Include="..\..\common\VideoModeHandler.cxx" />
+    <ClCompile Include="..\..\common\ZipHandler.cxx" />
+    <ClCompile Include="..\..\debugger\BreakpointMap.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\Debugger.cxx">
+    <ClCompile Include="..\..\debugger\Debugger.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\AmigaMouseWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\AmigaMouseWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\AtariMouseWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\AtariMouseWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\AtariVoxWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\AtariVoxWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\BoosterWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\BoosterWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart0840Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart0840Widget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart0FA0Widget.cxx" />
-    <ClCompile Include="..\debugger\gui\Cart2KWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart0FA0Widget.cxx" />
+    <ClCompile Include="..\..\debugger\gui\Cart2KWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart3EPlusWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart3EPlusWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart3EWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart3EWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart3FWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart3FWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart4A50Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart4A50Widget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart4KSCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart4KSCWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart4KWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart4KWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartARMWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartARMWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartARWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartARWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartBFSCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartBFSCWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartBFWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartBFWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartBUSInfoWidget.cxx" />
-    <ClCompile Include="..\debugger\gui\CartBUSWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartBUSInfoWidget.cxx" />
+    <ClCompile Include="..\..\debugger\gui\CartBUSWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCDFInfoWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCDFInfoWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCDFWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCDFWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCMWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCMWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCTYWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCTYWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCVWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCVWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDebugWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDebugWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDFSCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDFSCWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDFWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDFWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDPCPlusWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDPCPlusWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDPCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDPCWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartE0Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartE0Widget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartE7Widget.cxx" />
-    <ClCompile Include="..\debugger\gui\CartEFSCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartE7Widget.cxx" />
+    <ClCompile Include="..\..\debugger\gui\CartEFSCWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartEFWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartEFWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartEnhancedWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartEnhancedWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF0Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF0Widget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF4SCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF4SCWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF4Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF4Widget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF6SCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF6SCWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF6Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF6Widget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF8SCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF8SCWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF8Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF8Widget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartFA2Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartFA2Widget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartFAWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartFAWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartFCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartFCWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartFEWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartFEWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartMDMWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartMDMWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartRamWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartRamWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartTVBoyWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartTVBoyWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartSBWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartSBWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartUAWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartUAWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartWDWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartWDWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartX07Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartX07Widget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DataGridRamWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DataGridRamWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DelayQueueWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DelayQueueWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DrivingWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DrivingWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\FlashWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\FlashWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\GenesisWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\GenesisWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Joy2BPlusWidget.cxx" />
-    <ClCompile Include="..\debugger\gui\JoystickWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Joy2BPlusWidget.cxx" />
+    <ClCompile Include="..\..\debugger\gui\JoystickWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\KeyboardWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\KeyboardWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\PaddleWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\PaddleWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\PointingDeviceWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\PointingDeviceWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\QuadTariWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\QuadTariWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RiotRamWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RiotRamWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RomListSettings.cxx">
+    <ClCompile Include="..\..\debugger\gui\RomListSettings.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\SaveKeyWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\SaveKeyWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TrakBallWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TrakBallWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\emucore\Bankswitch.cxx" />
-    <ClCompile Include="..\emucore\Cart3EPlus.cxx" />
-    <ClCompile Include="..\emucore\Cart3EX.cxx" />
-    <ClCompile Include="..\emucore\Cart4KSC.cxx" />
-    <ClCompile Include="..\emucore\CartARM.cxx" />
-    <ClCompile Include="..\emucore\Cart0FA0.cxx" />
-    <ClCompile Include="..\emucore\CartCreator.cxx" />
-    <ClCompile Include="..\emucore\CartE7.cxx" />
-    <ClCompile Include="..\emucore\CartEnhanced.cxx" />
-    <ClCompile Include="..\emucore\CartBF.cxx" />
-    <ClCompile Include="..\emucore\CartBFSC.cxx" />
-    <ClCompile Include="..\emucore\CartBUS.cxx" />
-    <ClCompile Include="..\emucore\CartCDF.cxx" />
-    <ClCompile Include="..\emucore\CartCM.cxx" />
-    <ClCompile Include="..\emucore\CartCTY.cxx" />
-    <ClCompile Include="..\emucore\CartDetector.cxx" />
-    <ClCompile Include="..\emucore\CartDF.cxx" />
-    <ClCompile Include="..\emucore\CartDFSC.cxx" />
-    <ClCompile Include="..\emucore\CartFA2.cxx" />
-    <ClCompile Include="..\emucore\CartFC.cxx" />
-    <ClCompile Include="..\emucore\CartMDM.cxx" />
-    <ClCompile Include="..\emucore\CartMVC.cxx" />
-    <ClCompile Include="..\emucore\CartTVBoy.cxx" />
-    <ClCompile Include="..\emucore\CartWD.cxx" />
-    <ClCompile Include="..\emucore\CompuMate.cxx" />
-    <ClCompile Include="..\emucore\ControllerDetector.cxx" />
-    <ClCompile Include="..\emucore\DispatchResult.cxx" />
-    <ClCompile Include="..\emucore\EmulationTiming.cxx" />
-    <ClCompile Include="..\emucore\EmulationWorker.cxx" />
-    <ClCompile Include="..\emucore\FBSurface.cxx" />
-    <ClCompile Include="..\emucore\GlobalKeyHandler.cxx" />
-    <ClCompile Include="..\emucore\Joy2BPlus.cxx" />
-    <ClCompile Include="..\emucore\Lightgun.cxx" />
-    <ClCompile Include="..\emucore\MindLink.cxx" />
-    <ClCompile Include="..\emucore\OSystemStandalone.cxx" />
-    <ClCompile Include="..\emucore\PlusROM.cxx" />
-    <ClCompile Include="..\emucore\PointingDevice.cxx" />
-    <ClCompile Include="..\emucore\ProfilingRunner.cxx" />
-    <ClCompile Include="..\emucore\QuadTari.cxx" />
-    <ClCompile Include="..\emucore\TIASurface.cxx" />
-    <ClCompile Include="..\emucore\tia\Audio.cxx" />
-    <ClCompile Include="..\emucore\tia\AudioChannel.cxx" />
-    <ClCompile Include="..\emucore\tia\Background.cxx" />
-    <ClCompile Include="..\emucore\tia\Ball.cxx" />
-    <ClCompile Include="..\emucore\tia\DrawCounterDecodes.cxx" />
-    <ClCompile Include="..\emucore\tia\frame-manager\AbstractFrameManager.cxx" />
-    <ClCompile Include="..\emucore\tia\frame-manager\FrameLayoutDetector.cxx" />
-    <ClCompile Include="..\emucore\tia\frame-manager\FrameManager.cxx" />
-    <ClCompile Include="..\emucore\tia\frame-manager\JitterEmulation.cxx" />
-    <ClCompile Include="..\emucore\tia\LatchedInput.cxx" />
-    <ClCompile Include="..\emucore\tia\Missile.cxx" />
-    <ClCompile Include="..\emucore\tia\AnalogReadout.cxx" />
-    <ClCompile Include="..\emucore\tia\Player.cxx" />
-    <ClCompile Include="..\emucore\tia\Playfield.cxx" />
-    <ClCompile Include="..\emucore\tia\TIA.cxx" />
-    <ClCompile Include="..\gui\ColorWidget.cxx" />
-    <ClCompile Include="..\gui\DeveloperDialog.cxx" />
-    <ClCompile Include="..\gui\EmulationDialog.cxx" />
-    <ClCompile Include="..\gui\FavoritesManager.cxx" />
-    <ClCompile Include="..\gui\FileListWidget.cxx" />
-    <ClCompile Include="..\gui\HighScoresDialog.cxx" />
-    <ClCompile Include="..\gui\HighScoresMenu.cxx" />
-    <ClCompile Include="..\gui\LauncherFileListWidget.cxx" />
-    <ClCompile Include="..\gui\NavigationWidget.cxx" />
-    <ClCompile Include="..\gui\PlusRomsMenu.cxx" />
-    <ClCompile Include="..\gui\JoystickDialog.cxx" />
-    <ClCompile Include="..\gui\LoggerDialog.cxx" />
-    <ClCompile Include="..\gui\MessageDialog.cxx" />
-    <ClCompile Include="..\gui\MessageMenu.cxx" />
-    <ClCompile Include="..\gui\MinUICommandDialog.cxx" />
-    <ClCompile Include="..\gui\PlusRomsSetupDialog.cxx" />
-    <ClCompile Include="..\gui\QuadTariDialog.cxx" />
-    <ClCompile Include="..\gui\R77HelpDialog.cxx" />
-    <ClCompile Include="..\gui\RadioButtonWidget.cxx" />
-    <ClCompile Include="..\gui\RomImageWidget.cxx" />
-    <ClCompile Include="..\gui\SnapshotDialog.cxx" />
-    <ClCompile Include="..\gui\StellaSettingsDialog.cxx" />
-    <ClCompile Include="..\gui\TimeLineWidget.cxx" />
-    <ClCompile Include="..\gui\TimeMachine.cxx" />
-    <ClCompile Include="..\gui\TimeMachineDialog.cxx" />
-    <ClCompile Include="..\gui\ToolTip.cxx" />
-    <ClCompile Include="..\gui\UndoHandler.cxx" />
-    <ClCompile Include="..\gui\WhatsNewDialog.cxx" />
-    <ClCompile Include="..\sqlite\source\sqlite3.c">
+    <ClCompile Include="..\..\emucore\Bankswitch.cxx" />
+    <ClCompile Include="..\..\emucore\Cart3EPlus.cxx" />
+    <ClCompile Include="..\..\emucore\Cart3EX.cxx" />
+    <ClCompile Include="..\..\emucore\Cart4KSC.cxx" />
+    <ClCompile Include="..\..\emucore\CartARM.cxx" />
+    <ClCompile Include="..\..\emucore\Cart0FA0.cxx" />
+    <ClCompile Include="..\..\emucore\CartCreator.cxx" />
+    <ClCompile Include="..\..\emucore\CartE7.cxx" />
+    <ClCompile Include="..\..\emucore\CartEnhanced.cxx" />
+    <ClCompile Include="..\..\emucore\CartBF.cxx" />
+    <ClCompile Include="..\..\emucore\CartBFSC.cxx" />
+    <ClCompile Include="..\..\emucore\CartBUS.cxx" />
+    <ClCompile Include="..\..\emucore\CartCDF.cxx" />
+    <ClCompile Include="..\..\emucore\CartCM.cxx" />
+    <ClCompile Include="..\..\emucore\CartCTY.cxx" />
+    <ClCompile Include="..\..\emucore\CartDetector.cxx" />
+    <ClCompile Include="..\..\emucore\CartDF.cxx" />
+    <ClCompile Include="..\..\emucore\CartDFSC.cxx" />
+    <ClCompile Include="..\..\emucore\CartFA2.cxx" />
+    <ClCompile Include="..\..\emucore\CartFC.cxx" />
+    <ClCompile Include="..\..\emucore\CartMDM.cxx" />
+    <ClCompile Include="..\..\emucore\CartMVC.cxx" />
+    <ClCompile Include="..\..\emucore\CartTVBoy.cxx" />
+    <ClCompile Include="..\..\emucore\CartWD.cxx" />
+    <ClCompile Include="..\..\emucore\CompuMate.cxx" />
+    <ClCompile Include="..\..\emucore\ControllerDetector.cxx" />
+    <ClCompile Include="..\..\emucore\DispatchResult.cxx" />
+    <ClCompile Include="..\..\emucore\EmulationTiming.cxx" />
+    <ClCompile Include="..\..\emucore\EmulationWorker.cxx" />
+    <ClCompile Include="..\..\emucore\FBSurface.cxx" />
+    <ClCompile Include="..\..\emucore\GlobalKeyHandler.cxx" />
+    <ClCompile Include="..\..\emucore\Joy2BPlus.cxx" />
+    <ClCompile Include="..\..\emucore\Lightgun.cxx" />
+    <ClCompile Include="..\..\emucore\MindLink.cxx" />
+    <ClCompile Include="..\..\emucore\OSystemStandalone.cxx" />
+    <ClCompile Include="..\..\emucore\PlusROM.cxx" />
+    <ClCompile Include="..\..\emucore\PointingDevice.cxx" />
+    <ClCompile Include="..\..\emucore\ProfilingRunner.cxx" />
+    <ClCompile Include="..\..\emucore\QuadTari.cxx" />
+    <ClCompile Include="..\..\emucore\TIASurface.cxx" />
+    <ClCompile Include="..\..\emucore\tia\Audio.cxx" />
+    <ClCompile Include="..\..\emucore\tia\AudioChannel.cxx" />
+    <ClCompile Include="..\..\emucore\tia\Background.cxx" />
+    <ClCompile Include="..\..\emucore\tia\Ball.cxx" />
+    <ClCompile Include="..\..\emucore\tia\DrawCounterDecodes.cxx" />
+    <ClCompile Include="..\..\emucore\tia\frame-manager\AbstractFrameManager.cxx" />
+    <ClCompile Include="..\..\emucore\tia\frame-manager\FrameLayoutDetector.cxx" />
+    <ClCompile Include="..\..\emucore\tia\frame-manager\FrameManager.cxx" />
+    <ClCompile Include="..\..\emucore\tia\frame-manager\JitterEmulation.cxx" />
+    <ClCompile Include="..\..\emucore\tia\LatchedInput.cxx" />
+    <ClCompile Include="..\..\emucore\tia\Missile.cxx" />
+    <ClCompile Include="..\..\emucore\tia\AnalogReadout.cxx" />
+    <ClCompile Include="..\..\emucore\tia\Player.cxx" />
+    <ClCompile Include="..\..\emucore\tia\Playfield.cxx" />
+    <ClCompile Include="..\..\emucore\tia\TIA.cxx" />
+    <ClCompile Include="..\..\gui\ColorWidget.cxx" />
+    <ClCompile Include="..\..\gui\DeveloperDialog.cxx" />
+    <ClCompile Include="..\..\gui\EmulationDialog.cxx" />
+    <ClCompile Include="..\..\gui\FavoritesManager.cxx" />
+    <ClCompile Include="..\..\gui\FileListWidget.cxx" />
+    <ClCompile Include="..\..\gui\HighScoresDialog.cxx" />
+    <ClCompile Include="..\..\gui\HighScoresMenu.cxx" />
+    <ClCompile Include="..\..\gui\LauncherFileListWidget.cxx" />
+    <ClCompile Include="..\..\gui\NavigationWidget.cxx" />
+    <ClCompile Include="..\..\gui\PlusRomsMenu.cxx" />
+    <ClCompile Include="..\..\gui\JoystickDialog.cxx" />
+    <ClCompile Include="..\..\gui\LoggerDialog.cxx" />
+    <ClCompile Include="..\..\gui\MessageDialog.cxx" />
+    <ClCompile Include="..\..\gui\MessageMenu.cxx" />
+    <ClCompile Include="..\..\gui\MinUICommandDialog.cxx" />
+    <ClCompile Include="..\..\gui\PlusRomsSetupDialog.cxx" />
+    <ClCompile Include="..\..\gui\QuadTariDialog.cxx" />
+    <ClCompile Include="..\..\gui\R77HelpDialog.cxx" />
+    <ClCompile Include="..\..\gui\RadioButtonWidget.cxx" />
+    <ClCompile Include="..\..\gui\RomImageWidget.cxx" />
+    <ClCompile Include="..\..\gui\SnapshotDialog.cxx" />
+    <ClCompile Include="..\..\gui\StellaSettingsDialog.cxx" />
+    <ClCompile Include="..\..\gui\TimeLineWidget.cxx" />
+    <ClCompile Include="..\..\gui\TimeMachine.cxx" />
+    <ClCompile Include="..\..\gui\TimeMachineDialog.cxx" />
+    <ClCompile Include="..\..\gui\ToolTip.cxx" />
+    <ClCompile Include="..\..\gui\UndoHandler.cxx" />
+    <ClCompile Include="..\..\gui\WhatsNewDialog.cxx" />
+    <ClCompile Include="..\..\sqlite\source\sqlite3.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -951,176 +951,176 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\tinyexif\tinyexif.cxx" />
+    <ClCompile Include="..\..\tinyexif\tinyexif.cxx" />
     <ClCompile Include="FSNodeWINDOWS.cxx" />
     <ClCompile Include="OSystemWINDOWS.cxx" />
-    <ClCompile Include="..\common\PNGLibrary.cxx" />
+    <ClCompile Include="..\..\common\PNGLibrary.cxx" />
     <ClCompile Include="SerialPortWINDOWS.cxx" />
-    <ClCompile Include="..\common\SoundSDL2.cxx" />
-    <ClCompile Include="..\emucore\AtariVox.cxx" />
-    <ClCompile Include="..\emucore\Booster.cxx" />
-    <ClCompile Include="..\emucore\Cart.cxx" />
-    <ClCompile Include="..\emucore\Cart0840.cxx" />
-    <ClCompile Include="..\emucore\Cart2K.cxx" />
-    <ClCompile Include="..\emucore\Cart3E.cxx" />
-    <ClCompile Include="..\emucore\Cart3F.cxx" />
-    <ClCompile Include="..\emucore\Cart4A50.cxx" />
-    <ClCompile Include="..\emucore\Cart4K.cxx" />
-    <ClCompile Include="..\emucore\CartAR.cxx" />
-    <ClCompile Include="..\emucore\CartCV.cxx" />
-    <ClCompile Include="..\emucore\CartDPC.cxx" />
-    <ClCompile Include="..\emucore\CartDPCPlus.cxx" />
-    <ClCompile Include="..\emucore\CartE0.cxx" />
-    <ClCompile Include="..\emucore\CartEF.cxx" />
-    <ClCompile Include="..\emucore\CartEFSC.cxx" />
-    <ClCompile Include="..\emucore\CartF0.cxx" />
-    <ClCompile Include="..\emucore\CartF4.cxx" />
-    <ClCompile Include="..\emucore\CartF4SC.cxx" />
-    <ClCompile Include="..\emucore\CartF6.cxx" />
-    <ClCompile Include="..\emucore\CartF6SC.cxx" />
-    <ClCompile Include="..\emucore\CartF8.cxx" />
-    <ClCompile Include="..\emucore\CartF8SC.cxx" />
-    <ClCompile Include="..\emucore\CartFA.cxx" />
-    <ClCompile Include="..\emucore\CartFE.cxx" />
-    <ClCompile Include="..\emucore\CartSB.cxx" />
-    <ClCompile Include="..\emucore\CartUA.cxx" />
-    <ClCompile Include="..\emucore\CartX07.cxx" />
-    <ClCompile Include="..\emucore\Console.cxx" />
-    <ClCompile Include="..\emucore\Control.cxx" />
-    <ClCompile Include="..\emucore\Driving.cxx" />
-    <ClCompile Include="..\emucore\EventHandler.cxx" />
-    <ClCompile Include="..\emucore\FrameBuffer.cxx" />
-    <ClCompile Include="..\emucore\FSNode.cxx" />
-    <ClCompile Include="..\emucore\Genesis.cxx" />
-    <ClCompile Include="..\emucore\Joystick.cxx" />
-    <ClCompile Include="..\emucore\Keyboard.cxx" />
-    <ClCompile Include="..\emucore\KidVid.cxx" />
-    <ClCompile Include="..\emucore\M6502.cxx" />
-    <ClCompile Include="..\emucore\M6532.cxx" />
-    <ClCompile Include="..\emucore\MD5.cxx" />
-    <ClCompile Include="..\emucore\MT24LC256.cxx" />
-    <ClCompile Include="..\emucore\OSystem.cxx" />
-    <ClCompile Include="..\emucore\Paddles.cxx" />
-    <ClCompile Include="..\emucore\Props.cxx" />
-    <ClCompile Include="..\emucore\PropsSet.cxx" />
-    <ClCompile Include="..\emucore\SaveKey.cxx" />
-    <ClCompile Include="..\emucore\Serializer.cxx" />
-    <ClCompile Include="..\emucore\Settings.cxx" />
-    <ClCompile Include="..\emucore\Switches.cxx" />
-    <ClCompile Include="..\emucore\System.cxx" />
-    <ClCompile Include="..\emucore\Thumbulator.cxx" />
-    <ClCompile Include="..\cheat\BankRomCheat.cxx" />
-    <ClCompile Include="..\cheat\CheatCodeDialog.cxx" />
-    <ClCompile Include="..\cheat\CheatManager.cxx" />
-    <ClCompile Include="..\cheat\CheetahCheat.cxx" />
-    <ClCompile Include="..\cheat\RamCheat.cxx" />
-    <ClCompile Include="..\debugger\gui\AudioWidget.cxx">
+    <ClCompile Include="..\..\common\SoundSDL2.cxx" />
+    <ClCompile Include="..\..\emucore\AtariVox.cxx" />
+    <ClCompile Include="..\..\emucore\Booster.cxx" />
+    <ClCompile Include="..\..\emucore\Cart.cxx" />
+    <ClCompile Include="..\..\emucore\Cart0840.cxx" />
+    <ClCompile Include="..\..\emucore\Cart2K.cxx" />
+    <ClCompile Include="..\..\emucore\Cart3E.cxx" />
+    <ClCompile Include="..\..\emucore\Cart3F.cxx" />
+    <ClCompile Include="..\..\emucore\Cart4A50.cxx" />
+    <ClCompile Include="..\..\emucore\Cart4K.cxx" />
+    <ClCompile Include="..\..\emucore\CartAR.cxx" />
+    <ClCompile Include="..\..\emucore\CartCV.cxx" />
+    <ClCompile Include="..\..\emucore\CartDPC.cxx" />
+    <ClCompile Include="..\..\emucore\CartDPCPlus.cxx" />
+    <ClCompile Include="..\..\emucore\CartE0.cxx" />
+    <ClCompile Include="..\..\emucore\CartEF.cxx" />
+    <ClCompile Include="..\..\emucore\CartEFSC.cxx" />
+    <ClCompile Include="..\..\emucore\CartF0.cxx" />
+    <ClCompile Include="..\..\emucore\CartF4.cxx" />
+    <ClCompile Include="..\..\emucore\CartF4SC.cxx" />
+    <ClCompile Include="..\..\emucore\CartF6.cxx" />
+    <ClCompile Include="..\..\emucore\CartF6SC.cxx" />
+    <ClCompile Include="..\..\emucore\CartF8.cxx" />
+    <ClCompile Include="..\..\emucore\CartF8SC.cxx" />
+    <ClCompile Include="..\..\emucore\CartFA.cxx" />
+    <ClCompile Include="..\..\emucore\CartFE.cxx" />
+    <ClCompile Include="..\..\emucore\CartSB.cxx" />
+    <ClCompile Include="..\..\emucore\CartUA.cxx" />
+    <ClCompile Include="..\..\emucore\CartX07.cxx" />
+    <ClCompile Include="..\..\emucore\Console.cxx" />
+    <ClCompile Include="..\..\emucore\Control.cxx" />
+    <ClCompile Include="..\..\emucore\Driving.cxx" />
+    <ClCompile Include="..\..\emucore\EventHandler.cxx" />
+    <ClCompile Include="..\..\emucore\FrameBuffer.cxx" />
+    <ClCompile Include="..\..\emucore\FSNode.cxx" />
+    <ClCompile Include="..\..\emucore\Genesis.cxx" />
+    <ClCompile Include="..\..\emucore\Joystick.cxx" />
+    <ClCompile Include="..\..\emucore\Keyboard.cxx" />
+    <ClCompile Include="..\..\emucore\KidVid.cxx" />
+    <ClCompile Include="..\..\emucore\M6502.cxx" />
+    <ClCompile Include="..\..\emucore\M6532.cxx" />
+    <ClCompile Include="..\..\emucore\MD5.cxx" />
+    <ClCompile Include="..\..\emucore\MT24LC256.cxx" />
+    <ClCompile Include="..\..\emucore\OSystem.cxx" />
+    <ClCompile Include="..\..\emucore\Paddles.cxx" />
+    <ClCompile Include="..\..\emucore\Props.cxx" />
+    <ClCompile Include="..\..\emucore\PropsSet.cxx" />
+    <ClCompile Include="..\..\emucore\SaveKey.cxx" />
+    <ClCompile Include="..\..\emucore\Serializer.cxx" />
+    <ClCompile Include="..\..\emucore\Settings.cxx" />
+    <ClCompile Include="..\..\emucore\Switches.cxx" />
+    <ClCompile Include="..\..\emucore\System.cxx" />
+    <ClCompile Include="..\..\emucore\Thumbulator.cxx" />
+    <ClCompile Include="..\..\cheat\BankRomCheat.cxx" />
+    <ClCompile Include="..\..\cheat\CheatCodeDialog.cxx" />
+    <ClCompile Include="..\..\cheat\CheatManager.cxx" />
+    <ClCompile Include="..\..\cheat\CheetahCheat.cxx" />
+    <ClCompile Include="..\..\cheat\RamCheat.cxx" />
+    <ClCompile Include="..\..\debugger\gui\AudioWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\CartDebug.cxx">
+    <ClCompile Include="..\..\debugger\CartDebug.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\CpuDebug.cxx">
+    <ClCompile Include="..\..\debugger\CpuDebug.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CpuWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CpuWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DataGridOpsWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DataGridOpsWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DataGridWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DataGridWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DebuggerDialog.cxx">
+    <ClCompile Include="..\..\debugger\gui\DebuggerDialog.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\DebuggerParser.cxx">
+    <ClCompile Include="..\..\debugger\DebuggerParser.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\DiStella.cxx">
+    <ClCompile Include="..\..\debugger\DiStella.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\PromptWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\PromptWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RamWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RamWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\RiotDebug.cxx">
+    <ClCompile Include="..\..\debugger\RiotDebug.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RiotWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RiotWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RomListWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RomListWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RomWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RomWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\TIADebug.cxx">
+    <ClCompile Include="..\..\debugger\TIADebug.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TiaInfoWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TiaInfoWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TiaOutputWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TiaOutputWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TiaWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TiaWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TiaZoomWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TiaZoomWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\ToggleBitWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\ToggleBitWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TogglePixelWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TogglePixelWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\ToggleWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\ToggleWidget.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\yacc\YaccParser.cxx">
+    <ClCompile Include="..\..\yacc\YaccParser.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\gui\AboutDialog.cxx" />
-    <ClCompile Include="..\gui\BrowserDialog.cxx" />
-    <ClCompile Include="..\gui\CheckListWidget.cxx" />
-    <ClCompile Include="..\gui\ComboDialog.cxx" />
-    <ClCompile Include="..\gui\CommandDialog.cxx" />
-    <ClCompile Include="..\gui\CommandMenu.cxx" />
-    <ClCompile Include="..\gui\ContextMenu.cxx" />
-    <ClCompile Include="..\gui\Dialog.cxx" />
-    <ClCompile Include="..\gui\DialogContainer.cxx" />
-    <ClCompile Include="..\gui\EditableWidget.cxx" />
-    <ClCompile Include="..\gui\EditTextWidget.cxx" />
-    <ClCompile Include="..\gui\EventMappingWidget.cxx" />
-    <ClCompile Include="..\gui\Font.cxx" />
-    <ClCompile Include="..\gui\GameInfoDialog.cxx" />
-    <ClCompile Include="..\gui\GlobalPropsDialog.cxx" />
-    <ClCompile Include="..\gui\HelpDialog.cxx" />
-    <ClCompile Include="..\gui\InputDialog.cxx" />
-    <ClCompile Include="..\gui\InputTextDialog.cxx" />
-    <ClCompile Include="..\gui\Launcher.cxx" />
-    <ClCompile Include="..\gui\LauncherDialog.cxx" />
-    <ClCompile Include="..\gui\ListWidget.cxx" />
-    <ClCompile Include="..\gui\OptionsMenu.cxx" />
-    <ClCompile Include="..\gui\MessageBox.cxx" />
-    <ClCompile Include="..\gui\OptionsDialog.cxx" />
-    <ClCompile Include="..\gui\PopUpWidget.cxx" />
-    <ClCompile Include="..\gui\ProgressDialog.cxx" />
-    <ClCompile Include="..\gui\RomAuditDialog.cxx" />
-    <ClCompile Include="..\gui\RomInfoWidget.cxx" />
-    <ClCompile Include="..\gui\ScrollBarWidget.cxx" />
-    <ClCompile Include="..\gui\StringListWidget.cxx" />
-    <ClCompile Include="..\gui\TabWidget.cxx" />
-    <ClCompile Include="..\gui\UIDialog.cxx" />
-    <ClCompile Include="..\gui\VideoAudioDialog.cxx" />
-    <ClCompile Include="..\gui\Widget.cxx" />
-    <ClCompile Include="..\zlib\adler32.c">
+    <ClCompile Include="..\..\gui\AboutDialog.cxx" />
+    <ClCompile Include="..\..\gui\BrowserDialog.cxx" />
+    <ClCompile Include="..\..\gui\CheckListWidget.cxx" />
+    <ClCompile Include="..\..\gui\ComboDialog.cxx" />
+    <ClCompile Include="..\..\gui\CommandDialog.cxx" />
+    <ClCompile Include="..\..\gui\CommandMenu.cxx" />
+    <ClCompile Include="..\..\gui\ContextMenu.cxx" />
+    <ClCompile Include="..\..\gui\Dialog.cxx" />
+    <ClCompile Include="..\..\gui\DialogContainer.cxx" />
+    <ClCompile Include="..\..\gui\EditableWidget.cxx" />
+    <ClCompile Include="..\..\gui\EditTextWidget.cxx" />
+    <ClCompile Include="..\..\gui\EventMappingWidget.cxx" />
+    <ClCompile Include="..\..\gui\Font.cxx" />
+    <ClCompile Include="..\..\gui\GameInfoDialog.cxx" />
+    <ClCompile Include="..\..\gui\GlobalPropsDialog.cxx" />
+    <ClCompile Include="..\..\gui\HelpDialog.cxx" />
+    <ClCompile Include="..\..\gui\InputDialog.cxx" />
+    <ClCompile Include="..\..\gui\InputTextDialog.cxx" />
+    <ClCompile Include="..\..\gui\Launcher.cxx" />
+    <ClCompile Include="..\..\gui\LauncherDialog.cxx" />
+    <ClCompile Include="..\..\gui\ListWidget.cxx" />
+    <ClCompile Include="..\..\gui\OptionsMenu.cxx" />
+    <ClCompile Include="..\..\gui\MessageBox.cxx" />
+    <ClCompile Include="..\..\gui\OptionsDialog.cxx" />
+    <ClCompile Include="..\..\gui\PopUpWidget.cxx" />
+    <ClCompile Include="..\..\gui\ProgressDialog.cxx" />
+    <ClCompile Include="..\..\gui\RomAuditDialog.cxx" />
+    <ClCompile Include="..\..\gui\RomInfoWidget.cxx" />
+    <ClCompile Include="..\..\gui\ScrollBarWidget.cxx" />
+    <ClCompile Include="..\..\gui\StringListWidget.cxx" />
+    <ClCompile Include="..\..\gui\TabWidget.cxx" />
+    <ClCompile Include="..\..\gui\UIDialog.cxx" />
+    <ClCompile Include="..\..\gui\VideoAudioDialog.cxx" />
+    <ClCompile Include="..\..\gui\Widget.cxx" />
+    <ClCompile Include="..\..\zlib\adler32.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1142,7 +1142,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\compress.c">
+    <ClCompile Include="..\..\zlib\compress.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1164,7 +1164,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\crc32.c">
+    <ClCompile Include="..\..\zlib\crc32.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1186,7 +1186,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\deflate.c">
+    <ClCompile Include="..\..\zlib\deflate.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1208,7 +1208,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\gzclose.c">
+    <ClCompile Include="..\..\zlib\gzclose.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1230,7 +1230,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\gzlib.c">
+    <ClCompile Include="..\..\zlib\gzlib.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1252,7 +1252,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\gzread.c">
+    <ClCompile Include="..\..\zlib\gzread.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1274,7 +1274,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\gzwrite.c">
+    <ClCompile Include="..\..\zlib\gzwrite.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1296,7 +1296,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\infback.c">
+    <ClCompile Include="..\..\zlib\infback.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1318,7 +1318,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\inffast.c">
+    <ClCompile Include="..\..\zlib\inffast.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1340,7 +1340,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\inflate.c">
+    <ClCompile Include="..\..\zlib\inflate.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1362,7 +1362,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\inftrees.c">
+    <ClCompile Include="..\..\zlib\inftrees.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1384,7 +1384,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\trees.c">
+    <ClCompile Include="..\..\zlib\trees.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1406,7 +1406,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\uncompr.c">
+    <ClCompile Include="..\..\zlib\uncompr.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1428,7 +1428,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\zlib\zutil.c">
+    <ClCompile Include="..\..\zlib\zutil.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -1450,7 +1450,7 @@
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Level2</WarningLevel>
     </ClCompile>
-    <ClCompile Include="..\libpng\png.c">
+    <ClCompile Include="..\..\libpng\png.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1472,7 +1472,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngerror.c">
+    <ClCompile Include="..\..\libpng\pngerror.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1494,7 +1494,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngget.c">
+    <ClCompile Include="..\..\libpng\pngget.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1516,7 +1516,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngmem.c">
+    <ClCompile Include="..\..\libpng\pngmem.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1538,7 +1538,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngpread.c">
+    <ClCompile Include="..\..\libpng\pngpread.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1560,7 +1560,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngread.c">
+    <ClCompile Include="..\..\libpng\pngread.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1582,7 +1582,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngrio.c">
+    <ClCompile Include="..\..\libpng\pngrio.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1604,7 +1604,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngrtran.c">
+    <ClCompile Include="..\..\libpng\pngrtran.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1626,7 +1626,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngrutil.c">
+    <ClCompile Include="..\..\libpng\pngrutil.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1648,7 +1648,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngset.c">
+    <ClCompile Include="..\..\libpng\pngset.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1670,7 +1670,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngtrans.c">
+    <ClCompile Include="..\..\libpng\pngtrans.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1692,7 +1692,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngwio.c">
+    <ClCompile Include="..\..\libpng\pngwio.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1714,7 +1714,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngwrite.c">
+    <ClCompile Include="..\..\libpng\pngwrite.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1736,7 +1736,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngwtran.c">
+    <ClCompile Include="..\..\libpng\pngwtran.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1758,7 +1758,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release-Sanitize|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngwutil.c">
+    <ClCompile Include="..\..\libpng\pngwutil.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|Win32'">Level2</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level2</WarningLevel>
@@ -1782,609 +1782,609 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\common\AudioQueue.hxx" />
-    <ClInclude Include="..\common\AudioSettings.hxx" />
-    <ClInclude Include="..\common\audio\ConvolutionBuffer.hxx" />
-    <ClInclude Include="..\common\audio\HighPass.hxx" />
-    <ClInclude Include="..\common\audio\LanczosResampler.hxx" />
-    <ClInclude Include="..\common\audio\Resampler.hxx" />
-    <ClInclude Include="..\common\audio\SimpleResampler.hxx" />
-    <ClInclude Include="..\common\Base.hxx" />
-    <ClInclude Include="..\common\bspf.hxx" />
-    <ClInclude Include="..\common\DevSettingsHandler.hxx" />
-    <ClInclude Include="..\common\EventHandlerSDL2.hxx" />
-    <ClInclude Include="..\common\FBBackendSDL2.hxx" />
-    <ClInclude Include="..\common\FBSurfaceSDL2.hxx" />
-    <ClInclude Include="..\common\FpsMeter.hxx" />
-    <ClInclude Include="..\common\FSNodeFactory.hxx" />
-    <ClInclude Include="..\common\FSNodeZIP.hxx" />
-    <ClInclude Include="..\common\HighScoresManager.hxx" />
-    <ClInclude Include="..\common\JoyMap.hxx" />
-    <ClInclude Include="..\common\JPGLibrary.hxx" />
-    <ClInclude Include="..\common\jsonDefinitions.hxx" />
-    <ClInclude Include="..\common\KeyMap.hxx" />
-    <ClInclude Include="..\common\LinkedObjectPool.hxx" />
-    <ClInclude Include="..\common\Logger.hxx" />
-    <ClInclude Include="..\common\MediaFactory.hxx" />
-    <ClInclude Include="..\common\MouseControl.hxx" />
-    <ClInclude Include="..\common\PaletteHandler.hxx" />
-    <ClInclude Include="..\common\PhosphorHandler.hxx" />
-    <ClInclude Include="..\common\PhysicalJoystick.hxx" />
-    <ClInclude Include="..\common\PJoystickHandler.hxx" />
-    <ClInclude Include="..\common\PKeyboardHandler.hxx" />
-    <ClInclude Include="..\common\Rect.hxx" />
-    <ClInclude Include="..\common\repository\CompositeKeyValueRepository.hxx" />
-    <ClInclude Include="..\common\repository\CompositeKeyValueRepositoryNoop.hxx" />
-    <ClInclude Include="..\common\repository\CompositeKVRJsonAdapter.hxx" />
-    <ClInclude Include="..\common\repository\KeyValueRepository.hxx" />
-    <ClInclude Include="..\common\repository\KeyValueRepositoryConfigfile.hxx" />
-    <ClInclude Include="..\common\repository\KeyValueRepositoryFile.hxx" />
-    <ClInclude Include="..\common\repository\KeyValueRepositoryJsonFile.hxx" />
-    <ClInclude Include="..\common\repository\KeyValueRepositoryNoop.hxx" />
-    <ClInclude Include="..\common\repository\KeyValueRepositoryPropertyFile.hxx" />
-    <ClInclude Include="..\common\repository\sqlite\AbstractKeyValueRepositorySqlite.hxx" />
-    <ClInclude Include="..\common\repository\sqlite\CompositeKeyValueRepositorySqlite.hxx" />
-    <ClInclude Include="..\common\repository\sqlite\KeyValueRepositorySqlite.hxx" />
-    <ClInclude Include="..\common\repository\sqlite\SqliteDatabase.hxx" />
-    <ClInclude Include="..\common\repository\sqlite\SqliteError.hxx" />
-    <ClInclude Include="..\common\repository\sqlite\SqliteStatement.hxx" />
-    <ClInclude Include="..\common\repository\sqlite\SqliteTransaction.hxx" />
-    <ClInclude Include="..\common\repository\sqlite\StellaDb.hxx" />
-    <ClInclude Include="..\common\RewindManager.hxx" />
-    <ClInclude Include="..\common\sdl_blitter\BilinearBlitter.hxx" />
-    <ClInclude Include="..\common\sdl_blitter\Blitter.hxx" />
-    <ClInclude Include="..\common\sdl_blitter\BlitterFactory.hxx" />
-    <ClInclude Include="..\common\sdl_blitter\QisBlitter.hxx" />
-    <ClInclude Include="..\common\SDL_lib.hxx" />
-    <ClInclude Include="..\common\StaggeredLogger.hxx" />
-    <ClInclude Include="..\common\StateManager.hxx" />
-    <ClInclude Include="..\common\StellaKeys.hxx" />
-    <ClInclude Include="..\common\StringParser.hxx" />
-    <ClInclude Include="..\common\ThreadDebugging.hxx" />
-    <ClInclude Include="..\common\TimerManager.hxx" />
-    <ClInclude Include="..\common\tv_filters\AtariNTSC.hxx" />
-    <ClInclude Include="..\common\tv_filters\NTSCFilter.hxx" />
-    <ClInclude Include="..\common\Variant.hxx" />
-    <ClInclude Include="..\common\Vec.hxx" />
-    <ClInclude Include="..\common\VideoModeHandler.hxx" />
-    <ClInclude Include="..\common\ZipHandler.hxx" />
-    <ClInclude Include="..\debugger\BreakpointMap.hxx">
+    <ClInclude Include="..\..\common\AudioQueue.hxx" />
+    <ClInclude Include="..\..\common\AudioSettings.hxx" />
+    <ClInclude Include="..\..\common\audio\ConvolutionBuffer.hxx" />
+    <ClInclude Include="..\..\common\audio\HighPass.hxx" />
+    <ClInclude Include="..\..\common\audio\LanczosResampler.hxx" />
+    <ClInclude Include="..\..\common\audio\Resampler.hxx" />
+    <ClInclude Include="..\..\common\audio\SimpleResampler.hxx" />
+    <ClInclude Include="..\..\common\Base.hxx" />
+    <ClInclude Include="..\..\common\bspf.hxx" />
+    <ClInclude Include="..\..\common\DevSettingsHandler.hxx" />
+    <ClInclude Include="..\..\common\EventHandlerSDL2.hxx" />
+    <ClInclude Include="..\..\common\FBBackendSDL2.hxx" />
+    <ClInclude Include="..\..\common\FBSurfaceSDL2.hxx" />
+    <ClInclude Include="..\..\common\FpsMeter.hxx" />
+    <ClInclude Include="..\..\common\FSNodeFactory.hxx" />
+    <ClInclude Include="..\..\common\FSNodeZIP.hxx" />
+    <ClInclude Include="..\..\common\HighScoresManager.hxx" />
+    <ClInclude Include="..\..\common\JoyMap.hxx" />
+    <ClInclude Include="..\..\common\JPGLibrary.hxx" />
+    <ClInclude Include="..\..\common\jsonDefinitions.hxx" />
+    <ClInclude Include="..\..\common\KeyMap.hxx" />
+    <ClInclude Include="..\..\common\LinkedObjectPool.hxx" />
+    <ClInclude Include="..\..\common\Logger.hxx" />
+    <ClInclude Include="..\..\common\MediaFactory.hxx" />
+    <ClInclude Include="..\..\common\MouseControl.hxx" />
+    <ClInclude Include="..\..\common\PaletteHandler.hxx" />
+    <ClInclude Include="..\..\common\PhosphorHandler.hxx" />
+    <ClInclude Include="..\..\common\PhysicalJoystick.hxx" />
+    <ClInclude Include="..\..\common\PJoystickHandler.hxx" />
+    <ClInclude Include="..\..\common\PKeyboardHandler.hxx" />
+    <ClInclude Include="..\..\common\Rect.hxx" />
+    <ClInclude Include="..\..\common\repository\CompositeKeyValueRepository.hxx" />
+    <ClInclude Include="..\..\common\repository\CompositeKeyValueRepositoryNoop.hxx" />
+    <ClInclude Include="..\..\common\repository\CompositeKVRJsonAdapter.hxx" />
+    <ClInclude Include="..\..\common\repository\KeyValueRepository.hxx" />
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryConfigfile.hxx" />
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryFile.hxx" />
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryJsonFile.hxx" />
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryNoop.hxx" />
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryPropertyFile.hxx" />
+    <ClInclude Include="..\..\common\repository\sqlite\AbstractKeyValueRepositorySqlite.hxx" />
+    <ClInclude Include="..\..\common\repository\sqlite\CompositeKeyValueRepositorySqlite.hxx" />
+    <ClInclude Include="..\..\common\repository\sqlite\KeyValueRepositorySqlite.hxx" />
+    <ClInclude Include="..\..\common\repository\sqlite\SqliteDatabase.hxx" />
+    <ClInclude Include="..\..\common\repository\sqlite\SqliteError.hxx" />
+    <ClInclude Include="..\..\common\repository\sqlite\SqliteStatement.hxx" />
+    <ClInclude Include="..\..\common\repository\sqlite\SqliteTransaction.hxx" />
+    <ClInclude Include="..\..\common\repository\sqlite\StellaDb.hxx" />
+    <ClInclude Include="..\..\common\RewindManager.hxx" />
+    <ClInclude Include="..\..\common\sdl_blitter\BilinearBlitter.hxx" />
+    <ClInclude Include="..\..\common\sdl_blitter\Blitter.hxx" />
+    <ClInclude Include="..\..\common\sdl_blitter\BlitterFactory.hxx" />
+    <ClInclude Include="..\..\common\sdl_blitter\QisBlitter.hxx" />
+    <ClInclude Include="..\..\common\SDL_lib.hxx" />
+    <ClInclude Include="..\..\common\StaggeredLogger.hxx" />
+    <ClInclude Include="..\..\common\StateManager.hxx" />
+    <ClInclude Include="..\..\common\StellaKeys.hxx" />
+    <ClInclude Include="..\..\common\StringParser.hxx" />
+    <ClInclude Include="..\..\common\ThreadDebugging.hxx" />
+    <ClInclude Include="..\..\common\TimerManager.hxx" />
+    <ClInclude Include="..\..\common\tv_filters\AtariNTSC.hxx" />
+    <ClInclude Include="..\..\common\tv_filters\NTSCFilter.hxx" />
+    <ClInclude Include="..\..\common\Variant.hxx" />
+    <ClInclude Include="..\..\common\Vec.hxx" />
+    <ClInclude Include="..\..\common\VideoModeHandler.hxx" />
+    <ClInclude Include="..\..\common\ZipHandler.hxx" />
+    <ClInclude Include="..\..\debugger\BreakpointMap.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\AmigaMouseWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\AmigaMouseWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\AtariMouseWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\AtariMouseWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\AtariVoxWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\AtariVoxWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\BoosterWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\BoosterWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart0840Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart0840Widget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart0FA0Widget.hxx" />
-    <ClInclude Include="..\debugger\gui\Cart2KWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart0FA0Widget.hxx" />
+    <ClInclude Include="..\..\debugger\gui\Cart2KWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart3EPlusWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart3EPlusWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart3EWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart3EWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart3FWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart3FWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart4A50Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart4A50Widget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart4KSCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart4KSCWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart4KWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart4KWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartARMWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartARMWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartARWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartARWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartBFSCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartBFSCWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartBFWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartBFWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartBUSInfoWidget.hxx" />
-    <ClInclude Include="..\debugger\gui\CartBUSWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartBUSInfoWidget.hxx" />
+    <ClInclude Include="..\..\debugger\gui\CartBUSWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCDFInfoWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCDFInfoWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCDFWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCDFWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCMWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCMWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCTYWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCTYWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCVWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCVWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDebugWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDebugWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDFSCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDFSCWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDFWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDFWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDPCPlusWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDPCPlusWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDPCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDPCWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartE0Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartE0Widget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartE7Widget.hxx" />
-    <ClInclude Include="..\debugger\gui\CartEFSCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartE7Widget.hxx" />
+    <ClInclude Include="..\..\debugger\gui\CartEFSCWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartEFWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartEFWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartEnhancedWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartEnhancedWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF0Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF0Widget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF4SCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF4SCWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF4Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF4Widget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF6SCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF6SCWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF6Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF6Widget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF8SCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF8SCWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF8Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF8Widget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartFA2Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartFA2Widget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartFAWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartFAWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartFCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartFCWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartFEWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartFEWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartMDMWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartMDMWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartRamWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartRamWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartSBWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartSBWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartTVBoyWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartTVBoyWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartUAWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartUAWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartWDWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartWDWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartX07Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartX07Widget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\ControllerWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\ControllerWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DataGridRamWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DataGridRamWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DelayQueueWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DelayQueueWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DrivingWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DrivingWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\FlashWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\FlashWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\GenesisWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\GenesisWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Joy2BPlusWidget.hxx" />
-    <ClInclude Include="..\debugger\gui\JoystickWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Joy2BPlusWidget.hxx" />
+    <ClInclude Include="..\..\debugger\gui\JoystickWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\KeyboardWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\KeyboardWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\NullControlWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\NullControlWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\PaddleWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\PaddleWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\PointingDeviceWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\PointingDeviceWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\QuadTariWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\QuadTariWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RiotRamWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RiotRamWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RomListSettings.hxx">
+    <ClInclude Include="..\..\debugger\gui\RomListSettings.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\SaveKeyWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\SaveKeyWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TrakBallWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TrakBallWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\TrapArray.hxx">
+    <ClInclude Include="..\..\debugger\TrapArray.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\emucore\AmigaMouse.hxx" />
-    <ClInclude Include="..\emucore\AtariMouse.hxx" />
-    <ClInclude Include="..\emucore\Bankswitch.hxx" />
-    <ClInclude Include="..\emucore\Cart3EPlus.hxx" />
-    <ClInclude Include="..\emucore\Cart3EX.hxx" />
-    <ClInclude Include="..\emucore\Cart4KSC.hxx" />
-    <ClInclude Include="..\emucore\CartARM.hxx" />
-    <ClInclude Include="..\emucore\Cart0FA0.hxx" />
-    <ClInclude Include="..\emucore\CartCreator.hxx" />
-    <ClInclude Include="..\emucore\CartE7.hxx" />
-    <ClInclude Include="..\emucore\CartEnhanced.hxx" />
-    <ClInclude Include="..\emucore\CartBF.hxx" />
-    <ClInclude Include="..\emucore\CartBFSC.hxx" />
-    <ClInclude Include="..\emucore\CartBUS.hxx" />
-    <ClInclude Include="..\emucore\CartCDF.hxx" />
-    <ClInclude Include="..\emucore\CartCM.hxx" />
-    <ClInclude Include="..\emucore\CartCTY.hxx" />
-    <ClInclude Include="..\emucore\CartDetector.hxx" />
-    <ClInclude Include="..\emucore\CartDF.hxx" />
-    <ClInclude Include="..\emucore\CartDFSC.hxx" />
-    <ClInclude Include="..\emucore\CartFA2.hxx" />
-    <ClInclude Include="..\emucore\CartFC.hxx" />
-    <ClInclude Include="..\emucore\CartMDM.hxx" />
-    <ClInclude Include="..\emucore\CartMVC.hxx" />
-    <ClInclude Include="..\emucore\CartTVBoy.hxx" />
-    <ClInclude Include="..\emucore\CartWD.hxx" />
-    <ClInclude Include="..\emucore\CompuMate.hxx" />
-    <ClInclude Include="..\emucore\ConsoleIO.hxx" />
-    <ClInclude Include="..\emucore\ConsoleTiming.hxx" />
-    <ClInclude Include="..\emucore\ControllerDetector.hxx" />
-    <ClInclude Include="..\emucore\ControlLowLevel.hxx" />
-    <ClInclude Include="..\emucore\DispatchResult.hxx" />
-    <ClInclude Include="..\emucore\EmulationTiming.hxx" />
-    <ClInclude Include="..\emucore\EmulationWorker.hxx" />
-    <ClInclude Include="..\emucore\EventHandlerConstants.hxx" />
-    <ClInclude Include="..\emucore\exception\EmulationWarning.hxx" />
-    <ClInclude Include="..\emucore\exception\FatalEmulationError.hxx" />
-    <ClInclude Include="..\emucore\FBBackend.hxx" />
-    <ClInclude Include="..\emucore\FBSurface.hxx" />
-    <ClInclude Include="..\emucore\FrameBufferConstants.hxx" />
-    <ClInclude Include="..\emucore\GlobalKeyHandler.hxx" />
-    <ClInclude Include="..\emucore\Joy2BPlus.hxx" />
-    <ClInclude Include="..\emucore\Lightgun.hxx" />
-    <ClInclude Include="..\emucore\MindLink.hxx" />
-    <ClInclude Include="..\emucore\OSystemStandalone.hxx" />
-    <ClInclude Include="..\emucore\PlusROM.hxx" />
-    <ClInclude Include="..\emucore\PointingDevice.hxx" />
-    <ClInclude Include="..\emucore\ProfilingRunner.hxx" />
-    <ClInclude Include="..\emucore\QuadTari.hxx" />
-    <ClInclude Include="..\emucore\SerialPort.hxx" />
-    <ClInclude Include="..\emucore\TIASurface.hxx" />
-    <ClInclude Include="..\emucore\tia\Audio.hxx" />
-    <ClInclude Include="..\emucore\tia\AudioChannel.hxx" />
-    <ClInclude Include="..\emucore\tia\Background.hxx" />
-    <ClInclude Include="..\emucore\tia\Ball.hxx" />
-    <ClInclude Include="..\emucore\tia\DelayQueue.hxx" />
-    <ClInclude Include="..\emucore\tia\DelayQueueIterator.hxx" />
-    <ClInclude Include="..\emucore\tia\DelayQueueIteratorImpl.hxx" />
-    <ClInclude Include="..\emucore\tia\DelayQueueMember.hxx" />
-    <ClInclude Include="..\emucore\tia\DrawCounterDecodes.hxx" />
-    <ClInclude Include="..\emucore\tia\frame-manager\AbstractFrameManager.hxx" />
-    <ClInclude Include="..\emucore\tia\frame-manager\FrameLayoutDetector.hxx" />
-    <ClInclude Include="..\emucore\tia\frame-manager\FrameManager.hxx" />
-    <ClInclude Include="..\emucore\tia\frame-manager\JitterEmulation.hxx" />
-    <ClInclude Include="..\emucore\tia\FrameLayout.hxx" />
-    <ClInclude Include="..\emucore\tia\LatchedInput.hxx" />
-    <ClInclude Include="..\emucore\tia\Missile.hxx" />
-    <ClInclude Include="..\emucore\tia\AnalogReadout.hxx" />
-    <ClInclude Include="..\emucore\tia\Player.hxx" />
-    <ClInclude Include="..\emucore\tia\Playfield.hxx" />
-    <ClInclude Include="..\emucore\tia\TIA.hxx" />
-    <ClInclude Include="..\emucore\tia\TIAConstants.hxx" />
-    <ClInclude Include="..\emucore\TrakBall.hxx" />
-    <ClInclude Include="..\gui\ColorWidget.hxx" />
-    <ClInclude Include="..\gui\ConsoleBFont.hxx" />
-    <ClInclude Include="..\gui\ConsoleMediumBFont.hxx" />
-    <ClInclude Include="..\gui\ConsoleMediumFont.hxx" />
-    <ClInclude Include="..\gui\DeveloperDialog.hxx" />
-    <ClInclude Include="..\gui\EmulationDialog.hxx" />
-    <ClInclude Include="..\gui\FavoritesManager.hxx" />
-    <ClInclude Include="..\gui\FileListWidget.hxx" />
-    <ClInclude Include="..\gui\HighScoresDialog.hxx" />
-    <ClInclude Include="..\gui\HighScoresMenu.hxx" />
-    <ClInclude Include="..\gui\Icon.hxx" />
-    <ClInclude Include="..\gui\LauncherFileListWidget.hxx" />
-    <ClInclude Include="..\gui\NavigationWidget.hxx" />
-    <ClInclude Include="..\gui\PlusRomsMenu.hxx" />
-    <ClInclude Include="..\gui\JoystickDialog.hxx" />
-    <ClInclude Include="..\gui\LoggerDialog.hxx" />
-    <ClInclude Include="..\gui\MessageDialog.hxx" />
-    <ClInclude Include="..\gui\MessageMenu.hxx" />
-    <ClInclude Include="..\gui\MinUICommandDialog.hxx" />
-    <ClInclude Include="..\gui\PlusRomsSetupDialog.hxx" />
-    <ClInclude Include="..\gui\QuadTariDialog.hxx" />
-    <ClInclude Include="..\gui\R77HelpDialog.hxx" />
-    <ClInclude Include="..\gui\RadioButtonWidget.hxx" />
-    <ClInclude Include="..\gui\Icons.hxx" />
-    <ClInclude Include="..\gui\RomImageWidget.hxx" />
-    <ClInclude Include="..\gui\SnapshotDialog.hxx" />
-    <ClInclude Include="..\gui\Stella12x24tFont.hxx" />
-    <ClInclude Include="..\gui\Stella14x28tFont.hxx" />
-    <ClInclude Include="..\gui\Stella16x32tFont.hxx" />
-    <ClInclude Include="..\gui\StellaSettingsDialog.hxx" />
-    <ClInclude Include="..\gui\TimeLineWidget.hxx" />
-    <ClInclude Include="..\gui\TimeMachine.hxx" />
-    <ClInclude Include="..\gui\TimeMachineDialog.hxx" />
-    <ClInclude Include="..\gui\ToolTip.hxx" />
-    <ClInclude Include="..\gui\UndoHandler.hxx" />
-    <ClInclude Include="..\gui\WhatsNewDialog.hxx" />
-    <ClInclude Include="..\httplib\httplib.h" />
-    <ClInclude Include="..\httplib\http_lib.hxx" />
-    <ClInclude Include="..\json\json.hxx" />
-    <ClInclude Include="..\json\json_lib.hxx" />
-    <ClInclude Include="..\libpng\pngdebug.h" />
-    <ClInclude Include="..\libpng\pnginfo.h" />
-    <ClInclude Include="..\libpng\pnglibconf.h" />
-    <ClInclude Include="..\libpng\pngstruct.h" />
-    <ClInclude Include="..\nanojpeg\nanojpeg_lib.hxx" />
-    <ClInclude Include="..\sqlite\source\sqlite3.h" />
-    <ClInclude Include="..\sqlite\sqlite3.h" />
-    <ClInclude Include="..\sqlite\sqlite_options.h" />
-    <ClInclude Include="..\tinyexif\tinyexif_lib.hxx" />
+    <ClInclude Include="..\..\emucore\AmigaMouse.hxx" />
+    <ClInclude Include="..\..\emucore\AtariMouse.hxx" />
+    <ClInclude Include="..\..\emucore\Bankswitch.hxx" />
+    <ClInclude Include="..\..\emucore\Cart3EPlus.hxx" />
+    <ClInclude Include="..\..\emucore\Cart3EX.hxx" />
+    <ClInclude Include="..\..\emucore\Cart4KSC.hxx" />
+    <ClInclude Include="..\..\emucore\CartARM.hxx" />
+    <ClInclude Include="..\..\emucore\Cart0FA0.hxx" />
+    <ClInclude Include="..\..\emucore\CartCreator.hxx" />
+    <ClInclude Include="..\..\emucore\CartE7.hxx" />
+    <ClInclude Include="..\..\emucore\CartEnhanced.hxx" />
+    <ClInclude Include="..\..\emucore\CartBF.hxx" />
+    <ClInclude Include="..\..\emucore\CartBFSC.hxx" />
+    <ClInclude Include="..\..\emucore\CartBUS.hxx" />
+    <ClInclude Include="..\..\emucore\CartCDF.hxx" />
+    <ClInclude Include="..\..\emucore\CartCM.hxx" />
+    <ClInclude Include="..\..\emucore\CartCTY.hxx" />
+    <ClInclude Include="..\..\emucore\CartDetector.hxx" />
+    <ClInclude Include="..\..\emucore\CartDF.hxx" />
+    <ClInclude Include="..\..\emucore\CartDFSC.hxx" />
+    <ClInclude Include="..\..\emucore\CartFA2.hxx" />
+    <ClInclude Include="..\..\emucore\CartFC.hxx" />
+    <ClInclude Include="..\..\emucore\CartMDM.hxx" />
+    <ClInclude Include="..\..\emucore\CartMVC.hxx" />
+    <ClInclude Include="..\..\emucore\CartTVBoy.hxx" />
+    <ClInclude Include="..\..\emucore\CartWD.hxx" />
+    <ClInclude Include="..\..\emucore\CompuMate.hxx" />
+    <ClInclude Include="..\..\emucore\ConsoleIO.hxx" />
+    <ClInclude Include="..\..\emucore\ConsoleTiming.hxx" />
+    <ClInclude Include="..\..\emucore\ControllerDetector.hxx" />
+    <ClInclude Include="..\..\emucore\ControlLowLevel.hxx" />
+    <ClInclude Include="..\..\emucore\DispatchResult.hxx" />
+    <ClInclude Include="..\..\emucore\EmulationTiming.hxx" />
+    <ClInclude Include="..\..\emucore\EmulationWorker.hxx" />
+    <ClInclude Include="..\..\emucore\EventHandlerConstants.hxx" />
+    <ClInclude Include="..\..\emucore\exception\EmulationWarning.hxx" />
+    <ClInclude Include="..\..\emucore\exception\FatalEmulationError.hxx" />
+    <ClInclude Include="..\..\emucore\FBBackend.hxx" />
+    <ClInclude Include="..\..\emucore\FBSurface.hxx" />
+    <ClInclude Include="..\..\emucore\FrameBufferConstants.hxx" />
+    <ClInclude Include="..\..\emucore\GlobalKeyHandler.hxx" />
+    <ClInclude Include="..\..\emucore\Joy2BPlus.hxx" />
+    <ClInclude Include="..\..\emucore\Lightgun.hxx" />
+    <ClInclude Include="..\..\emucore\MindLink.hxx" />
+    <ClInclude Include="..\..\emucore\OSystemStandalone.hxx" />
+    <ClInclude Include="..\..\emucore\PlusROM.hxx" />
+    <ClInclude Include="..\..\emucore\PointingDevice.hxx" />
+    <ClInclude Include="..\..\emucore\ProfilingRunner.hxx" />
+    <ClInclude Include="..\..\emucore\QuadTari.hxx" />
+    <ClInclude Include="..\..\emucore\SerialPort.hxx" />
+    <ClInclude Include="..\..\emucore\TIASurface.hxx" />
+    <ClInclude Include="..\..\emucore\tia\Audio.hxx" />
+    <ClInclude Include="..\..\emucore\tia\AudioChannel.hxx" />
+    <ClInclude Include="..\..\emucore\tia\Background.hxx" />
+    <ClInclude Include="..\..\emucore\tia\Ball.hxx" />
+    <ClInclude Include="..\..\emucore\tia\DelayQueue.hxx" />
+    <ClInclude Include="..\..\emucore\tia\DelayQueueIterator.hxx" />
+    <ClInclude Include="..\..\emucore\tia\DelayQueueIteratorImpl.hxx" />
+    <ClInclude Include="..\..\emucore\tia\DelayQueueMember.hxx" />
+    <ClInclude Include="..\..\emucore\tia\DrawCounterDecodes.hxx" />
+    <ClInclude Include="..\..\emucore\tia\frame-manager\AbstractFrameManager.hxx" />
+    <ClInclude Include="..\..\emucore\tia\frame-manager\FrameLayoutDetector.hxx" />
+    <ClInclude Include="..\..\emucore\tia\frame-manager\FrameManager.hxx" />
+    <ClInclude Include="..\..\emucore\tia\frame-manager\JitterEmulation.hxx" />
+    <ClInclude Include="..\..\emucore\tia\FrameLayout.hxx" />
+    <ClInclude Include="..\..\emucore\tia\LatchedInput.hxx" />
+    <ClInclude Include="..\..\emucore\tia\Missile.hxx" />
+    <ClInclude Include="..\..\emucore\tia\AnalogReadout.hxx" />
+    <ClInclude Include="..\..\emucore\tia\Player.hxx" />
+    <ClInclude Include="..\..\emucore\tia\Playfield.hxx" />
+    <ClInclude Include="..\..\emucore\tia\TIA.hxx" />
+    <ClInclude Include="..\..\emucore\tia\TIAConstants.hxx" />
+    <ClInclude Include="..\..\emucore\TrakBall.hxx" />
+    <ClInclude Include="..\..\gui\ColorWidget.hxx" />
+    <ClInclude Include="..\..\gui\ConsoleBFont.hxx" />
+    <ClInclude Include="..\..\gui\ConsoleMediumBFont.hxx" />
+    <ClInclude Include="..\..\gui\ConsoleMediumFont.hxx" />
+    <ClInclude Include="..\..\gui\DeveloperDialog.hxx" />
+    <ClInclude Include="..\..\gui\EmulationDialog.hxx" />
+    <ClInclude Include="..\..\gui\FavoritesManager.hxx" />
+    <ClInclude Include="..\..\gui\FileListWidget.hxx" />
+    <ClInclude Include="..\..\gui\HighScoresDialog.hxx" />
+    <ClInclude Include="..\..\gui\HighScoresMenu.hxx" />
+    <ClInclude Include="..\..\gui\Icon.hxx" />
+    <ClInclude Include="..\..\gui\LauncherFileListWidget.hxx" />
+    <ClInclude Include="..\..\gui\NavigationWidget.hxx" />
+    <ClInclude Include="..\..\gui\PlusRomsMenu.hxx" />
+    <ClInclude Include="..\..\gui\JoystickDialog.hxx" />
+    <ClInclude Include="..\..\gui\LoggerDialog.hxx" />
+    <ClInclude Include="..\..\gui\MessageDialog.hxx" />
+    <ClInclude Include="..\..\gui\MessageMenu.hxx" />
+    <ClInclude Include="..\..\gui\MinUICommandDialog.hxx" />
+    <ClInclude Include="..\..\gui\PlusRomsSetupDialog.hxx" />
+    <ClInclude Include="..\..\gui\QuadTariDialog.hxx" />
+    <ClInclude Include="..\..\gui\R77HelpDialog.hxx" />
+    <ClInclude Include="..\..\gui\RadioButtonWidget.hxx" />
+    <ClInclude Include="..\..\gui\Icons.hxx" />
+    <ClInclude Include="..\..\gui\RomImageWidget.hxx" />
+    <ClInclude Include="..\..\gui\SnapshotDialog.hxx" />
+    <ClInclude Include="..\..\gui\Stella12x24tFont.hxx" />
+    <ClInclude Include="..\..\gui\Stella14x28tFont.hxx" />
+    <ClInclude Include="..\..\gui\Stella16x32tFont.hxx" />
+    <ClInclude Include="..\..\gui\StellaSettingsDialog.hxx" />
+    <ClInclude Include="..\..\gui\TimeLineWidget.hxx" />
+    <ClInclude Include="..\..\gui\TimeMachine.hxx" />
+    <ClInclude Include="..\..\gui\TimeMachineDialog.hxx" />
+    <ClInclude Include="..\..\gui\ToolTip.hxx" />
+    <ClInclude Include="..\..\gui\UndoHandler.hxx" />
+    <ClInclude Include="..\..\gui\WhatsNewDialog.hxx" />
+    <ClInclude Include="..\..\httplib\httplib.h" />
+    <ClInclude Include="..\..\httplib\http_lib.hxx" />
+    <ClInclude Include="..\..\json\json.hxx" />
+    <ClInclude Include="..\..\json\json_lib.hxx" />
+    <ClInclude Include="..\..\libpng\pngdebug.h" />
+    <ClInclude Include="..\..\libpng\pnginfo.h" />
+    <ClInclude Include="..\..\libpng\pnglibconf.h" />
+    <ClInclude Include="..\..\libpng\pngstruct.h" />
+    <ClInclude Include="..\..\nanojpeg\nanojpeg_lib.hxx" />
+    <ClInclude Include="..\..\sqlite\source\sqlite3.h" />
+    <ClInclude Include="..\..\sqlite\sqlite3.h" />
+    <ClInclude Include="..\..\sqlite\sqlite_options.h" />
+    <ClInclude Include="..\..\tinyexif\tinyexif_lib.hxx" />
     <ClInclude Include="FSNodeWINDOWS.hxx" />
     <ClInclude Include="HomeFinder.hxx" />
     <ClInclude Include="OSystemWINDOWS.hxx" />
-    <ClInclude Include="..\common\PNGLibrary.hxx" />
+    <ClInclude Include="..\..\common\PNGLibrary.hxx" />
     <ClInclude Include="SerialPortWINDOWS.hxx" />
-    <ClInclude Include="..\common\SoundSDL2.hxx" />
-    <ClInclude Include="..\common\Stack.hxx" />
-    <ClInclude Include="..\common\Version.hxx" />
-    <ClInclude Include="..\emucore\AtariVox.hxx" />
-    <ClInclude Include="..\emucore\Booster.hxx" />
-    <ClInclude Include="..\emucore\Cart.hxx" />
-    <ClInclude Include="..\emucore\Cart0840.hxx" />
-    <ClInclude Include="..\emucore\Cart2K.hxx" />
-    <ClInclude Include="..\emucore\Cart3E.hxx" />
-    <ClInclude Include="..\emucore\Cart3F.hxx" />
-    <ClInclude Include="..\emucore\Cart4A50.hxx" />
-    <ClInclude Include="..\emucore\Cart4K.hxx" />
-    <ClInclude Include="..\emucore\CartAR.hxx" />
-    <ClInclude Include="..\emucore\CartCV.hxx" />
-    <ClInclude Include="..\emucore\CartDPC.hxx" />
-    <ClInclude Include="..\emucore\CartDPCPlus.hxx" />
-    <ClInclude Include="..\emucore\CartE0.hxx" />
-    <ClInclude Include="..\emucore\CartEF.hxx" />
-    <ClInclude Include="..\emucore\CartEFSC.hxx" />
-    <ClInclude Include="..\emucore\CartF0.hxx" />
-    <ClInclude Include="..\emucore\CartF4.hxx" />
-    <ClInclude Include="..\emucore\CartF4SC.hxx" />
-    <ClInclude Include="..\emucore\CartF6.hxx" />
-    <ClInclude Include="..\emucore\CartF6SC.hxx" />
-    <ClInclude Include="..\emucore\CartF8.hxx" />
-    <ClInclude Include="..\emucore\CartF8SC.hxx" />
-    <ClInclude Include="..\emucore\CartFA.hxx" />
-    <ClInclude Include="..\emucore\CartFE.hxx" />
-    <ClInclude Include="..\emucore\CartSB.hxx" />
-    <ClInclude Include="..\emucore\CartUA.hxx" />
-    <ClInclude Include="..\emucore\CartX07.hxx" />
-    <ClInclude Include="..\emucore\Console.hxx" />
-    <ClInclude Include="..\emucore\Control.hxx" />
-    <ClInclude Include="..\emucore\DefProps.hxx" />
-    <ClInclude Include="..\emucore\Device.hxx" />
-    <ClInclude Include="..\emucore\Driving.hxx" />
-    <ClInclude Include="..\emucore\Event.hxx" />
-    <ClInclude Include="..\emucore\EventHandler.hxx" />
-    <ClInclude Include="..\emucore\FrameBuffer.hxx" />
-    <ClInclude Include="..\emucore\FSNode.hxx" />
-    <ClInclude Include="..\emucore\Genesis.hxx" />
-    <ClInclude Include="..\emucore\Joystick.hxx" />
-    <ClInclude Include="..\emucore\Keyboard.hxx" />
-    <ClInclude Include="..\emucore\KidVid.hxx" />
-    <ClInclude Include="..\emucore\M6502.hxx" />
-    <ClInclude Include="..\emucore\M6532.hxx" />
-    <ClInclude Include="..\emucore\MD5.hxx" />
-    <ClInclude Include="..\emucore\MT24LC256.hxx" />
-    <ClInclude Include="..\emucore\NullDev.hxx" />
-    <ClInclude Include="..\emucore\OSystem.hxx" />
-    <ClInclude Include="..\emucore\Paddles.hxx" />
-    <ClInclude Include="..\emucore\Props.hxx" />
-    <ClInclude Include="..\emucore\PropsSet.hxx" />
-    <ClInclude Include="..\emucore\Random.hxx" />
-    <ClInclude Include="..\emucore\SaveKey.hxx" />
-    <ClInclude Include="..\emucore\Serializable.hxx" />
-    <ClInclude Include="..\emucore\Serializer.hxx" />
-    <ClInclude Include="..\emucore\Settings.hxx" />
-    <ClInclude Include="..\emucore\Sound.hxx" />
-    <ClInclude Include="..\emucore\Switches.hxx" />
-    <ClInclude Include="..\emucore\System.hxx" />
-    <ClInclude Include="..\emucore\Thumbulator.hxx" />
-    <ClInclude Include="..\debugger\gui\AudioWidget.hxx">
+    <ClInclude Include="..\..\common\SoundSDL2.hxx" />
+    <ClInclude Include="..\..\common\Stack.hxx" />
+    <ClInclude Include="..\..\common\Version.hxx" />
+    <ClInclude Include="..\..\emucore\AtariVox.hxx" />
+    <ClInclude Include="..\..\emucore\Booster.hxx" />
+    <ClInclude Include="..\..\emucore\Cart.hxx" />
+    <ClInclude Include="..\..\emucore\Cart0840.hxx" />
+    <ClInclude Include="..\..\emucore\Cart2K.hxx" />
+    <ClInclude Include="..\..\emucore\Cart3E.hxx" />
+    <ClInclude Include="..\..\emucore\Cart3F.hxx" />
+    <ClInclude Include="..\..\emucore\Cart4A50.hxx" />
+    <ClInclude Include="..\..\emucore\Cart4K.hxx" />
+    <ClInclude Include="..\..\emucore\CartAR.hxx" />
+    <ClInclude Include="..\..\emucore\CartCV.hxx" />
+    <ClInclude Include="..\..\emucore\CartDPC.hxx" />
+    <ClInclude Include="..\..\emucore\CartDPCPlus.hxx" />
+    <ClInclude Include="..\..\emucore\CartE0.hxx" />
+    <ClInclude Include="..\..\emucore\CartEF.hxx" />
+    <ClInclude Include="..\..\emucore\CartEFSC.hxx" />
+    <ClInclude Include="..\..\emucore\CartF0.hxx" />
+    <ClInclude Include="..\..\emucore\CartF4.hxx" />
+    <ClInclude Include="..\..\emucore\CartF4SC.hxx" />
+    <ClInclude Include="..\..\emucore\CartF6.hxx" />
+    <ClInclude Include="..\..\emucore\CartF6SC.hxx" />
+    <ClInclude Include="..\..\emucore\CartF8.hxx" />
+    <ClInclude Include="..\..\emucore\CartF8SC.hxx" />
+    <ClInclude Include="..\..\emucore\CartFA.hxx" />
+    <ClInclude Include="..\..\emucore\CartFE.hxx" />
+    <ClInclude Include="..\..\emucore\CartSB.hxx" />
+    <ClInclude Include="..\..\emucore\CartUA.hxx" />
+    <ClInclude Include="..\..\emucore\CartX07.hxx" />
+    <ClInclude Include="..\..\emucore\Console.hxx" />
+    <ClInclude Include="..\..\emucore\Control.hxx" />
+    <ClInclude Include="..\..\emucore\DefProps.hxx" />
+    <ClInclude Include="..\..\emucore\Device.hxx" />
+    <ClInclude Include="..\..\emucore\Driving.hxx" />
+    <ClInclude Include="..\..\emucore\Event.hxx" />
+    <ClInclude Include="..\..\emucore\EventHandler.hxx" />
+    <ClInclude Include="..\..\emucore\FrameBuffer.hxx" />
+    <ClInclude Include="..\..\emucore\FSNode.hxx" />
+    <ClInclude Include="..\..\emucore\Genesis.hxx" />
+    <ClInclude Include="..\..\emucore\Joystick.hxx" />
+    <ClInclude Include="..\..\emucore\Keyboard.hxx" />
+    <ClInclude Include="..\..\emucore\KidVid.hxx" />
+    <ClInclude Include="..\..\emucore\M6502.hxx" />
+    <ClInclude Include="..\..\emucore\M6532.hxx" />
+    <ClInclude Include="..\..\emucore\MD5.hxx" />
+    <ClInclude Include="..\..\emucore\MT24LC256.hxx" />
+    <ClInclude Include="..\..\emucore\NullDev.hxx" />
+    <ClInclude Include="..\..\emucore\OSystem.hxx" />
+    <ClInclude Include="..\..\emucore\Paddles.hxx" />
+    <ClInclude Include="..\..\emucore\Props.hxx" />
+    <ClInclude Include="..\..\emucore\PropsSet.hxx" />
+    <ClInclude Include="..\..\emucore\Random.hxx" />
+    <ClInclude Include="..\..\emucore\SaveKey.hxx" />
+    <ClInclude Include="..\..\emucore\Serializable.hxx" />
+    <ClInclude Include="..\..\emucore\Serializer.hxx" />
+    <ClInclude Include="..\..\emucore\Settings.hxx" />
+    <ClInclude Include="..\..\emucore\Sound.hxx" />
+    <ClInclude Include="..\..\emucore\Switches.hxx" />
+    <ClInclude Include="..\..\emucore\System.hxx" />
+    <ClInclude Include="..\..\emucore\Thumbulator.hxx" />
+    <ClInclude Include="..\..\debugger\gui\AudioWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\CartDebug.hxx">
+    <ClInclude Include="..\..\debugger\CartDebug.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\CpuDebug.hxx">
+    <ClInclude Include="..\..\debugger\CpuDebug.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CpuWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CpuWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DataGridOpsWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DataGridOpsWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DataGridWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DataGridWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\Debugger.hxx">
+    <ClInclude Include="..\..\debugger\Debugger.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DebuggerDialog.hxx">
+    <ClInclude Include="..\..\debugger\gui\DebuggerDialog.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\DebuggerExpressions.hxx">
+    <ClInclude Include="..\..\debugger\DebuggerExpressions.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\DebuggerParser.hxx">
+    <ClInclude Include="..\..\debugger\DebuggerParser.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\DebuggerSystem.hxx">
+    <ClInclude Include="..\..\debugger\DebuggerSystem.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\DiStella.hxx">
+    <ClInclude Include="..\..\debugger\DiStella.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\Expression.hxx">
+    <ClInclude Include="..\..\debugger\Expression.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\PromptWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\PromptWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RamWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RamWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\RiotDebug.hxx">
+    <ClInclude Include="..\..\debugger\RiotDebug.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RiotWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RiotWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RomListWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RomListWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RomWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RomWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\TIADebug.hxx">
+    <ClInclude Include="..\..\debugger\TIADebug.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TiaInfoWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TiaInfoWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TiaOutputWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TiaOutputWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TiaZoomWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TiaZoomWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\ToggleBitWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\ToggleBitWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TogglePixelWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TogglePixelWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\ToggleWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\ToggleWidget.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\yacc\YaccParser.hxx">
+    <ClInclude Include="..\..\yacc\YaccParser.hxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-NoDebugger|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\cheat\BankRomCheat.hxx" />
-    <ClInclude Include="..\cheat\Cheat.hxx" />
-    <ClInclude Include="..\cheat\CheatCodeDialog.hxx" />
-    <ClInclude Include="..\cheat\CheatManager.hxx" />
-    <ClInclude Include="..\cheat\CheetahCheat.hxx" />
-    <ClInclude Include="..\cheat\RamCheat.hxx" />
-    <ClInclude Include="..\gui\AboutDialog.hxx" />
-    <ClInclude Include="..\gui\BrowserDialog.hxx" />
-    <ClInclude Include="..\gui\CheckListWidget.hxx" />
-    <ClInclude Include="..\gui\ComboDialog.hxx" />
-    <ClInclude Include="..\gui\Command.hxx" />
-    <ClInclude Include="..\gui\CommandDialog.hxx" />
-    <ClInclude Include="..\gui\CommandMenu.hxx" />
-    <ClInclude Include="..\gui\ConsoleFont.hxx" />
-    <ClInclude Include="..\gui\ContextMenu.hxx" />
-    <ClInclude Include="..\gui\Dialog.hxx" />
-    <ClInclude Include="..\gui\DialogContainer.hxx" />
-    <ClInclude Include="..\gui\EditableWidget.hxx" />
-    <ClInclude Include="..\gui\EditTextWidget.hxx" />
-    <ClInclude Include="..\gui\EventMappingWidget.hxx" />
-    <ClInclude Include="..\gui\Font.hxx" />
-    <ClInclude Include="..\gui\GameInfoDialog.hxx" />
-    <ClInclude Include="..\gui\GlobalPropsDialog.hxx" />
-    <ClInclude Include="..\gui\GuiObject.hxx" />
-    <ClInclude Include="..\gui\HelpDialog.hxx" />
-    <ClInclude Include="..\gui\InputDialog.hxx" />
-    <ClInclude Include="..\gui\InputTextDialog.hxx" />
-    <ClInclude Include="..\gui\Launcher.hxx" />
-    <ClInclude Include="..\gui\LauncherDialog.hxx" />
-    <ClInclude Include="..\gui\ListWidget.hxx" />
-    <ClInclude Include="..\gui\OptionsMenu.hxx" />
-    <ClInclude Include="..\gui\MessageBox.hxx" />
-    <ClInclude Include="..\gui\OptionsDialog.hxx" />
-    <ClInclude Include="..\gui\PopUpWidget.hxx" />
-    <ClInclude Include="..\gui\ProgressDialog.hxx" />
-    <ClInclude Include="..\gui\RomAuditDialog.hxx" />
-    <ClInclude Include="..\gui\RomInfoWidget.hxx" />
-    <ClInclude Include="..\gui\ScrollBarWidget.hxx" />
-    <ClInclude Include="..\gui\StellaFont.hxx" />
-    <ClInclude Include="..\gui\StringListWidget.hxx" />
-    <ClInclude Include="..\gui\TabWidget.hxx" />
-    <ClInclude Include="..\gui\UIDialog.hxx" />
-    <ClInclude Include="..\gui\VideoAudioDialog.hxx" />
-    <ClInclude Include="..\gui\Widget.hxx" />
-    <ClInclude Include="..\zlib\crc32.h" />
-    <ClInclude Include="..\zlib\deflate.h" />
-    <ClInclude Include="..\zlib\gzguts.h" />
-    <ClInclude Include="..\zlib\inffast.h" />
-    <ClInclude Include="..\zlib\inffixed.h" />
-    <ClInclude Include="..\zlib\inflate.h" />
-    <ClInclude Include="..\zlib\inftrees.h" />
-    <ClInclude Include="..\zlib\trees.h" />
-    <ClInclude Include="..\zlib\zconf.h" />
-    <ClInclude Include="..\zlib\zlib.h" />
-    <ClInclude Include="..\zlib\zutil.h" />
-    <ClInclude Include="..\libpng\png.h" />
-    <ClInclude Include="..\libpng\pngconf.h" />
-    <ClInclude Include="..\libpng\pngpriv.h" />
+    <ClInclude Include="..\..\cheat\BankRomCheat.hxx" />
+    <ClInclude Include="..\..\cheat\Cheat.hxx" />
+    <ClInclude Include="..\..\cheat\CheatCodeDialog.hxx" />
+    <ClInclude Include="..\..\cheat\CheatManager.hxx" />
+    <ClInclude Include="..\..\cheat\CheetahCheat.hxx" />
+    <ClInclude Include="..\..\cheat\RamCheat.hxx" />
+    <ClInclude Include="..\..\gui\AboutDialog.hxx" />
+    <ClInclude Include="..\..\gui\BrowserDialog.hxx" />
+    <ClInclude Include="..\..\gui\CheckListWidget.hxx" />
+    <ClInclude Include="..\..\gui\ComboDialog.hxx" />
+    <ClInclude Include="..\..\gui\Command.hxx" />
+    <ClInclude Include="..\..\gui\CommandDialog.hxx" />
+    <ClInclude Include="..\..\gui\CommandMenu.hxx" />
+    <ClInclude Include="..\..\gui\ConsoleFont.hxx" />
+    <ClInclude Include="..\..\gui\ContextMenu.hxx" />
+    <ClInclude Include="..\..\gui\Dialog.hxx" />
+    <ClInclude Include="..\..\gui\DialogContainer.hxx" />
+    <ClInclude Include="..\..\gui\EditableWidget.hxx" />
+    <ClInclude Include="..\..\gui\EditTextWidget.hxx" />
+    <ClInclude Include="..\..\gui\EventMappingWidget.hxx" />
+    <ClInclude Include="..\..\gui\Font.hxx" />
+    <ClInclude Include="..\..\gui\GameInfoDialog.hxx" />
+    <ClInclude Include="..\..\gui\GlobalPropsDialog.hxx" />
+    <ClInclude Include="..\..\gui\GuiObject.hxx" />
+    <ClInclude Include="..\..\gui\HelpDialog.hxx" />
+    <ClInclude Include="..\..\gui\InputDialog.hxx" />
+    <ClInclude Include="..\..\gui\InputTextDialog.hxx" />
+    <ClInclude Include="..\..\gui\Launcher.hxx" />
+    <ClInclude Include="..\..\gui\LauncherDialog.hxx" />
+    <ClInclude Include="..\..\gui\ListWidget.hxx" />
+    <ClInclude Include="..\..\gui\OptionsMenu.hxx" />
+    <ClInclude Include="..\..\gui\MessageBox.hxx" />
+    <ClInclude Include="..\..\gui\OptionsDialog.hxx" />
+    <ClInclude Include="..\..\gui\PopUpWidget.hxx" />
+    <ClInclude Include="..\..\gui\ProgressDialog.hxx" />
+    <ClInclude Include="..\..\gui\RomAuditDialog.hxx" />
+    <ClInclude Include="..\..\gui\RomInfoWidget.hxx" />
+    <ClInclude Include="..\..\gui\ScrollBarWidget.hxx" />
+    <ClInclude Include="..\..\gui\StellaFont.hxx" />
+    <ClInclude Include="..\..\gui\StringListWidget.hxx" />
+    <ClInclude Include="..\..\gui\TabWidget.hxx" />
+    <ClInclude Include="..\..\gui\UIDialog.hxx" />
+    <ClInclude Include="..\..\gui\VideoAudioDialog.hxx" />
+    <ClInclude Include="..\..\gui\Widget.hxx" />
+    <ClInclude Include="..\..\zlib\crc32.h" />
+    <ClInclude Include="..\..\zlib\deflate.h" />
+    <ClInclude Include="..\..\zlib\gzguts.h" />
+    <ClInclude Include="..\..\zlib\inffast.h" />
+    <ClInclude Include="..\..\zlib\inffixed.h" />
+    <ClInclude Include="..\..\zlib\inflate.h" />
+    <ClInclude Include="..\..\zlib\inftrees.h" />
+    <ClInclude Include="..\..\zlib\trees.h" />
+    <ClInclude Include="..\..\zlib\zconf.h" />
+    <ClInclude Include="..\..\zlib\zlib.h" />
+    <ClInclude Include="..\..\zlib\zutil.h" />
+    <ClInclude Include="..\..\libpng\png.h" />
+    <ClInclude Include="..\..\libpng\pngconf.h" />
+    <ClInclude Include="..\..\libpng\pngpriv.h" />
     <ClInclude Include="Windows.hxx" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\emucore\tia\frame-manager\module.mk" />
+    <None Include="..\..\emucore\tia\frame-manager\module.mk" />
     <None Include="stella.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -2393,4 +2393,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/windows/Stella.vcxproj.filters b/src/os/windows/Stella.vcxproj.filters
similarity index 53%
rename from src/windows/Stella.vcxproj.filters
rename to src/os/windows/Stella.vcxproj.filters
index a5bb07d3d..fa4f10d67 100644
--- a/src/windows/Stella.vcxproj.filters
+++ b/src/os/windows/Stella.vcxproj.filters
@@ -105,7 +105,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\common\FBBackendSDL2.cxx">
+    <ClCompile Include="..\..\common\FBBackendSDL2.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="FSNodeWINDOWS.cxx">
@@ -114,1062 +114,1062 @@
     <ClCompile Include="OSystemWINDOWS.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\PNGLibrary.cxx">
+    <ClCompile Include="..\..\common\PNGLibrary.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="SerialPortWINDOWS.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\SoundSDL2.cxx">
+    <ClCompile Include="..\..\common\SoundSDL2.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\AtariVox.cxx">
+    <ClCompile Include="..\..\emucore\AtariVox.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Booster.cxx">
+    <ClCompile Include="..\..\emucore\Booster.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart.cxx">
+    <ClCompile Include="..\..\emucore\Cart.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart0840.cxx">
+    <ClCompile Include="..\..\emucore\Cart0840.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart2K.cxx">
+    <ClCompile Include="..\..\emucore\Cart2K.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart3E.cxx">
+    <ClCompile Include="..\..\emucore\Cart3E.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart3F.cxx">
+    <ClCompile Include="..\..\emucore\Cart3F.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart4A50.cxx">
+    <ClCompile Include="..\..\emucore\Cart4A50.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart4K.cxx">
+    <ClCompile Include="..\..\emucore\Cart4K.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartAR.cxx">
+    <ClCompile Include="..\..\emucore\CartAR.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartCV.cxx">
+    <ClCompile Include="..\..\emucore\CartCV.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartDPC.cxx">
+    <ClCompile Include="..\..\emucore\CartDPC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartDPCPlus.cxx">
+    <ClCompile Include="..\..\emucore\CartDPCPlus.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartE0.cxx">
+    <ClCompile Include="..\..\emucore\CartE0.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartEF.cxx">
+    <ClCompile Include="..\..\emucore\CartEF.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartEFSC.cxx">
+    <ClCompile Include="..\..\emucore\CartEFSC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartF0.cxx">
+    <ClCompile Include="..\..\emucore\CartF0.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartF4.cxx">
+    <ClCompile Include="..\..\emucore\CartF4.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartF4SC.cxx">
+    <ClCompile Include="..\..\emucore\CartF4SC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartF6.cxx">
+    <ClCompile Include="..\..\emucore\CartF6.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartF6SC.cxx">
+    <ClCompile Include="..\..\emucore\CartF6SC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartF8.cxx">
+    <ClCompile Include="..\..\emucore\CartF8.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartF8SC.cxx">
+    <ClCompile Include="..\..\emucore\CartF8SC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartFA.cxx">
+    <ClCompile Include="..\..\emucore\CartFA.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartFE.cxx">
+    <ClCompile Include="..\..\emucore\CartFE.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartSB.cxx">
+    <ClCompile Include="..\..\emucore\CartSB.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartUA.cxx">
+    <ClCompile Include="..\..\emucore\CartUA.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartX07.cxx">
+    <ClCompile Include="..\..\emucore\CartX07.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Console.cxx">
+    <ClCompile Include="..\..\emucore\Console.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Control.cxx">
+    <ClCompile Include="..\..\emucore\Control.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Driving.cxx">
+    <ClCompile Include="..\..\emucore\Driving.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\EventHandler.cxx">
+    <ClCompile Include="..\..\emucore\EventHandler.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\FrameBuffer.cxx">
+    <ClCompile Include="..\..\emucore\FrameBuffer.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\FSNode.cxx">
+    <ClCompile Include="..\..\emucore\FSNode.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Genesis.cxx">
+    <ClCompile Include="..\..\emucore\Genesis.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Joystick.cxx">
+    <ClCompile Include="..\..\emucore\Joystick.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Keyboard.cxx">
+    <ClCompile Include="..\..\emucore\Keyboard.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\KidVid.cxx">
+    <ClCompile Include="..\..\emucore\KidVid.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\M6502.cxx">
+    <ClCompile Include="..\..\emucore\M6502.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\M6532.cxx">
+    <ClCompile Include="..\..\emucore\M6532.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\MD5.cxx">
+    <ClCompile Include="..\..\emucore\MD5.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\MT24LC256.cxx">
+    <ClCompile Include="..\..\emucore\MT24LC256.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\OSystem.cxx">
+    <ClCompile Include="..\..\emucore\OSystem.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Paddles.cxx">
+    <ClCompile Include="..\..\emucore\Paddles.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Props.cxx">
+    <ClCompile Include="..\..\emucore\Props.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\PropsSet.cxx">
+    <ClCompile Include="..\..\emucore\PropsSet.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\SaveKey.cxx">
+    <ClCompile Include="..\..\emucore\SaveKey.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Serializer.cxx">
+    <ClCompile Include="..\..\emucore\Serializer.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Settings.cxx">
+    <ClCompile Include="..\..\emucore\Settings.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Switches.cxx">
+    <ClCompile Include="..\..\emucore\Switches.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\System.cxx">
+    <ClCompile Include="..\..\emucore\System.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Thumbulator.cxx">
+    <ClCompile Include="..\..\emucore\Thumbulator.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\cheat\BankRomCheat.cxx">
+    <ClCompile Include="..\..\cheat\BankRomCheat.cxx">
       <Filter>Source Files\cheat</Filter>
     </ClCompile>
-    <ClCompile Include="..\cheat\CheatCodeDialog.cxx">
+    <ClCompile Include="..\..\cheat\CheatCodeDialog.cxx">
       <Filter>Source Files\cheat</Filter>
     </ClCompile>
-    <ClCompile Include="..\cheat\CheatManager.cxx">
+    <ClCompile Include="..\..\cheat\CheatManager.cxx">
       <Filter>Source Files\cheat</Filter>
     </ClCompile>
-    <ClCompile Include="..\cheat\CheetahCheat.cxx">
+    <ClCompile Include="..\..\cheat\CheetahCheat.cxx">
       <Filter>Source Files\cheat</Filter>
     </ClCompile>
-    <ClCompile Include="..\cheat\RamCheat.cxx">
+    <ClCompile Include="..\..\cheat\RamCheat.cxx">
       <Filter>Source Files\cheat</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\AudioWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\AudioWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\CartDebug.cxx">
+    <ClCompile Include="..\..\debugger\CartDebug.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\CpuDebug.cxx">
+    <ClCompile Include="..\..\debugger\CpuDebug.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CpuWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CpuWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DataGridOpsWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DataGridOpsWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DataGridWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DataGridWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\Debugger.cxx">
+    <ClCompile Include="..\..\debugger\Debugger.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DebuggerDialog.cxx">
+    <ClCompile Include="..\..\debugger\gui\DebuggerDialog.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\DebuggerParser.cxx">
+    <ClCompile Include="..\..\debugger\DebuggerParser.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\DiStella.cxx">
+    <ClCompile Include="..\..\debugger\DiStella.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\PromptWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\PromptWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RamWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RamWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\RiotDebug.cxx">
+    <ClCompile Include="..\..\debugger\RiotDebug.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RiotWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RiotWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RomListWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RomListWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RomWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RomWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\TIADebug.cxx">
+    <ClCompile Include="..\..\debugger\TIADebug.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TiaInfoWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TiaInfoWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TiaOutputWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TiaOutputWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TiaWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TiaWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TiaZoomWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TiaZoomWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\ToggleBitWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\ToggleBitWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TogglePixelWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TogglePixelWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\ToggleWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\ToggleWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\yacc\YaccParser.cxx">
+    <ClCompile Include="..\..\yacc\YaccParser.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\AboutDialog.cxx">
+    <ClCompile Include="..\..\gui\AboutDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\BrowserDialog.cxx">
+    <ClCompile Include="..\..\gui\BrowserDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\CheckListWidget.cxx">
+    <ClCompile Include="..\..\gui\CheckListWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\ComboDialog.cxx">
+    <ClCompile Include="..\..\gui\ComboDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\CommandDialog.cxx">
+    <ClCompile Include="..\..\gui\CommandDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\CommandMenu.cxx">
+    <ClCompile Include="..\..\gui\CommandMenu.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\ContextMenu.cxx">
+    <ClCompile Include="..\..\gui\ContextMenu.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\Dialog.cxx">
+    <ClCompile Include="..\..\gui\Dialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\DialogContainer.cxx">
+    <ClCompile Include="..\..\gui\DialogContainer.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\EditableWidget.cxx">
+    <ClCompile Include="..\..\gui\EditableWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\EditTextWidget.cxx">
+    <ClCompile Include="..\..\gui\EditTextWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\EventMappingWidget.cxx">
+    <ClCompile Include="..\..\gui\EventMappingWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\Font.cxx">
+    <ClCompile Include="..\..\gui\Font.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\GameInfoDialog.cxx">
+    <ClCompile Include="..\..\gui\GameInfoDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\GlobalPropsDialog.cxx">
+    <ClCompile Include="..\..\gui\GlobalPropsDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\HelpDialog.cxx">
+    <ClCompile Include="..\..\gui\HelpDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\InputDialog.cxx">
+    <ClCompile Include="..\..\gui\InputDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\InputTextDialog.cxx">
+    <ClCompile Include="..\..\gui\InputTextDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\Launcher.cxx">
+    <ClCompile Include="..\..\gui\Launcher.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\LauncherDialog.cxx">
+    <ClCompile Include="..\..\gui\LauncherDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\ListWidget.cxx">
+    <ClCompile Include="..\..\gui\ListWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\OptionsMenu.cxx">
+    <ClCompile Include="..\..\gui\OptionsMenu.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\MessageBox.cxx">
+    <ClCompile Include="..\..\gui\MessageBox.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\OptionsDialog.cxx">
+    <ClCompile Include="..\..\gui\OptionsDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\PopUpWidget.cxx">
+    <ClCompile Include="..\..\gui\PopUpWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\ProgressDialog.cxx">
+    <ClCompile Include="..\..\gui\ProgressDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\RomAuditDialog.cxx">
+    <ClCompile Include="..\..\gui\RomAuditDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\RomInfoWidget.cxx">
+    <ClCompile Include="..\..\gui\RomInfoWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\ScrollBarWidget.cxx">
+    <ClCompile Include="..\..\gui\ScrollBarWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\StringListWidget.cxx">
+    <ClCompile Include="..\..\gui\StringListWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\TabWidget.cxx">
+    <ClCompile Include="..\..\gui\TabWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\UIDialog.cxx">
+    <ClCompile Include="..\..\gui\UIDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\Widget.cxx">
+    <ClCompile Include="..\..\gui\Widget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\adler32.c">
+    <ClCompile Include="..\..\zlib\adler32.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\compress.c">
+    <ClCompile Include="..\..\zlib\compress.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\crc32.c">
+    <ClCompile Include="..\..\zlib\crc32.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\deflate.c">
+    <ClCompile Include="..\..\zlib\deflate.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\gzclose.c">
+    <ClCompile Include="..\..\zlib\gzclose.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\gzlib.c">
+    <ClCompile Include="..\..\zlib\gzlib.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\gzread.c">
+    <ClCompile Include="..\..\zlib\gzread.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\gzwrite.c">
+    <ClCompile Include="..\..\zlib\gzwrite.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\infback.c">
+    <ClCompile Include="..\..\zlib\infback.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\inffast.c">
+    <ClCompile Include="..\..\zlib\inffast.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\inflate.c">
+    <ClCompile Include="..\..\zlib\inflate.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\inftrees.c">
+    <ClCompile Include="..\..\zlib\inftrees.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\trees.c">
+    <ClCompile Include="..\..\zlib\trees.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\uncompr.c">
+    <ClCompile Include="..\..\zlib\uncompr.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib\zutil.c">
+    <ClCompile Include="..\..\zlib\zutil.c">
       <Filter>Source Files\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\png.c">
+    <ClCompile Include="..\..\libpng\png.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngerror.c">
+    <ClCompile Include="..\..\libpng\pngerror.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngget.c">
+    <ClCompile Include="..\..\libpng\pngget.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngmem.c">
+    <ClCompile Include="..\..\libpng\pngmem.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngpread.c">
+    <ClCompile Include="..\..\libpng\pngpread.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngread.c">
+    <ClCompile Include="..\..\libpng\pngread.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngrio.c">
+    <ClCompile Include="..\..\libpng\pngrio.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngrtran.c">
+    <ClCompile Include="..\..\libpng\pngrtran.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngrutil.c">
+    <ClCompile Include="..\..\libpng\pngrutil.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngset.c">
+    <ClCompile Include="..\..\libpng\pngset.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngtrans.c">
+    <ClCompile Include="..\..\libpng\pngtrans.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngwio.c">
+    <ClCompile Include="..\..\libpng\pngwio.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngwrite.c">
+    <ClCompile Include="..\..\libpng\pngwrite.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngwtran.c">
+    <ClCompile Include="..\..\libpng\pngwtran.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\libpng\pngwutil.c">
+    <ClCompile Include="..\..\libpng\pngwutil.c">
       <Filter>Source Files\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\LoggerDialog.cxx">
+    <ClCompile Include="..\..\gui\LoggerDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\FBSurfaceSDL2.cxx">
+    <ClCompile Include="..\..\common\FBSurfaceSDL2.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CompuMate.cxx">
+    <ClCompile Include="..\..\emucore\CompuMate.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\MindLink.cxx">
+    <ClCompile Include="..\..\emucore\MindLink.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartCM.cxx">
+    <ClCompile Include="..\..\emucore\CartCM.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\BoosterWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\BoosterWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DrivingWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DrivingWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\GenesisWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\GenesisWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\JoystickWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\JoystickWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\KeyboardWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\KeyboardWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\PaddleWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\PaddleWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartFA2.cxx">
+    <ClCompile Include="..\..\emucore\CartFA2.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\MouseControl.cxx">
+    <ClCompile Include="..\..\common\MouseControl.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\tv_filters\NTSCFilter.cxx">
+    <ClCompile Include="..\..\common\tv_filters\NTSCFilter.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartCTY.cxx">
+    <ClCompile Include="..\..\emucore\CartCTY.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\FSNodeZIP.cxx">
+    <ClCompile Include="..\..\common\FSNodeZIP.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\ZipHandler.cxx">
+    <ClCompile Include="..\..\common\ZipHandler.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart2KWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart2KWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart3EWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart3EWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart3FWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart3FWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart4A50Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart4A50Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart4KWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart4KWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart0840Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart0840Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartARWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartARWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCMWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCMWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCTYWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCTYWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCVWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCVWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDPCPlusWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDPCPlusWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDPCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDPCWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartE0Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartE0Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartEFSCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartEFSCWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartEFWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartEFWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF0Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF0Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF4SCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF4SCWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF4Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF4Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF6SCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF6SCWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF6Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF6Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF8SCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF8SCWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartF8Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartF8Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartFA2Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartFA2Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartFAWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartFAWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartFEWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartFEWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartSBWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartSBWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartUAWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartUAWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartX07Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartX07Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\FileListWidget.cxx">
+    <ClCompile Include="..\..\gui\FileListWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RomListSettings.cxx">
+    <ClCompile Include="..\..\debugger\gui\RomListSettings.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\SnapshotDialog.cxx">
+    <ClCompile Include="..\..\gui\SnapshotDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\Base.cxx">
+    <ClCompile Include="..\..\common\Base.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart4KSC.cxx">
+    <ClCompile Include="..\..\emucore\Cart4KSC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartBF.cxx">
+    <ClCompile Include="..\..\emucore\CartBF.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartBFSC.cxx">
+    <ClCompile Include="..\..\emucore\CartBFSC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartDF.cxx">
+    <ClCompile Include="..\..\emucore\CartDF.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartDFSC.cxx">
+    <ClCompile Include="..\..\emucore\CartDFSC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart4KSCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart4KSCWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartBFSCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartBFSCWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartBFWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartBFWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDFSCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDFSCWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDFWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDFWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\EventHandlerSDL2.cxx">
+    <ClCompile Include="..\..\common\EventHandlerSDL2.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\FBSurface.cxx">
+    <ClCompile Include="..\..\emucore\FBSurface.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\TIASurface.cxx">
+    <ClCompile Include="..\..\emucore\TIASurface.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartRamWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartRamWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\AtariVoxWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\AtariVoxWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\SaveKeyWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\SaveKeyWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartMDM.cxx">
+    <ClCompile Include="..\..\emucore\CartMDM.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartMDMWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartMDMWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\main.cxx">
+    <ClCompile Include="..\..\common\main.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartWD.cxx">
+    <ClCompile Include="..\..\emucore\CartWD.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartWDWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartWDWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\JoystickDialog.cxx">
+    <ClCompile Include="..\..\gui\JoystickDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\RiotRamWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\RiotRamWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart3EPlusWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart3EPlusWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart3EPlus.cxx">
+    <ClCompile Include="..\..\emucore\Cart3EPlus.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\Background.cxx">
+    <ClCompile Include="..\..\emucore\tia\Background.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\Ball.cxx">
+    <ClCompile Include="..\..\emucore\tia\Ball.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\DrawCounterDecodes.cxx">
+    <ClCompile Include="..\..\emucore\tia\DrawCounterDecodes.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\LatchedInput.cxx">
+    <ClCompile Include="..\..\emucore\tia\LatchedInput.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\Missile.cxx">
+    <ClCompile Include="..\..\emucore\tia\Missile.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\AnalogReadout.cxx">
+    <ClCompile Include="..\..\emucore\tia\AnalogReadout.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\Player.cxx">
+    <ClCompile Include="..\..\emucore\tia\Player.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\Playfield.cxx">
+    <ClCompile Include="..\..\emucore\tia\Playfield.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\TIA.cxx">
+    <ClCompile Include="..\..\emucore\tia\TIA.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartBUSWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartBUSWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCDFWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCDFWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartBUS.cxx">
+    <ClCompile Include="..\..\emucore\CartBUS.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartCDF.cxx">
+    <ClCompile Include="..\..\emucore\CartCDF.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DelayQueueWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DelayQueueWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\tv_filters\AtariNTSC.cxx">
+    <ClCompile Include="..\..\common\tv_filters\AtariNTSC.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartDetector.cxx">
+    <ClCompile Include="..\..\emucore\CartDetector.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\ColorWidget.cxx">
+    <ClCompile Include="..\..\gui\ColorWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\PointingDevice.cxx">
+    <ClCompile Include="..\..\emucore\PointingDevice.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\RewindManager.cxx">
+    <ClCompile Include="..\..\common\RewindManager.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\StateManager.cxx">
+    <ClCompile Include="..\..\common\StateManager.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\AmigaMouseWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\AmigaMouseWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\AtariMouseWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\AtariMouseWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\FlashWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\FlashWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\PointingDeviceWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\PointingDeviceWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\TrakBallWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\TrakBallWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\DeveloperDialog.cxx">
+    <ClCompile Include="..\..\gui\DeveloperDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartDebugWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartDebugWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\RadioButtonWidget.cxx">
+    <ClCompile Include="..\..\gui\RadioButtonWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\TimeMachine.cxx">
+    <ClCompile Include="..\..\gui\TimeMachine.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\TimeMachineDialog.cxx">
+    <ClCompile Include="..\..\gui\TimeMachineDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\frame-manager\AbstractFrameManager.cxx">
+    <ClCompile Include="..\..\emucore\tia\frame-manager\AbstractFrameManager.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\frame-manager\FrameLayoutDetector.cxx">
+    <ClCompile Include="..\..\emucore\tia\frame-manager\FrameLayoutDetector.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\frame-manager\FrameManager.cxx">
+    <ClCompile Include="..\..\emucore\tia\frame-manager\FrameManager.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\frame-manager\JitterEmulation.cxx">
+    <ClCompile Include="..\..\emucore\tia\frame-manager\JitterEmulation.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\TimeLineWidget.cxx">
+    <ClCompile Include="..\..\gui\TimeLineWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\PhysicalJoystick.cxx">
+    <ClCompile Include="..\..\common\PhysicalJoystick.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\PJoystickHandler.cxx">
+    <ClCompile Include="..\..\common\PJoystickHandler.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\PKeyboardHandler.cxx">
+    <ClCompile Include="..\..\common\PKeyboardHandler.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\KeyMap.cxx">
+    <ClCompile Include="..\..\common\KeyMap.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\Audio.cxx">
+    <ClCompile Include="..\..\emucore\tia\Audio.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\tia\AudioChannel.cxx">
+    <ClCompile Include="..\..\emucore\tia\AudioChannel.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\AudioQueue.cxx">
+    <ClCompile Include="..\..\common\AudioQueue.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\EmulationTiming.cxx">
+    <ClCompile Include="..\..\emucore\EmulationTiming.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\audio\SimpleResampler.cxx">
+    <ClCompile Include="..\..\common\audio\SimpleResampler.cxx">
       <Filter>Source Files\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\audio\ConvolutionBuffer.cxx">
+    <ClCompile Include="..\..\common\audio\ConvolutionBuffer.cxx">
       <Filter>Source Files\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\audio\LanczosResampler.cxx">
+    <ClCompile Include="..\..\common\audio\LanczosResampler.cxx">
       <Filter>Source Files\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\DispatchResult.cxx">
+    <ClCompile Include="..\..\emucore\DispatchResult.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\EmulationWorker.cxx">
+    <ClCompile Include="..\..\emucore\EmulationWorker.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\AudioSettings.cxx">
+    <ClCompile Include="..\..\common\AudioSettings.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\FpsMeter.cxx">
+    <ClCompile Include="..\..\common\FpsMeter.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\audio\HighPass.cxx">
+    <ClCompile Include="..\..\common\audio\HighPass.cxx">
       <Filter>Source Files\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\TimerManager.cxx">
+    <ClCompile Include="..\..\common\TimerManager.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Bankswitch.cxx">
+    <ClCompile Include="..\..\emucore\Bankswitch.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\ThreadDebugging.cxx">
+    <ClCompile Include="..\..\common\ThreadDebugging.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\StaggeredLogger.cxx">
+    <ClCompile Include="..\..\common\StaggeredLogger.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\ControllerDetector.cxx">
+    <ClCompile Include="..\..\emucore\ControllerDetector.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\ProfilingRunner.cxx">
+    <ClCompile Include="..\..\emucore\ProfilingRunner.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartCDFInfoWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartCDFInfoWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\StellaSettingsDialog.cxx">
+    <ClCompile Include="..\..\gui\StellaSettingsDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\MinUICommandDialog.cxx">
+    <ClCompile Include="..\..\gui\MinUICommandDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\Logger.cxx">
+    <ClCompile Include="..\..\common\Logger.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\R77HelpDialog.cxx">
+    <ClCompile Include="..\..\gui\R77HelpDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\JoyMap.cxx">
+    <ClCompile Include="..\..\common\JoyMap.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\BreakpointMap.cxx">
+    <ClCompile Include="..\..\debugger\BreakpointMap.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartFC.cxx">
+    <ClCompile Include="..\..\emucore\CartFC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartFCWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartFCWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\sdl_blitter\BilinearBlitter.cxx">
+    <ClCompile Include="..\..\common\sdl_blitter\BilinearBlitter.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\sdl_blitter\QisBlitter.cxx">
+    <ClCompile Include="..\..\common\sdl_blitter\QisBlitter.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\sdl_blitter\BlitterFactory.cxx">
+    <ClCompile Include="..\..\common\sdl_blitter\BlitterFactory.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\PhosphorHandler.cxx">
+    <ClCompile Include="..\..\common\PhosphorHandler.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Lightgun.cxx">
+    <ClCompile Include="..\..\emucore\Lightgun.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\MessageMenu.cxx">
+    <ClCompile Include="..\..\gui\MessageMenu.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\MessageDialog.cxx">
+    <ClCompile Include="..\..\gui\MessageDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\HighScoresManager.cxx">
+    <ClCompile Include="..\..\common\HighScoresManager.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\HighScoresMenu.cxx">
+    <ClCompile Include="..\..\gui\HighScoresMenu.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\HighScoresDialog.cxx">
+    <ClCompile Include="..\..\gui\HighScoresDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartEnhanced.cxx">
+    <ClCompile Include="..\..\emucore\CartEnhanced.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartEnhancedWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartEnhancedWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart3EX.cxx">
+    <ClCompile Include="..\..\emucore\Cart3EX.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\PaletteHandler.cxx">
+    <ClCompile Include="..\..\common\PaletteHandler.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\EmulationDialog.cxx">
+    <ClCompile Include="..\..\gui\EmulationDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\VideoAudioDialog.cxx">
+    <ClCompile Include="..\..\gui\VideoAudioDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartTVBoy.cxx">
+    <ClCompile Include="..\..\emucore\CartTVBoy.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartCreator.cxx">
+    <ClCompile Include="..\..\emucore\CartCreator.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\WhatsNewDialog.cxx">
+    <ClCompile Include="..\..\gui\WhatsNewDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\QuadTari.cxx">
+    <ClCompile Include="..\..\emucore\QuadTari.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\QuadTariWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\QuadTariWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\QuadTariDialog.cxx">
+    <ClCompile Include="..\..\gui\QuadTariDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartTVBoyWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartTVBoyWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\VideoModeHandler.cxx">
+    <ClCompile Include="..\..\common\VideoModeHandler.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\UndoHandler.cxx">
+    <ClCompile Include="..\..\gui\UndoHandler.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\ToolTip.cxx">
+    <ClCompile Include="..\..\gui\ToolTip.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\DataGridRamWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\DataGridRamWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\PlusROM.cxx">
+    <ClCompile Include="..\..\emucore\PlusROM.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\sqlite\KeyValueRepositorySqlite.cxx">
+    <ClCompile Include="..\..\common\repository\sqlite\KeyValueRepositorySqlite.cxx">
       <Filter>Source Files\repository\sqlite</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\sqlite\SqliteDatabase.cxx">
+    <ClCompile Include="..\..\common\repository\sqlite\SqliteDatabase.cxx">
       <Filter>Source Files\repository\sqlite</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\sqlite\SqliteStatement.cxx">
+    <ClCompile Include="..\..\common\repository\sqlite\SqliteStatement.cxx">
       <Filter>Source Files\repository\sqlite</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\sqlite\SqliteTransaction.cxx">
+    <ClCompile Include="..\..\common\repository\sqlite\SqliteTransaction.cxx">
       <Filter>Source Files\repository\sqlite</Filter>
     </ClCompile>
-    <ClCompile Include="..\sqlite\source\sqlite3.c">
+    <ClCompile Include="..\..\sqlite\source\sqlite3.c">
       <Filter>Source Files\sqlite\source</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\sqlite\AbstractKeyValueRepositorySqlite.cxx">
+    <ClCompile Include="..\..\common\repository\sqlite\AbstractKeyValueRepositorySqlite.cxx">
       <Filter>Source Files\repository\sqlite</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\sqlite\CompositeKeyValueRepositorySqlite.cxx">
+    <ClCompile Include="..\..\common\repository\sqlite\CompositeKeyValueRepositorySqlite.cxx">
       <Filter>Source Files\repository\sqlite</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\KeyValueRepositoryPropertyFile.cxx">
+    <ClCompile Include="..\..\common\repository\KeyValueRepositoryPropertyFile.cxx">
       <Filter>Source Files\repository</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\CompositeKVRJsonAdapter.cxx">
+    <ClCompile Include="..\..\common\repository\CompositeKVRJsonAdapter.cxx">
       <Filter>Source Files\repository</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\KeyValueRepositoryConfigfile.cxx">
+    <ClCompile Include="..\..\common\repository\KeyValueRepositoryConfigfile.cxx">
       <Filter>Source Files\repository</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\KeyValueRepositoryJsonFile.cxx">
+    <ClCompile Include="..\..\common\repository\KeyValueRepositoryJsonFile.cxx">
       <Filter>Source Files\repository</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\sqlite\StellaDb.cxx">
+    <ClCompile Include="..\..\common\repository\sqlite\StellaDb.cxx">
       <Filter>Source Files\repository\sqlite</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\OSystemStandalone.cxx">
+    <ClCompile Include="..\..\emucore\OSystemStandalone.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\repository\CompositeKeyValueRepository.cxx">
+    <ClCompile Include="..\..\common\repository\CompositeKeyValueRepository.cxx">
       <Filter>Source Files\repository</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartMVC.cxx">
+    <ClCompile Include="..\..\emucore\CartMVC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartARM.cxx">
+    <ClCompile Include="..\..\emucore\CartARM.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartARMWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartARMWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\PlusRomsMenu.cxx">
+    <ClCompile Include="..\..\gui\PlusRomsMenu.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\PlusRomsSetupDialog.cxx">
+    <ClCompile Include="..\..\gui\PlusRomsSetupDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\CartE7.cxx">
+    <ClCompile Include="..\..\emucore\CartE7.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartE7Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartE7Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\GlobalKeyHandler.cxx">
+    <ClCompile Include="..\..\emucore\GlobalKeyHandler.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\DevSettingsHandler.cxx">
+    <ClCompile Include="..\..\common\DevSettingsHandler.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\LauncherFileListWidget.cxx">
+    <ClCompile Include="..\..\gui\LauncherFileListWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\FavoritesManager.cxx">
+    <ClCompile Include="..\..\gui\FavoritesManager.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\NavigationWidget.cxx">
+    <ClCompile Include="..\..\gui\NavigationWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Cart0FA0.cxx">
+    <ClCompile Include="..\..\emucore\Cart0FA0.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Cart0FA0Widget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Cart0FA0Widget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\CartBUSInfoWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\CartBUSInfoWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\Joy2BPlus.cxx">
+    <ClCompile Include="..\..\emucore\Joy2BPlus.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\debugger\gui\Joy2BPlusWidget.cxx">
+    <ClCompile Include="..\..\debugger\gui\Joy2BPlusWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\gui\RomImageWidget.cxx">
+    <ClCompile Include="..\..\gui\RomImageWidget.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\JPGLibrary.cxx">
+    <ClCompile Include="..\..\common\JPGLibrary.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tinyexif\tinyexif.cxx">
+    <ClCompile Include="..\..\tinyexif\tinyexif.cxx">
       <Filter>Source Files\tinyexif</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\common\bspf.hxx">
+    <ClInclude Include="..\..\common\bspf.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\FBBackendSDL2.hxx">
+    <ClInclude Include="..\..\common\FBBackendSDL2.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="HomeFinder.hxx">
@@ -1178,1228 +1178,1228 @@
     <ClInclude Include="OSystemWINDOWS.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\PNGLibrary.hxx">
+    <ClInclude Include="..\..\common\PNGLibrary.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="SerialPortWINDOWS.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\SoundSDL2.hxx">
+    <ClInclude Include="..\..\common\SoundSDL2.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\Stack.hxx">
+    <ClInclude Include="..\..\common\Stack.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\Version.hxx">
+    <ClInclude Include="..\..\common\Version.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\AtariVox.hxx">
+    <ClInclude Include="..\..\emucore\AtariVox.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Booster.hxx">
+    <ClInclude Include="..\..\emucore\Booster.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart.hxx">
+    <ClInclude Include="..\..\emucore\Cart.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart0840.hxx">
+    <ClInclude Include="..\..\emucore\Cart0840.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart2K.hxx">
+    <ClInclude Include="..\..\emucore\Cart2K.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart3E.hxx">
+    <ClInclude Include="..\..\emucore\Cart3E.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart3F.hxx">
+    <ClInclude Include="..\..\emucore\Cart3F.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart4A50.hxx">
+    <ClInclude Include="..\..\emucore\Cart4A50.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart4K.hxx">
+    <ClInclude Include="..\..\emucore\Cart4K.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartAR.hxx">
+    <ClInclude Include="..\..\emucore\CartAR.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartCV.hxx">
+    <ClInclude Include="..\..\emucore\CartCV.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartDPC.hxx">
+    <ClInclude Include="..\..\emucore\CartDPC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartDPCPlus.hxx">
+    <ClInclude Include="..\..\emucore\CartDPCPlus.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartE0.hxx">
+    <ClInclude Include="..\..\emucore\CartE0.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartEF.hxx">
+    <ClInclude Include="..\..\emucore\CartEF.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartEFSC.hxx">
+    <ClInclude Include="..\..\emucore\CartEFSC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartF0.hxx">
+    <ClInclude Include="..\..\emucore\CartF0.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartF4.hxx">
+    <ClInclude Include="..\..\emucore\CartF4.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartF4SC.hxx">
+    <ClInclude Include="..\..\emucore\CartF4SC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartF6.hxx">
+    <ClInclude Include="..\..\emucore\CartF6.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartF6SC.hxx">
+    <ClInclude Include="..\..\emucore\CartF6SC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartF8.hxx">
+    <ClInclude Include="..\..\emucore\CartF8.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartF8SC.hxx">
+    <ClInclude Include="..\..\emucore\CartF8SC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartFA.hxx">
+    <ClInclude Include="..\..\emucore\CartFA.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartFE.hxx">
+    <ClInclude Include="..\..\emucore\CartFE.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartSB.hxx">
+    <ClInclude Include="..\..\emucore\CartSB.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartUA.hxx">
+    <ClInclude Include="..\..\emucore\CartUA.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartX07.hxx">
+    <ClInclude Include="..\..\emucore\CartX07.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Console.hxx">
+    <ClInclude Include="..\..\emucore\Console.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Control.hxx">
+    <ClInclude Include="..\..\emucore\Control.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\DefProps.hxx">
+    <ClInclude Include="..\..\emucore\DefProps.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Device.hxx">
+    <ClInclude Include="..\..\emucore\Device.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Driving.hxx">
+    <ClInclude Include="..\..\emucore\Driving.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Event.hxx">
+    <ClInclude Include="..\..\emucore\Event.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\EventHandler.hxx">
+    <ClInclude Include="..\..\emucore\EventHandler.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\FrameBuffer.hxx">
+    <ClInclude Include="..\..\emucore\FrameBuffer.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\FSNode.hxx">
+    <ClInclude Include="..\..\emucore\FSNode.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Genesis.hxx">
+    <ClInclude Include="..\..\emucore\Genesis.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Joystick.hxx">
+    <ClInclude Include="..\..\emucore\Joystick.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Keyboard.hxx">
+    <ClInclude Include="..\..\emucore\Keyboard.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\KidVid.hxx">
+    <ClInclude Include="..\..\emucore\KidVid.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\M6502.hxx">
+    <ClInclude Include="..\..\emucore\M6502.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\M6532.hxx">
+    <ClInclude Include="..\..\emucore\M6532.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\MD5.hxx">
+    <ClInclude Include="..\..\emucore\MD5.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\MT24LC256.hxx">
+    <ClInclude Include="..\..\emucore\MT24LC256.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\NullDev.hxx">
+    <ClInclude Include="..\..\emucore\NullDev.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\OSystem.hxx">
+    <ClInclude Include="..\..\emucore\OSystem.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Paddles.hxx">
+    <ClInclude Include="..\..\emucore\Paddles.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Props.hxx">
+    <ClInclude Include="..\..\emucore\Props.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\PropsSet.hxx">
+    <ClInclude Include="..\..\emucore\PropsSet.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Random.hxx">
+    <ClInclude Include="..\..\emucore\Random.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\SaveKey.hxx">
+    <ClInclude Include="..\..\emucore\SaveKey.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Serializable.hxx">
+    <ClInclude Include="..\..\emucore\Serializable.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Serializer.hxx">
+    <ClInclude Include="..\..\emucore\Serializer.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Settings.hxx">
+    <ClInclude Include="..\..\emucore\Settings.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Sound.hxx">
+    <ClInclude Include="..\..\emucore\Sound.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Switches.hxx">
+    <ClInclude Include="..\..\emucore\Switches.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\System.hxx">
+    <ClInclude Include="..\..\emucore\System.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Thumbulator.hxx">
+    <ClInclude Include="..\..\emucore\Thumbulator.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\AudioWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\AudioWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\CartDebug.hxx">
+    <ClInclude Include="..\..\debugger\CartDebug.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\CpuDebug.hxx">
+    <ClInclude Include="..\..\debugger\CpuDebug.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CpuWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CpuWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DataGridOpsWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DataGridOpsWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DataGridWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DataGridWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\Debugger.hxx">
+    <ClInclude Include="..\..\debugger\Debugger.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DebuggerDialog.hxx">
+    <ClInclude Include="..\..\debugger\gui\DebuggerDialog.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\DebuggerExpressions.hxx">
+    <ClInclude Include="..\..\debugger\DebuggerExpressions.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\DebuggerParser.hxx">
+    <ClInclude Include="..\..\debugger\DebuggerParser.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\DebuggerSystem.hxx">
+    <ClInclude Include="..\..\debugger\DebuggerSystem.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\DiStella.hxx">
+    <ClInclude Include="..\..\debugger\DiStella.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\Expression.hxx">
+    <ClInclude Include="..\..\debugger\Expression.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\PromptWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\PromptWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RamWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RamWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\RiotDebug.hxx">
+    <ClInclude Include="..\..\debugger\RiotDebug.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RiotWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RiotWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RomListWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RomListWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RomWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RomWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\TIADebug.hxx">
+    <ClInclude Include="..\..\debugger\TIADebug.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TiaInfoWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TiaInfoWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TiaOutputWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TiaOutputWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TiaZoomWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TiaZoomWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\ToggleBitWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\ToggleBitWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TogglePixelWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TogglePixelWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\ToggleWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\ToggleWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\yacc\YaccParser.hxx">
+    <ClInclude Include="..\..\yacc\YaccParser.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\cheat\BankRomCheat.hxx">
+    <ClInclude Include="..\..\cheat\BankRomCheat.hxx">
       <Filter>Header Files\cheat</Filter>
     </ClInclude>
-    <ClInclude Include="..\cheat\Cheat.hxx">
+    <ClInclude Include="..\..\cheat\Cheat.hxx">
       <Filter>Header Files\cheat</Filter>
     </ClInclude>
-    <ClInclude Include="..\cheat\CheatCodeDialog.hxx">
+    <ClInclude Include="..\..\cheat\CheatCodeDialog.hxx">
       <Filter>Header Files\cheat</Filter>
     </ClInclude>
-    <ClInclude Include="..\cheat\CheatManager.hxx">
+    <ClInclude Include="..\..\cheat\CheatManager.hxx">
       <Filter>Header Files\cheat</Filter>
     </ClInclude>
-    <ClInclude Include="..\cheat\CheetahCheat.hxx">
+    <ClInclude Include="..\..\cheat\CheetahCheat.hxx">
       <Filter>Header Files\cheat</Filter>
     </ClInclude>
-    <ClInclude Include="..\cheat\RamCheat.hxx">
+    <ClInclude Include="..\..\cheat\RamCheat.hxx">
       <Filter>Header Files\cheat</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\AboutDialog.hxx">
+    <ClInclude Include="..\..\gui\AboutDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\BrowserDialog.hxx">
+    <ClInclude Include="..\..\gui\BrowserDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\CheckListWidget.hxx">
+    <ClInclude Include="..\..\gui\CheckListWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ComboDialog.hxx">
+    <ClInclude Include="..\..\gui\ComboDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Command.hxx">
+    <ClInclude Include="..\..\gui\Command.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\CommandDialog.hxx">
+    <ClInclude Include="..\..\gui\CommandDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\CommandMenu.hxx">
+    <ClInclude Include="..\..\gui\CommandMenu.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ConsoleFont.hxx">
+    <ClInclude Include="..\..\gui\ConsoleFont.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ContextMenu.hxx">
+    <ClInclude Include="..\..\gui\ContextMenu.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Dialog.hxx">
+    <ClInclude Include="..\..\gui\Dialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\DialogContainer.hxx">
+    <ClInclude Include="..\..\gui\DialogContainer.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\EditableWidget.hxx">
+    <ClInclude Include="..\..\gui\EditableWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\EditTextWidget.hxx">
+    <ClInclude Include="..\..\gui\EditTextWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\EventMappingWidget.hxx">
+    <ClInclude Include="..\..\gui\EventMappingWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Font.hxx">
+    <ClInclude Include="..\..\gui\Font.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\GameInfoDialog.hxx">
+    <ClInclude Include="..\..\gui\GameInfoDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\GlobalPropsDialog.hxx">
+    <ClInclude Include="..\..\gui\GlobalPropsDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\GuiObject.hxx">
+    <ClInclude Include="..\..\gui\GuiObject.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\HelpDialog.hxx">
+    <ClInclude Include="..\..\gui\HelpDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\InputDialog.hxx">
+    <ClInclude Include="..\..\gui\InputDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\InputTextDialog.hxx">
+    <ClInclude Include="..\..\gui\InputTextDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Launcher.hxx">
+    <ClInclude Include="..\..\gui\Launcher.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\LauncherDialog.hxx">
+    <ClInclude Include="..\..\gui\LauncherDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ListWidget.hxx">
+    <ClInclude Include="..\..\gui\ListWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\OptionsMenu.hxx">
+    <ClInclude Include="..\..\gui\OptionsMenu.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\MessageBox.hxx">
+    <ClInclude Include="..\..\gui\MessageBox.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\OptionsDialog.hxx">
+    <ClInclude Include="..\..\gui\OptionsDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\PopUpWidget.hxx">
+    <ClInclude Include="..\..\gui\PopUpWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ProgressDialog.hxx">
+    <ClInclude Include="..\..\gui\ProgressDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\RomAuditDialog.hxx">
+    <ClInclude Include="..\..\gui\RomAuditDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\RomInfoWidget.hxx">
+    <ClInclude Include="..\..\gui\RomInfoWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ScrollBarWidget.hxx">
+    <ClInclude Include="..\..\gui\ScrollBarWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\StellaFont.hxx">
+    <ClInclude Include="..\..\gui\StellaFont.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\StringListWidget.hxx">
+    <ClInclude Include="..\..\gui\StringListWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\TabWidget.hxx">
+    <ClInclude Include="..\..\gui\TabWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\UIDialog.hxx">
+    <ClInclude Include="..\..\gui\UIDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Widget.hxx">
+    <ClInclude Include="..\..\gui\Widget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\crc32.h">
+    <ClInclude Include="..\..\zlib\crc32.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\deflate.h">
+    <ClInclude Include="..\..\zlib\deflate.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\gzguts.h">
+    <ClInclude Include="..\..\zlib\gzguts.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\inffast.h">
+    <ClInclude Include="..\..\zlib\inffast.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\inffixed.h">
+    <ClInclude Include="..\..\zlib\inffixed.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\inflate.h">
+    <ClInclude Include="..\..\zlib\inflate.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\inftrees.h">
+    <ClInclude Include="..\..\zlib\inftrees.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\trees.h">
+    <ClInclude Include="..\..\zlib\trees.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\zconf.h">
+    <ClInclude Include="..\..\zlib\zconf.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\zlib.h">
+    <ClInclude Include="..\..\zlib\zlib.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib\zutil.h">
+    <ClInclude Include="..\..\zlib\zutil.h">
       <Filter>Header Files\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\libpng\png.h">
+    <ClInclude Include="..\..\libpng\png.h">
       <Filter>Header Files\libpng</Filter>
     </ClInclude>
-    <ClInclude Include="..\libpng\pngconf.h">
+    <ClInclude Include="..\..\libpng\pngconf.h">
       <Filter>Header Files\libpng</Filter>
     </ClInclude>
-    <ClInclude Include="..\libpng\pngpriv.h">
+    <ClInclude Include="..\..\libpng\pngpriv.h">
       <Filter>Header Files\libpng</Filter>
     </ClInclude>
-    <ClInclude Include="..\libpng\pngdebug.h">
+    <ClInclude Include="..\..\libpng\pngdebug.h">
       <Filter>Header Files\libpng</Filter>
     </ClInclude>
-    <ClInclude Include="..\libpng\pnginfo.h">
+    <ClInclude Include="..\..\libpng\pnginfo.h">
       <Filter>Header Files\libpng</Filter>
     </ClInclude>
-    <ClInclude Include="..\libpng\pnglibconf.h">
+    <ClInclude Include="..\..\libpng\pnglibconf.h">
       <Filter>Header Files\libpng</Filter>
     </ClInclude>
-    <ClInclude Include="..\libpng\pngstruct.h">
+    <ClInclude Include="..\..\libpng\pngstruct.h">
       <Filter>Header Files\libpng</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\StringParser.hxx">
+    <ClInclude Include="..\..\common\StringParser.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\LoggerDialog.hxx">
+    <ClInclude Include="..\..\gui\LoggerDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\FBSurfaceSDL2.hxx">
+    <ClInclude Include="..\..\common\FBSurfaceSDL2.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CompuMate.hxx">
+    <ClInclude Include="..\..\emucore\CompuMate.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\MindLink.hxx">
+    <ClInclude Include="..\..\emucore\MindLink.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartCM.hxx">
+    <ClInclude Include="..\..\emucore\CartCM.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\BoosterWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\BoosterWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\ControllerWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\ControllerWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DrivingWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DrivingWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\GenesisWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\GenesisWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\JoystickWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\JoystickWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\KeyboardWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\KeyboardWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\NullControlWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\NullControlWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\PaddleWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\PaddleWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\StellaKeys.hxx">
+    <ClInclude Include="..\..\common\StellaKeys.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartFA2.hxx">
+    <ClInclude Include="..\..\emucore\CartFA2.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\MouseControl.hxx">
+    <ClInclude Include="..\..\common\MouseControl.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\tv_filters\NTSCFilter.hxx">
+    <ClInclude Include="..\..\common\tv_filters\NTSCFilter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartCTY.hxx">
+    <ClInclude Include="..\..\emucore\CartCTY.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\FSNodeFactory.hxx">
+    <ClInclude Include="..\..\common\FSNodeFactory.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\FSNodeZIP.hxx">
+    <ClInclude Include="..\..\common\FSNodeZIP.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="FSNodeWINDOWS.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\ZipHandler.hxx">
+    <ClInclude Include="..\..\common\ZipHandler.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart2KWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart2KWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart3EWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart3EWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart3FWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart3FWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart4A50Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart4A50Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart4KWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart4KWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart0840Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart0840Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartARWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartARWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCMWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCMWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCTYWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCTYWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCVWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCVWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDebugWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDebugWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDPCPlusWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDPCPlusWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDPCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDPCWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartE0Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartE0Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartEFSCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartEFSCWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartEFWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartEFWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF0Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF0Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF4SCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF4SCWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF4Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF4Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF6SCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF6SCWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF6Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF6Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF8SCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF8SCWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartF8Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartF8Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartFA2Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartFA2Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartFAWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartFAWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartFEWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartFEWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartSBWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartSBWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartUAWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartUAWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartX07Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartX07Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\FileListWidget.hxx">
+    <ClInclude Include="..\..\gui\FileListWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\Variant.hxx">
+    <ClInclude Include="..\..\common\Variant.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RomListSettings.hxx">
+    <ClInclude Include="..\..\debugger\gui\RomListSettings.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\SnapshotDialog.hxx">
+    <ClInclude Include="..\..\gui\SnapshotDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\Base.hxx">
+    <ClInclude Include="..\..\common\Base.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ConsoleMediumFont.hxx">
+    <ClInclude Include="..\..\gui\ConsoleMediumFont.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ConsoleBFont.hxx">
+    <ClInclude Include="..\..\gui\ConsoleBFont.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ConsoleMediumBFont.hxx">
+    <ClInclude Include="..\..\gui\ConsoleMediumBFont.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart4KSC.hxx">
+    <ClInclude Include="..\..\emucore\Cart4KSC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartBF.hxx">
+    <ClInclude Include="..\..\emucore\CartBF.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartBFSC.hxx">
+    <ClInclude Include="..\..\emucore\CartBFSC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartDF.hxx">
+    <ClInclude Include="..\..\emucore\CartDF.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartDFSC.hxx">
+    <ClInclude Include="..\..\emucore\CartDFSC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart4KSCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart4KSCWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartBFSCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartBFSCWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartBFWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartBFWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDFSCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDFSCWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartDFWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartDFWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\EventHandlerSDL2.hxx">
+    <ClInclude Include="..\..\common\EventHandlerSDL2.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\FBSurface.hxx">
+    <ClInclude Include="..\..\emucore\FBSurface.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\TIASurface.hxx">
+    <ClInclude Include="..\..\emucore\TIASurface.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartRamWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartRamWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\AtariVoxWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\AtariVoxWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\SaveKeyWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\SaveKeyWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartMDM.hxx">
+    <ClInclude Include="..\..\emucore\CartMDM.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartMDMWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartMDMWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\Vec.hxx">
+    <ClInclude Include="..\..\common\Vec.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\MediaFactory.hxx">
+    <ClInclude Include="..\..\common\MediaFactory.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartWD.hxx">
+    <ClInclude Include="..\..\emucore\CartWD.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartWDWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartWDWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\JoystickDialog.hxx">
+    <ClInclude Include="..\..\gui\JoystickDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\RiotRamWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\RiotRamWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart3EPlusWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart3EPlusWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart3EPlus.hxx">
+    <ClInclude Include="..\..\emucore\Cart3EPlus.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\Background.hxx">
+    <ClInclude Include="..\..\emucore\tia\Background.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\Ball.hxx">
+    <ClInclude Include="..\..\emucore\tia\Ball.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\DelayQueue.hxx">
+    <ClInclude Include="..\..\emucore\tia\DelayQueue.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\DelayQueueMember.hxx">
+    <ClInclude Include="..\..\emucore\tia\DelayQueueMember.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\DrawCounterDecodes.hxx">
+    <ClInclude Include="..\..\emucore\tia\DrawCounterDecodes.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\LatchedInput.hxx">
+    <ClInclude Include="..\..\emucore\tia\LatchedInput.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\Missile.hxx">
+    <ClInclude Include="..\..\emucore\tia\Missile.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\AnalogReadout.hxx">
+    <ClInclude Include="..\..\emucore\tia\AnalogReadout.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\Player.hxx">
+    <ClInclude Include="..\..\emucore\tia\Player.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\Playfield.hxx">
+    <ClInclude Include="..\..\emucore\tia\Playfield.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\TIA.hxx">
+    <ClInclude Include="..\..\emucore\tia\TIA.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\AmigaMouse.hxx">
+    <ClInclude Include="..\..\emucore\AmigaMouse.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\AtariMouse.hxx">
+    <ClInclude Include="..\..\emucore\AtariMouse.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\TrakBall.hxx">
+    <ClInclude Include="..\..\emucore\TrakBall.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\FrameLayout.hxx">
+    <ClInclude Include="..\..\emucore\tia\FrameLayout.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartBUS.hxx">
+    <ClInclude Include="..\..\emucore\CartBUS.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartCDF.hxx">
+    <ClInclude Include="..\..\emucore\CartCDF.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartBUSWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartBUSWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCDFWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCDFWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DelayQueueWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DelayQueueWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\DelayQueueIterator.hxx">
+    <ClInclude Include="..\..\emucore\tia\DelayQueueIterator.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\DelayQueueIteratorImpl.hxx">
+    <ClInclude Include="..\..\emucore\tia\DelayQueueIteratorImpl.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\tv_filters\AtariNTSC.hxx">
+    <ClInclude Include="..\..\common\tv_filters\AtariNTSC.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartDetector.hxx">
+    <ClInclude Include="..\..\emucore\CartDetector.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ColorWidget.hxx">
+    <ClInclude Include="..\..\gui\ColorWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\PointingDevice.hxx">
+    <ClInclude Include="..\..\emucore\PointingDevice.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\RewindManager.hxx">
+    <ClInclude Include="..\..\common\RewindManager.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\StateManager.hxx">
+    <ClInclude Include="..\..\common\StateManager.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\AmigaMouseWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\AmigaMouseWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\AtariMouseWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\AtariMouseWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\FlashWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\FlashWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\PointingDeviceWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\PointingDeviceWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\TrakBallWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\TrakBallWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\TrapArray.hxx">
+    <ClInclude Include="..\..\debugger\TrapArray.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\LinkedObjectPool.hxx">
+    <ClInclude Include="..\..\common\LinkedObjectPool.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\RadioButtonWidget.hxx">
+    <ClInclude Include="..\..\gui\RadioButtonWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\EventHandlerConstants.hxx">
+    <ClInclude Include="..\..\emucore\EventHandlerConstants.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\FrameBufferConstants.hxx">
+    <ClInclude Include="..\..\emucore\FrameBufferConstants.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\DeveloperDialog.hxx">
+    <ClInclude Include="..\..\gui\DeveloperDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\TimeMachine.hxx">
+    <ClInclude Include="..\..\gui\TimeMachine.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\TimeMachineDialog.hxx">
+    <ClInclude Include="..\..\gui\TimeMachineDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\frame-manager\AbstractFrameManager.hxx">
+    <ClInclude Include="..\..\emucore\tia\frame-manager\AbstractFrameManager.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\frame-manager\FrameLayoutDetector.hxx">
+    <ClInclude Include="..\..\emucore\tia\frame-manager\FrameLayoutDetector.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\frame-manager\FrameManager.hxx">
+    <ClInclude Include="..\..\emucore\tia\frame-manager\FrameManager.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\frame-manager\JitterEmulation.hxx">
+    <ClInclude Include="..\..\emucore\tia\frame-manager\JitterEmulation.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\TIAConstants.hxx">
+    <ClInclude Include="..\..\emucore\tia\TIAConstants.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\TimeLineWidget.hxx">
+    <ClInclude Include="..\..\gui\TimeLineWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\PhysicalJoystick.hxx">
+    <ClInclude Include="..\..\common\PhysicalJoystick.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\PJoystickHandler.hxx">
+    <ClInclude Include="..\..\common\PJoystickHandler.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\PKeyboardHandler.hxx">
+    <ClInclude Include="..\..\common\PKeyboardHandler.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\Audio.hxx">
+    <ClInclude Include="..\..\emucore\tia\Audio.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\tia\AudioChannel.hxx">
+    <ClInclude Include="..\..\emucore\tia\AudioChannel.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\AudioQueue.hxx">
+    <ClInclude Include="..\..\common\AudioQueue.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\EmulationTiming.hxx">
+    <ClInclude Include="..\..\emucore\EmulationTiming.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\audio\Resampler.hxx">
+    <ClInclude Include="..\..\common\audio\Resampler.hxx">
       <Filter>Header Files\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\audio\SimpleResampler.hxx">
+    <ClInclude Include="..\..\common\audio\SimpleResampler.hxx">
       <Filter>Header Files\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\audio\ConvolutionBuffer.hxx">
+    <ClInclude Include="..\..\common\audio\ConvolutionBuffer.hxx">
       <Filter>Header Files\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\audio\LanczosResampler.hxx">
+    <ClInclude Include="..\..\common\audio\LanczosResampler.hxx">
       <Filter>Header Files\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\DispatchResult.hxx">
+    <ClInclude Include="..\..\emucore\DispatchResult.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\EmulationWorker.hxx">
+    <ClInclude Include="..\..\emucore\EmulationWorker.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\AudioSettings.hxx">
+    <ClInclude Include="..\..\common\AudioSettings.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\FpsMeter.hxx">
+    <ClInclude Include="..\..\common\FpsMeter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\audio\HighPass.hxx">
+    <ClInclude Include="..\..\common\audio\HighPass.hxx">
       <Filter>Header Files\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\TimerManager.hxx">
+    <ClInclude Include="..\..\common\TimerManager.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Bankswitch.hxx">
+    <ClInclude Include="..\..\emucore\Bankswitch.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\exception\FatalEmulationError.hxx">
+    <ClInclude Include="..\..\emucore\exception\FatalEmulationError.hxx">
       <Filter>Header Files\emucore\exception</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\ThreadDebugging.hxx">
+    <ClInclude Include="..\..\common\ThreadDebugging.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\exception\EmulationWarning.hxx">
+    <ClInclude Include="..\..\emucore\exception\EmulationWarning.hxx">
       <Filter>Header Files\emucore\exception</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\StaggeredLogger.hxx">
+    <ClInclude Include="..\..\common\StaggeredLogger.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\ControllerDetector.hxx">
+    <ClInclude Include="..\..\emucore\ControllerDetector.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\ProfilingRunner.hxx">
+    <ClInclude Include="..\..\emucore\ProfilingRunner.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartCDFInfoWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartCDFInfoWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\StellaSettingsDialog.hxx">
+    <ClInclude Include="..\..\gui\StellaSettingsDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\ControlLowLevel.hxx">
+    <ClInclude Include="..\..\emucore\ControlLowLevel.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\MinUICommandDialog.hxx">
+    <ClInclude Include="..\..\gui\MinUICommandDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\KeyValueRepository.hxx">
+    <ClInclude Include="..\..\common\repository\KeyValueRepository.hxx">
       <Filter>Header Files\repository</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\KeyValueRepositoryNoop.hxx">
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryNoop.hxx">
       <Filter>Header Files\repository</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\Logger.hxx">
+    <ClInclude Include="..\..\common\Logger.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\Rect.hxx">
+    <ClInclude Include="..\..\common\Rect.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\R77HelpDialog.hxx">
+    <ClInclude Include="..\..\gui\R77HelpDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\KeyMap.hxx">
+    <ClInclude Include="..\..\common\KeyMap.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\JoyMap.hxx">
+    <ClInclude Include="..\..\common\JoyMap.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\BreakpointMap.hxx">
+    <ClInclude Include="..\..\debugger\BreakpointMap.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartFC.hxx">
+    <ClInclude Include="..\..\emucore\CartFC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartFCWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartFCWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\sdl_blitter\BilinearBlitter.hxx">
+    <ClInclude Include="..\..\common\sdl_blitter\BilinearBlitter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\sdl_blitter\Blitter.hxx">
+    <ClInclude Include="..\..\common\sdl_blitter\Blitter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\sdl_blitter\QisBlitter.hxx">
+    <ClInclude Include="..\..\common\sdl_blitter\QisBlitter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\sdl_blitter\BlitterFactory.hxx">
+    <ClInclude Include="..\..\common\sdl_blitter\BlitterFactory.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\PhosphorHandler.hxx">
+    <ClInclude Include="..\..\common\PhosphorHandler.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Lightgun.hxx">
+    <ClInclude Include="..\..\emucore\Lightgun.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\MessageMenu.hxx">
+    <ClInclude Include="..\..\gui\MessageMenu.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\MessageDialog.hxx">
+    <ClInclude Include="..\..\gui\MessageDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\HighScoresManager.hxx">
+    <ClInclude Include="..\..\common\HighScoresManager.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\HighScoresMenu.hxx">
+    <ClInclude Include="..\..\gui\HighScoresMenu.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\HighScoresDialog.hxx">
+    <ClInclude Include="..\..\gui\HighScoresDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Stella12x24tFont.hxx">
+    <ClInclude Include="..\..\gui\Stella12x24tFont.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Stella14x28tFont.hxx">
+    <ClInclude Include="..\..\gui\Stella14x28tFont.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Stella16x32tFont.hxx">
+    <ClInclude Include="..\..\gui\Stella16x32tFont.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartEnhanced.hxx">
+    <ClInclude Include="..\..\emucore\CartEnhanced.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartEnhancedWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartEnhancedWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart3EX.hxx">
+    <ClInclude Include="..\..\emucore\Cart3EX.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\PaletteHandler.hxx">
+    <ClInclude Include="..\..\common\PaletteHandler.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\EmulationDialog.hxx">
+    <ClInclude Include="..\..\gui\EmulationDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\VideoAudioDialog.hxx">
+    <ClInclude Include="..\..\gui\VideoAudioDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartTVBoy.hxx">
+    <ClInclude Include="..\..\emucore\CartTVBoy.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartCreator.hxx">
+    <ClInclude Include="..\..\emucore\CartCreator.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\WhatsNewDialog.hxx">
+    <ClInclude Include="..\..\gui\WhatsNewDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\SerialPort.hxx">
+    <ClInclude Include="..\..\emucore\SerialPort.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\QuadTari.hxx">
+    <ClInclude Include="..\..\emucore\QuadTari.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\QuadTariWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\QuadTariWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\QuadTariDialog.hxx">
+    <ClInclude Include="..\..\gui\QuadTariDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
     <ClInclude Include="Windows.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartTVBoyWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartTVBoyWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\VideoModeHandler.hxx">
+    <ClInclude Include="..\..\common\VideoModeHandler.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\FBBackend.hxx">
+    <ClInclude Include="..\..\emucore\FBBackend.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\UndoHandler.hxx">
+    <ClInclude Include="..\..\gui\UndoHandler.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\ToolTip.hxx">
+    <ClInclude Include="..\..\gui\ToolTip.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\DataGridRamWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\DataGridRamWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\json\json.hxx">
+    <ClInclude Include="..\..\json\json.hxx">
       <Filter>Header Files\json</Filter>
     </ClInclude>
-    <ClInclude Include="..\json\json_lib.hxx">
+    <ClInclude Include="..\..\json\json_lib.hxx">
       <Filter>Header Files\json</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\jsonDefinitions.hxx">
+    <ClInclude Include="..\..\common\jsonDefinitions.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\PlusROM.hxx">
+    <ClInclude Include="..\..\emucore\PlusROM.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\sqlite\KeyValueRepositorySqlite.hxx">
+    <ClInclude Include="..\..\common\repository\sqlite\KeyValueRepositorySqlite.hxx">
       <Filter>Header Files\repository\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\sqlite\SqliteDatabase.hxx">
+    <ClInclude Include="..\..\common\repository\sqlite\SqliteDatabase.hxx">
       <Filter>Header Files\repository\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\sqlite\SqliteError.hxx">
+    <ClInclude Include="..\..\common\repository\sqlite\SqliteError.hxx">
       <Filter>Header Files\repository\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\sqlite\SqliteStatement.hxx">
+    <ClInclude Include="..\..\common\repository\sqlite\SqliteStatement.hxx">
       <Filter>Header Files\repository\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\sqlite\SqliteTransaction.hxx">
+    <ClInclude Include="..\..\common\repository\sqlite\SqliteTransaction.hxx">
       <Filter>Header Files\repository\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\sqlite\sqlite3.h">
+    <ClInclude Include="..\..\sqlite\sqlite3.h">
       <Filter>Header Files\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\sqlite\source\sqlite3.h">
+    <ClInclude Include="..\..\sqlite\source\sqlite3.h">
       <Filter>Header Files\sqlite\source</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\CompositeKeyValueRepository.hxx">
+    <ClInclude Include="..\..\common\repository\CompositeKeyValueRepository.hxx">
       <Filter>Header Files\repository</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\sqlite\AbstractKeyValueRepositorySqlite.hxx">
+    <ClInclude Include="..\..\common\repository\sqlite\AbstractKeyValueRepositorySqlite.hxx">
       <Filter>Header Files\repository\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\sqlite\CompositeKeyValueRepositorySqlite.hxx">
+    <ClInclude Include="..\..\common\repository\sqlite\CompositeKeyValueRepositorySqlite.hxx">
       <Filter>Header Files\repository\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\KeyValueRepositoryPropertyFile.hxx">
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryPropertyFile.hxx">
       <Filter>Header Files\repository</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\CompositeKVRJsonAdapter.hxx">
+    <ClInclude Include="..\..\common\repository\CompositeKVRJsonAdapter.hxx">
       <Filter>Header Files\repository</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\KeyValueRepositoryConfigfile.hxx">
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryConfigfile.hxx">
       <Filter>Header Files\repository</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\KeyValueRepositoryFile.hxx">
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryFile.hxx">
       <Filter>Header Files\repository</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\KeyValueRepositoryJsonFile.hxx">
+    <ClInclude Include="..\..\common\repository\KeyValueRepositoryJsonFile.hxx">
       <Filter>Header Files\repository</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\CompositeKeyValueRepositoryNoop.hxx">
+    <ClInclude Include="..\..\common\repository\CompositeKeyValueRepositoryNoop.hxx">
       <Filter>Header Files\repository</Filter>
     </ClInclude>
-    <ClInclude Include="..\sqlite\sqlite_options.h">
+    <ClInclude Include="..\..\sqlite\sqlite_options.h">
       <Filter>Header Files\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\repository\sqlite\StellaDb.hxx">
+    <ClInclude Include="..\..\common\repository\sqlite\StellaDb.hxx">
       <Filter>Header Files\repository\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\OSystemStandalone.hxx">
+    <ClInclude Include="..\..\emucore\OSystemStandalone.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartMVC.hxx">
+    <ClInclude Include="..\..\emucore\CartMVC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartARM.hxx">
+    <ClInclude Include="..\..\emucore\CartARM.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartARMWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartARMWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\PlusRomsMenu.hxx">
+    <ClInclude Include="..\..\gui\PlusRomsMenu.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\PlusRomsSetupDialog.hxx">
+    <ClInclude Include="..\..\gui\PlusRomsSetupDialog.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartE7Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartE7Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\CartE7.hxx">
+    <ClInclude Include="..\..\emucore\CartE7.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\GlobalKeyHandler.hxx">
+    <ClInclude Include="..\..\emucore\GlobalKeyHandler.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\DevSettingsHandler.hxx">
+    <ClInclude Include="..\..\common\DevSettingsHandler.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\LauncherFileListWidget.hxx">
+    <ClInclude Include="..\..\gui\LauncherFileListWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\FavoritesManager.hxx">
+    <ClInclude Include="..\..\gui\FavoritesManager.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Icon.hxx">
+    <ClInclude Include="..\..\gui\Icon.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\Icons.hxx">
+    <ClInclude Include="..\..\gui\Icons.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\NavigationWidget.hxx">
+    <ClInclude Include="..\..\gui\NavigationWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\httplib\http_lib.hxx">
+    <ClInclude Include="..\..\httplib\http_lib.hxx">
       <Filter>Header Files\httplib</Filter>
     </ClInclude>
-    <ClInclude Include="..\httplib\httplib.h">
+    <ClInclude Include="..\..\httplib\httplib.h">
       <Filter>Header Files\httplib</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\SDL_lib.hxx">
+    <ClInclude Include="..\..\common\SDL_lib.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\ConsoleIO.hxx">
+    <ClInclude Include="..\..\emucore\ConsoleIO.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\ConsoleTiming.hxx">
+    <ClInclude Include="..\..\emucore\ConsoleTiming.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Cart0FA0.hxx">
+    <ClInclude Include="..\..\emucore\Cart0FA0.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Cart0FA0Widget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Cart0FA0Widget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\CartBUSInfoWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\CartBUSInfoWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\Joy2BPlus.hxx">
+    <ClInclude Include="..\..\emucore\Joy2BPlus.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\gui\Joy2BPlusWidget.hxx">
+    <ClInclude Include="..\..\debugger\gui\Joy2BPlusWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\gui\RomImageWidget.hxx">
+    <ClInclude Include="..\..\gui\RomImageWidget.hxx">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\JPGLibrary.hxx">
+    <ClInclude Include="..\..\common\JPGLibrary.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\nanojpeg\nanojpeg_lib.hxx">
+    <ClInclude Include="..\..\nanojpeg\nanojpeg_lib.hxx">
       <Filter>Header Files\nanojpeg</Filter>
     </ClInclude>
-    <ClInclude Include="..\tinyexif\tinyexif_lib.hxx">
+    <ClInclude Include="..\..\tinyexif\tinyexif_lib.hxx">
       <Filter>Header Files\tinyexif</Filter>
     </ClInclude>
   </ItemGroup>
@@ -2407,11 +2407,11 @@
     <None Include="stella.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\emucore\tia\frame-manager\module.mk" />
+    <None Include="..\..\emucore\tia\frame-manager\module.mk" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="stella.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/windows/Windows.hxx b/src/os/windows/Windows.hxx
similarity index 100%
rename from src/windows/Windows.hxx
rename to src/os/windows/Windows.hxx
diff --git a/src/os/windows/module.mk b/src/os/windows/module.mk
new file mode 100644
index 000000000..a4745ed0b
--- /dev/null
+++ b/src/os/windows/module.mk
@@ -0,0 +1,14 @@
+MODULE := src/os/windows
+
+MODULE_OBJS := \
+	src/os/windows/FSNodeWINDOWS.o \
+	src/os/windows/OSystemWINDOWS.o \
+	src/os/windows/SerialPortWINDOWS.o \
+	src/os/windows/SettingsWINDOWS.o \
+	src/os/windows/stella_icon.o
+
+MODULE_DIRS += \
+	src/os/windows
+
+# Include common rules
+include $(srcdir)/common.rules
diff --git a/src/windows/resource.h b/src/os/windows/resource.h
similarity index 100%
rename from src/windows/resource.h
rename to src/os/windows/resource.h
diff --git a/src/windows/stella.ico b/src/os/windows/stella.ico
similarity index 100%
rename from src/windows/stella.ico
rename to src/os/windows/stella.ico
diff --git a/src/windows/stella.iss b/src/os/windows/stella.iss
similarity index 100%
rename from src/windows/stella.iss
rename to src/os/windows/stella.iss
diff --git a/src/windows/stella.rc b/src/os/windows/stella.rc
similarity index 100%
rename from src/windows/stella.rc
rename to src/os/windows/stella.rc
diff --git a/src/unix/module.mk b/src/unix/module.mk
deleted file mode 100644
index b01b04ffc..000000000
--- a/src/unix/module.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-MODULE := src/unix
-
-MODULE_OBJS := \
-	src/unix/FSNodePOSIX.o \
-	src/unix/OSystemUNIX.o \
-	src/unix/SerialPortUNIX.o
-
-MODULE_DIRS += \
-	src/unix
-
-# Include common rules
-include $(srcdir)/common.rules
diff --git a/src/windows/module.mk b/src/windows/module.mk
deleted file mode 100644
index 8d26aa62d..000000000
--- a/src/windows/module.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-MODULE := src/windows
-
-MODULE_OBJS := \
-	src/windows/FSNodeWINDOWS.o \
-	src/windows/OSystemWINDOWS.o \
-	src/windows/SerialPortWINDOWS.o \
-	src/windows/SettingsWINDOWS.o \
-	src/windows/stella_icon.o
-
-MODULE_DIRS += \
-	src/windows
-
-# Include common rules 
-include $(srcdir)/common.rules