diff --git a/Icon.ico b/Icon.ico
deleted file mode 100644
index 5d06b9f..0000000
Binary files a/Icon.ico and /dev/null differ
diff --git a/msvc/wallet.rc b/msvc/wallet.rc
index 6b72f9f..9e1a334 100644
--- a/msvc/wallet.rc
+++ b/msvc/wallet.rc
@@ -2,7 +2,7 @@
 //	The visual studio resource editor will screw it up.
 #pragma code_page(65001) // UTF-8
 // this icon is used with wxFrame::SetIcon()
-AAArho ICON "rho.ico"
+AAArho ICON "../docs/rho.ico"
 
 // set this to 1 if you don't want to use manifest resource (manifest resource
 // is needed to enable visual styles on Windows XP - see docs/msw/winxp.txt
diff --git a/msvc/wallet.vcxproj b/msvc/wallet.vcxproj
index c8e4738..49c8256 100644
--- a/msvc/wallet.vcxproj
+++ b/msvc/wallet.vcxproj
@@ -43,15 +43,19 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>GSL\include;wxWidgets\include\msvc;wxWidgets\include;libsodium\src\libsodium\include;mpir;$(IncludePath)</IncludePath>
-    <LibraryPath>wxWidgets\lib\vc_x64_lib\;libsodium\Build\Debug\X64;mpir\lib\x64\Debug;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)wxWidgets\include\msvc;$(SolutionDir)wxWidgets\include;$(SolutionDir)libsodium\src\libsodium\include;$(SolutionDir)mpir;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)wxWidgets\lib\vc_x64_lib\;$(SolutionDir)libsodium\Build\Debug\X64;$(SolutionDir)mpir\lib\x64\Debug;$(LibraryPath)</LibraryPath>
     <CustomBuildAfterTargets />
+    <IntDir>$(SolutionDir)build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>GSL\include;wxWidgets\include\msvc;wxWidgets\include;libsodium\src\libsodium\include;mpir;$(IncludePath)</IncludePath>
-    <LibraryPath>wxWidgets\lib\vc_x64_lib\;libsodium\Build\Release\X64;mpir\lib\x64\Release;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)wxWidgets\include\msvc;$(SolutionDir)wxWidgets\include;$(SolutionDir)libsodium\src\libsodium\include;$(SolutionDir)mpir;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)wxWidgets\lib\vc_x64_lib\;$(SolutionDir)libsodium\Build\Release\X64;$(SolutionDir)mpir\lib\x64\Release;$(LibraryPath)</LibraryPath>
     <CustomBuildAfterTargets />
+    <IntDir>$(SolutionDir)build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -119,60 +123,59 @@
     <CustomBuildStep />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="app.h" />
-    <ClInclude Include="db_accessors.h" />
-    <ClInclude Include="display_wallet.h" />
-    <ClInclude Include="frame.h" />
-    <ClInclude Include="introspection_of_standard_C_types.h" />
-    <ClInclude Include="mpir_and_base58.h" />
-    <ClInclude Include="ILog.h" />
-    <ClInclude Include="ISqlite3.h" />
-    <ClInclude Include="localization.h" />
-    <ClInclude Include="ristretto255.h" />
-    <ClInclude Include="rotime.h" />
-    <ClInclude Include="secrets.h" />
-    <ClInclude Include="slash6.h" />
-    <ClInclude Include="sqlite3/sqlite3.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="welcome_to_rhocoin.h" />
+    <ClInclude Include="../src/app.h" />
+    <ClInclude Include="../src/db_accessors.h" />
+    <ClInclude Include="../src/display_wallet.h" />
+    <ClInclude Include="../src/frame.h" />
+    <ClInclude Include="../src/introspection_of_standard_C_types.h" />
+    <ClInclude Include="../src/mpir_and_base58.h" />
+    <ClInclude Include="../src/ILog.h" />
+    <ClInclude Include="../src/ISqlite3.h" />
+    <ClInclude Include="../src/localization.h" />
+    <ClInclude Include="../src/ristretto255.h" />
+    <ClInclude Include="../src/rotime.h" />
+    <ClInclude Include="../src/secrets.h" />
+    <ClInclude Include="../src/slash6.h" />
+    <ClInclude Include="../src/stdafx.h" />
+    <ClInclude Include="../src/welcome_to_rhocoin.h" />
+    <ClInclude Include="..\src\sqlite3.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="app.cpp" />
-    <ClCompile Include="display_wallet.cpp" />
-    <ClCompile Include="frame.cpp" />
-    <ClCompile Include="ILog.cpp" />
-    <ClCompile Include="ISqlit3Impl.cpp">
+    <ClCompile Include="../src/app.cpp" />
+    <ClCompile Include="../src/display_wallet.cpp" />
+    <ClCompile Include="../src/frame.cpp" />
+    <ClCompile Include="../src/ILog.cpp" />
+    <ClCompile Include="../src/ISqlit3Impl.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="localization.cpp">
+    <ClCompile Include="../src/localization.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="mpir_and_base58.cpp" />
-    <ClCompile Include="ristretto255.cpp" />
-    <ClCompile Include="rotime.cpp" />
-    <ClCompile Include="secrets.cpp" />
-    <ClCompile Include="slash6.cpp">
+    <ClCompile Include="../src/mpir_and_base58.cpp" />
+    <ClCompile Include="../src/ristretto255.cpp" />
+    <ClCompile Include="../src/rotime.cpp" />
+    <ClCompile Include="../src/secrets.cpp" />
+    <ClCompile Include="../src/slash6.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="sqlite3/sqlite3.c">
+    <ClCompile Include="$(SolutionDir)sqlite3\sqlite3.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="../src/stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="testbed.cpp" />
-    <ClCompile Include="unit_test.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/utf-8 %(AdditionalOptions)</AdditionalOptions>
+    <ClCompile Include="../src/testbed.cpp" />
+    <ClCompile Include="../src/unit_test.cpp">
     </ClCompile>
-    <ClCompile Include="welcome_to_rhocoin.cpp" />
+    <ClCompile Include="../src/welcome_to_rhocoin.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="rho.ico" />
+    <Image Include="../docs/rho.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="wallet.rc" />
diff --git a/msvc/winConfig.bat b/msvc/winConfig.bat
index 2c905e2..fb3fff9 100644
--- a/msvc/winConfig.bat
+++ b/msvc/winConfig.bat
@@ -94,28 +94,28 @@ IF %ERRORLEVEL% NEQ 0 (
 
 echo on
 cd ..\..\..
-msbuild wallet.vcxproj -p:Configuration=Debug;Platform=x64 -m
+msbuild wallet.sln -p:Configuration=Debug;Platform=x64 -m
 echo off
 IF %ERRORLEVEL% NEQ 0 (
 	PAUSE
 	GOTO:EOF
 )
 echo on
-msbuild wallet.vcxproj -p:Configuration=Release;Platform=x64 -m
+msbuild wallet.sln -p:Configuration=Release;Platform=x64 -m
 echo off
 IF %ERRORLEVEL% NEQ 0 (
 	PAUSE
 	GOTO:EOF
 )
 echo on
-.\x64\Debug\wallet.exe --complete --test
+.\build\Debug\wallet.exe --complete --test
 echo off
 IF %ERRORLEVEL% NEQ 0 (
 	echo failed unit test on debug build
 ) ELSE (
 	echo passed unit test on debug build)
 echo on
-.\x64\Release\wallet.exe --complete --test
+.\build\Release\wallet.exe --complete --test
 echo off
 IF %ERRORLEVEL% NEQ 0 (
 	echo failed unit test on release build
diff --git a/src/ISqlit3Impl.cpp b/src/ISqlit3Impl.cpp
index 75716eb..cebd543 100644
--- a/src/ISqlit3Impl.cpp
+++ b/src/ISqlit3Impl.cpp
@@ -14,7 +14,7 @@
 #include <memory>       // for shared_ptr, unique_ptr
 #include <span>
 #include "ISqlite3.h"
-#include "sqlite3/sqlite3.h"
+#include "sqlite3.h"
 
 static auto error_message(int rc, sqlite3* pdb) {
 	return std::string("Sqlite3 Error: ") + sqlite3_errmsg(pdb) + ". Sqlite3 error number=" + std::to_string(rc);
diff --git a/sqlite3/sqlite3.h b/src/sqlite3.h
similarity index 100%
rename from sqlite3/sqlite3.h
rename to src/sqlite3.h
diff --git a/wallet.sln b/wallet.sln
index 268ac46..45b6602 100644
--- a/wallet.sln
+++ b/wallet.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wallet", "wallet.vcxproj", "{B1EC18D5-FA70-4A59-8CAE-EDC65A358314}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wallet", "msvc/wallet.vcxproj", "{B1EC18D5-FA70-4A59-8CAE-EDC65A358314}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2F7D488C-DC53-4ECE-87E2-4FEA32C153EF}"
 EndProject