diff --git a/build.bat b/build.bat
index 86cca4e..e7892d4 100644
--- a/build.bat
+++ b/build.bat
@@ -1 +1 @@
-rc.exe resource.rc && cl.exe /arch:IA32 /O2 /GS- xp_activate32.cc xp_activate32.h resource.res /link /fixed /entry:entry /subsystem:windows,5.1 kernel32.lib user32.lib msvcrt.lib ole32.lib oleaut32.lib comctl32.lib
+rc.exe .\src\resource.rc && cl.exe /arch:IA32 /O2 /GS- .\src\xp_activate32.cc .\src\xp_activate32.h resource.res /link /fixed /entry:entry /subsystem:windows,5.1 kernel32.lib user32.lib msvcrt.lib ole32.lib oleaut32.lib comctl32.lib
diff --git a/msvcrt.lib b/src/msvcrt.lib
similarity index 100%
rename from msvcrt.lib
rename to src/msvcrt.lib
diff --git a/resource.h b/src/resource.h
similarity index 100%
rename from resource.h
rename to src/resource.h
diff --git a/resource.rc b/src/resource.rc
similarity index 100%
rename from resource.rc
rename to src/resource.rc
diff --git a/xp_activate32.cc b/src/xp_activate32.cc
similarity index 100%
rename from xp_activate32.cc
rename to src/xp_activate32.cc
diff --git a/xp_activate32.h b/src/xp_activate32.h
similarity index 100%
rename from xp_activate32.h
rename to src/xp_activate32.h
diff --git a/xp_activate32.ico b/src/xp_activate32.ico
similarity index 100%
rename from xp_activate32.ico
rename to src/xp_activate32.ico
diff --git a/xp_activate32.manifest b/src/xp_activate32.manifest
similarity index 100%
rename from xp_activate32.manifest
rename to src/xp_activate32.manifest
diff --git a/xp_activate32.vcxproj b/xp_activate32.vcxproj
index 5aae423..bfd95f2 100644
--- a/xp_activate32.vcxproj
+++ b/xp_activate32.vcxproj
@@ -74,12 +74,14 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
@@ -90,12 +92,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -106,11 +110,14 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32;WIN64;_WIN64;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
+      <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>commctrl.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
@@ -121,11 +128,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32;WIN64;_WIN64;NDEBUG;_NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
+      <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -133,17 +143,17 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Image Include="xp_activate32.ico" />
+    <Image Include="src/xp_activate32.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="xp_activate32.cc" />
+    <ClCompile Include="src/xp_activate32.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="xp_activate32.h" />
+    <ClInclude Include="src/resource.h" />
+    <ClInclude Include="src/xp_activate32.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
+    <ResourceCompile Include="src/resource.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/xp_activate32.vcxproj.filters b/xp_activate32.vcxproj.filters
index 6792f16..51f26d3 100644
--- a/xp_activate32.vcxproj.filters
+++ b/xp_activate32.vcxproj.filters
@@ -15,25 +15,25 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Image Include="xp_activate32.ico">
+    <Image Include="src/xp_activate32.ico">
       <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="xp_activate32.cc">
+    <ClCompile Include="src/xp_activate32.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src/resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="xp_activate32.h">
+    <ClInclude Include="src/xp_activate32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc">
+    <ResourceCompile Include="src/resource.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>