diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 5739526043..ed9008771c 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -60,7 +60,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\VersionInfo.cs">
+    <Compile Include="..\Version\svnrev.cs">
+      <Link>svnrev.cs</Link>
+    </Compile>
+    <Compile Include="..\Version\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
     <Compile Include="7z\ArchiveEmulationStreamProxy.cs" />
@@ -182,7 +185,6 @@
     <Compile Include="NESGameGenieEncoderDecoder.cs" />
     <Compile Include="PathManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\svnrev.cs" />
     <Compile Include="RecentFiles.cs" />
     <Compile Include="rewind\Rewinder.cs" />
     <Compile Include="rewind\RewindThreader.cs" />
@@ -228,10 +230,10 @@
       <Name>BizHawk.Bizware.BizwareGL</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BizHawk.Client.Common/Properties/AssemblyInfo.cs b/BizHawk.Client.Common/Properties/AssemblyInfo.cs
index c09b5e7cf0..fd4306b2af 100644
--- a/BizHawk.Client.Common/Properties/AssemblyInfo.cs
+++ b/BizHawk.Client.Common/Properties/AssemblyInfo.cs
@@ -10,7 +10,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BizHawk")]
 [assembly: AssemblyProduct("BizHawk.Client.Common")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/BizHawk.Client.DBMan/Properties/AssemblyInfo.cs b/BizHawk.Client.DBMan/Properties/AssemblyInfo.cs
index 38798300a9..be679ef382 100644
--- a/BizHawk.Client.DBMan/Properties/AssemblyInfo.cs
+++ b/BizHawk.Client.DBMan/Properties/AssemblyInfo.cs
@@ -10,7 +10,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BizHawk.Client.DBMan")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
index 1bc008f9f0..ccd3e21065 100644
--- a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
+++ b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
@@ -74,7 +74,10 @@
   </Target>
   -->
   <ItemGroup>
-    <Compile Include="..\VersionInfo.cs">
+    <Compile Include="..\Version\svnrev.cs">
+      <Link>svnrev.cs</Link>
+    </Compile>
+    <Compile Include="..\Version\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
     <Compile Include="About.cs">
@@ -104,7 +107,6 @@
       <DependentUpon>ProgressDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\svnrev.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -166,4 +168,7 @@
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)subwcrev.sh" "$(ProjectDir)"</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent />
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs
index a8d6a29df3..d5b3433be2 100644
--- a/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs
+++ b/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs
@@ -10,7 +10,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BizHawk")]
 [assembly: AssemblyProduct("BizHawk.Client.DiscoHawk")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/BizHawk.Client.DiscoHawk/Properties/svnrev_template b/BizHawk.Client.DiscoHawk/Properties/svnrev_template
deleted file mode 100644
index 31c5a95c9c..0000000000
--- a/BizHawk.Client.DiscoHawk/Properties/svnrev_template
+++ /dev/null
@@ -1,4 +0,0 @@
-static class SubWCRev
-{
-	public const string SVN_REV = "$WCREV$";
-}
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index cb28d204b5..1173f8f8c4 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -111,7 +111,10 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\VersionInfo.cs">
+    <Compile Include="..\Version\svnrev.cs">
+      <Link>svnrev.cs</Link>
+    </Compile>
+    <Compile Include="..\Version\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
     <Compile Include="AboutBox.cs">
@@ -1389,16 +1392,6 @@
     <EmbeddedResource Include="tools\Watch\WatchEditor.resx">
       <DependentUpon>WatchEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="Properties\svnrev.cs" />
     <Compile Include="tools\InputPrompt.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1889,4 +1882,7 @@
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)subwcrev.sh" "$(ProjectDir)"</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent />
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs
index 2ada0c1b1e..29a2b0178f 100644
--- a/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs
+++ b/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs
@@ -10,7 +10,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BizHawk")]
 [assembly: AssemblyProduct("BizHawk.Client.EmuHawk")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/BizHawk.Client.EmuHawk/Properties/svnrev_template b/BizHawk.Client.EmuHawk/Properties/svnrev_template
deleted file mode 100644
index 31c5a95c9c..0000000000
--- a/BizHawk.Client.EmuHawk/Properties/svnrev_template
+++ /dev/null
@@ -1,4 +0,0 @@
-static class SubWCRev
-{
-	public const string SVN_REV = "$WCREV$";
-}
diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj
index 782af816cd..58654dd1fa 100644
--- a/BizHawk.Common/BizHawk.Common.csproj
+++ b/BizHawk.Common/BizHawk.Common.csproj
@@ -44,7 +44,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\VersionInfo.cs">
+    <Compile Include="..\Version\svnrev.cs">
+      <Link>svnrev.cs</Link>
+    </Compile>
+    <Compile Include="..\Version\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
     <Compile Include="Bit.cs" />
@@ -65,7 +68,6 @@
     <Compile Include="Log.cs" />
     <Compile Include="MruStack.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\svnrev.cs" />
     <Compile Include="QuickCollections.cs" />
     <Compile Include="Serializer.cs" />
     <Compile Include="SettingsUtil.cs" />
@@ -77,7 +79,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BizHawk.Common/Properties/AssemblyInfo.cs b/BizHawk.Common/Properties/AssemblyInfo.cs
index 50892a59fb..6d25e1fa67 100644
--- a/BizHawk.Common/Properties/AssemblyInfo.cs
+++ b/BizHawk.Common/Properties/AssemblyInfo.cs
@@ -9,7 +9,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BizHawk")]
 [assembly: AssemblyProduct("BizHawk.Common")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/BizHawk.Common/Properties/svnrev_template b/BizHawk.Common/Properties/svnrev_template
deleted file mode 100644
index 31c5a95c9c..0000000000
--- a/BizHawk.Common/Properties/svnrev_template
+++ /dev/null
@@ -1,4 +0,0 @@
-static class SubWCRev
-{
-	public const string SVN_REV = "$WCREV$";
-}
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index ed9fe38f0a..8348590576 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -46,7 +46,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\VersionInfo.cs">
+    <Compile Include="..\Version\svnrev.cs">
+      <Link>svnrev.cs</Link>
+    </Compile>
+    <Compile Include="..\Version\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
     <Compile Include="Base Implementations\BasicServiceProvider.cs" />
@@ -85,7 +88,6 @@
     <Compile Include="Interfaces\IVideoProvider.cs" />
     <Compile Include="MemoryDomain.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\svnrev.cs" />
     <Compile Include="Sound\HuC6280PSG.cs" />
     <Compile Include="Sound\MMC5Audio.cs" />
     <Compile Include="Sound\SN76489.cs" />
@@ -111,7 +113,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs b/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs
index 72f8553254..b386dd14f1 100644
--- a/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs
+++ b/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs
@@ -10,7 +10,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BizHawk")]
 [assembly: AssemblyProduct("BizHawk.Emulation.Common")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/BizHawk.Emulation.Common/Properties/svnrev_template b/BizHawk.Emulation.Common/Properties/svnrev_template
deleted file mode 100644
index 31c5a95c9c..0000000000
--- a/BizHawk.Emulation.Common/Properties/svnrev_template
+++ /dev/null
@@ -1,4 +0,0 @@
-static class SubWCRev
-{
-	public const string SVN_REV = "$WCREV$";
-}
diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index d3072de511..f706f0fb94 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -86,7 +86,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\VersionInfo.cs">
+    <Compile Include="..\Version\svnrev.cs">
+      <Link>svnrev.cs</Link>
+    </Compile>
+    <Compile Include="..\Version\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
     <Compile Include="Calculator\TI83.IInputPollable.cs">
@@ -246,16 +249,16 @@
       <DependentUpon>ColecoVision.cs</DependentUpon>
     </Compile>
     <Compile Include="Consoles\Coleco\ColecoVision.IInputPollable.cs">
-        <DependentUpon>ColecoVision.cs</DependentUpon>
+      <DependentUpon>ColecoVision.cs</DependentUpon>
     </Compile>
     <Compile Include="Consoles\Coleco\ColecoVision.IMemoryDomains.cs">
-        <DependentUpon>ColecoVision.cs</DependentUpon>
+      <DependentUpon>ColecoVision.cs</DependentUpon>
     </Compile>
     <Compile Include="Consoles\Coleco\ColecoVision.ISettable.cs">
-        <DependentUpon>ColecoVision.cs</DependentUpon>
+      <DependentUpon>ColecoVision.cs</DependentUpon>
     </Compile>
     <Compile Include="Consoles\Coleco\ColecoVision.IStatable.cs">
-        <DependentUpon>ColecoVision.cs</DependentUpon>
+      <DependentUpon>ColecoVision.cs</DependentUpon>
     </Compile>
     <Compile Include="Consoles\Coleco\Input.cs" />
     <Compile Include="Consoles\Coleco\MemoryMap.cs" />
@@ -576,7 +579,6 @@
     <Compile Include="FileID.cs" />
     <Compile Include="LibRetro.cs" />
     <Compile Include="LibRetroEmulator.cs" />
-    <Compile Include="Properties\svnrev.cs" />
     <Compile Include="Consoles\PC Engine\Input.cs" />
     <Compile Include="Consoles\PC Engine\MemoryMap.cs" />
     <Compile Include="Consoles\PC Engine\MemoryMap.SF2.cs" />
@@ -655,6 +657,9 @@
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)subwcrev.sh" "$(ProjectDir)"</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent />
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs b/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs
index a4cf329188..182639cd76 100644
--- a/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs
+++ b/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs
@@ -10,7 +10,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BizHawk")]
 [assembly: AssemblyProduct("BizHawk.Emulation")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/BizHawk.Emulation.Cores/Properties/svnrev_template b/BizHawk.Emulation.Cores/Properties/svnrev_template
deleted file mode 100644
index 31c5a95c9c..0000000000
--- a/BizHawk.Emulation.Cores/Properties/svnrev_template
+++ /dev/null
@@ -1,4 +0,0 @@
-static class SubWCRev
-{
-	public const string SVN_REV = "$WCREV$";
-}
diff --git a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
index a4468c1687..09e18da3b0 100644
--- a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
+++ b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
@@ -42,7 +42,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\VersionInfo.cs">
+    <Compile Include="..\Version\svnrev.cs">
+      <Link>svnrev.cs</Link>
+    </Compile>
+    <Compile Include="..\Version\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
     <Compile Include="Blobs\Blob_ECM.cs" />
@@ -70,7 +73,6 @@
     <Compile Include="ECM.cs" />
     <Compile Include="GPL_ECM.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\svnrev.cs" />
     <Compile Include="SectorInterfaces.cs" />
     <Compile Include="Subcode.cs" />
     <Compile Include="TOC\DiscStructure.cs" />
@@ -93,7 +95,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs b/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs
index e734b57d3d..acde16fa20 100644
--- a/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs
+++ b/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs
@@ -10,7 +10,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BizHawk")]
 [assembly: AssemblyProduct("BizHawk.Emulation.DiscSystem")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/BizHawk.Emulation.DiscSystem/Properties/svnrev_template b/BizHawk.Emulation.DiscSystem/Properties/svnrev_template
deleted file mode 100644
index 31c5a95c9c..0000000000
--- a/BizHawk.Emulation.DiscSystem/Properties/svnrev_template
+++ /dev/null
@@ -1,4 +0,0 @@
-static class SubWCRev
-{
-	public const string SVN_REV = "$WCREV$";
-}
diff --git a/BizHawk.sln b/BizHawk.sln
index fce579a125..7c2da96ce4 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -2,22 +2,43 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Common", "BizHawk.Common\BizHawk.Common.csproj", "{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.EmuHawk", "BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.DiscoHawk", "BizHawk.Client.DiscoHawk\BizHawk.Client.DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.DiscSystem", "BizHawk.Emulation.DiscSystem\BizHawk.Emulation.DiscSystem.csproj", "{F51946EA-827F-4D82-B841-1F2F6D060312}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.Common", "BizHawk.Emulation.Common\BizHawk.Emulation.Common.csproj", "{E1A23168-B571-411C-B360-2229E7225E0E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{B51F1139-3D2C-41BE-A762-EF1F9B41EACA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Emulation", "Emulation", "{3627C08B-3E43-4224-9DA4-40BD69495FBC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.Cores", "BizHawk.Emulation.Cores\BizHawk.Emulation.Cores.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bizware", "Bizware", "{0540A9A6-977E-466D-8BD3-1D8590BD5282}"
 EndProject
@@ -31,6 +52,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.BizwareGL.G
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.BizwareGL.SlimDX", "Bizware\BizHawk.Bizware.BizwareGL.SlimDX\BizHawk.Bizware.BizwareGL.SlimDX.csproj", "{E6B436B1-A3CD-4C9A-8F76-5D7154726884}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version", "Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -187,6 +210,18 @@ Global
 		{E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|Win32.ActiveCfg = Release|Any CPU
 		{E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|x86.ActiveCfg = Release|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|Win32.ActiveCfg = Release|Any CPU
+		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/SubWCRev.bat b/Version/SubWCRev.bat
similarity index 81%
rename from SubWCRev.bat
rename to Version/SubWCRev.bat
index 8ec04b2e6f..2f73a213ca 100755
--- a/SubWCRev.bat
+++ b/Version/SubWCRev.bat
@@ -1,14 +1,14 @@
 @echo off
 
 set TEMPFILE="%TEMP%\BIZBUILD-SVN-%RANDOM%-%RANDOM%-%RANDOM%-%RANDOM%"
-set SVNREV="%~1properties\svnrev.cs"
+set SVNREV="%~1svnrev.cs"
 
 rem try generating svnrev from svn now. this will fail if svn is nonexistent, so...
-"%~1..\SubWCRev.exe" "%~1\.." "%~1properties\svnrev_template" %TEMPFILE% > nul
+"%~1SubWCRev.exe" "%~1" "%~1svnrev_template" %TEMPFILE% > nul
 
 rem generate a svnrev with sed using no revision number, in case svn isnt available
 if not exist %TEMPFILE% (
-    "%~1..\sed.exe" s/\$WCREV\$/0/ < "%~1properties\svnrev_template" > %TEMPFILE%
+    "%~1sed.exe" s/\$WCREV\$/0/ < "%~1svnrev_template" > %TEMPFILE%
 )
 
 rem ... ignore the error
diff --git a/SubWCRev.exe b/Version/SubWCRev.exe
similarity index 100%
rename from SubWCRev.exe
rename to Version/SubWCRev.exe
diff --git a/VersionInfo.cs b/Version/VersionInfo.cs
similarity index 100%
rename from VersionInfo.cs
rename to Version/VersionInfo.cs
diff --git a/intl3_tsvn32.dll b/Version/intl3_tsvn32.dll
similarity index 100%
rename from intl3_tsvn32.dll
rename to Version/intl3_tsvn32.dll
diff --git a/libapr_tsvn32.dll b/Version/libapr_tsvn32.dll
similarity index 100%
rename from libapr_tsvn32.dll
rename to Version/libapr_tsvn32.dll
diff --git a/libaprutil_tsvn32.dll b/Version/libaprutil_tsvn32.dll
similarity index 100%
rename from libaprutil_tsvn32.dll
rename to Version/libaprutil_tsvn32.dll
diff --git a/libsasl32.dll b/Version/libsasl32.dll
similarity index 100%
rename from libsasl32.dll
rename to Version/libsasl32.dll
diff --git a/libsvn_tsvn32.dll b/Version/libsvn_tsvn32.dll
similarity index 100%
rename from libsvn_tsvn32.dll
rename to Version/libsvn_tsvn32.dll
diff --git a/sed.exe b/Version/sed.exe
similarity index 100%
rename from sed.exe
rename to Version/sed.exe
diff --git a/BizHawk.Client.Common/Properties/svnrev_template b/Version/svnrev_template
similarity index 100%
rename from BizHawk.Client.Common/Properties/svnrev_template
rename to Version/svnrev_template
diff --git a/Version/version.csproj b/Version/version.csproj
new file mode 100644
index 0000000000..7457acee12
--- /dev/null
+++ b/Version/version.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Version</RootNamespace>
+    <AssemblyName>Version</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(ProjectDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file