diff --git a/BizHawk.MultiClient/BinarySaveStates.cs b/BizHawk.Client.Common/BinarySaveStates.cs
similarity index 94%
rename from BizHawk.MultiClient/BinarySaveStates.cs
rename to BizHawk.Client.Common/BinarySaveStates.cs
index e27931bd2b..dea072e45b 100644
--- a/BizHawk.MultiClient/BinarySaveStates.cs
+++ b/BizHawk.Client.Common/BinarySaveStates.cs
@@ -5,7 +5,7 @@ using System.Text;
 using ICSharpCode.SharpZipLib.Zip;
 using System.IO;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public class BinaryStateFileNames
 	{
diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 9f6fc92af9..3abae6b8f2 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -82,6 +82,7 @@
     <Compile Include="7z\SevenZipExtractorAsynchronous.cs" />
     <Compile Include="7z\SevenZipSfx.cs" />
     <Compile Include="7z\StreamWrappers.cs" />
+    <Compile Include="BinarySaveStates.cs" />
     <Compile Include="config\Binding.cs" />
     <Compile Include="config\Config.cs" />
     <Compile Include="config\ConfigService.cs" />
@@ -105,6 +106,7 @@
     <Compile Include="RecentFiles.cs" />
     <Compile Include="helpers\StringHelpers.cs" />
     <Compile Include="RomGame.cs" />
+    <Compile Include="SavestateManager.cs" />
     <Compile Include="tools\Cheat.cs" />
     <Compile Include="tools\CheatList.cs" />
     <Compile Include="tools\RamSearchEngine.cs" />
diff --git a/BizHawk.Client.Common/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs
index 9d67771b19..8e282c8b08 100644
--- a/BizHawk.Client.Common/SavestateManager.cs
+++ b/BizHawk.Client.Common/SavestateManager.cs
@@ -2,7 +2,7 @@
 
 namespace BizHawk.Client.Common
 {
-	class SavestateManager
+	public class SavestateManager
 	{
 		private readonly bool[] slots = new bool[10];
 		private readonly bool[] redo = new bool[10];
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index d805c5fccb..4a9978793f 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -152,7 +152,6 @@
       <DependentUpon>VideoWriterChooserForm.cs</DependentUpon>
     </Compile>
     <Compile Include="AVOut\WavWriter.cs" />
-    <Compile Include="BinarySaveStates.cs" />
     <Compile Include="BizBox.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -974,7 +973,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <Compile Include="Properties\svnrev.cs" />
-    <Compile Include="SavestateManager.cs" />
     <Compile Include="Throttle.cs" />
     <Compile Include="tools\InputPrompt.cs">
       <SubType>Form</SubType>