diff --git a/BizHawk.MultiClient/BinarySaveStates.cs b/BizHawk.Client.Common/BinarySaveStates.cs
similarity index 100%
rename from BizHawk.MultiClient/BinarySaveStates.cs
rename to BizHawk.Client.Common/BinarySaveStates.cs
diff --git a/BizHawk.MultiClient/Input/ControllerBinding.cs b/BizHawk.Client.Common/ControllerBinding.cs
similarity index 100%
rename from BizHawk.MultiClient/Input/ControllerBinding.cs
rename to BizHawk.Client.Common/ControllerBinding.cs
diff --git a/BizHawk.MultiClient/config/PathManager.cs b/BizHawk.Client.Common/PathManager.cs
similarity index 100%
rename from BizHawk.MultiClient/config/PathManager.cs
rename to BizHawk.Client.Common/PathManager.cs
diff --git a/BizHawk.MultiClient/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs
similarity index 100%
rename from BizHawk.MultiClient/SavestateManager.cs
rename to BizHawk.Client.Common/SavestateManager.cs
diff --git a/BizHawk.MultiClient/XmlGame.cs b/BizHawk.Client.Common/XmlGame.cs
similarity index 100%
rename from BizHawk.MultiClient/XmlGame.cs
rename to BizHawk.Client.Common/XmlGame.cs
diff --git a/BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs b/BizHawk.Client.Common/tools/RamSearchEngine.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs
rename to BizHawk.Client.Common/tools/RamSearchEngine.cs
diff --git a/BizHawk.MultiClient/tools/Watch/WatchList.cs b/BizHawk.Client.Common/tools/WatchList.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/WatchList.cs
rename to BizHawk.Client.Common/tools/WatchList.cs
diff --git a/BizHawk.MultiClient/MruStack.cs b/BizHawk.Common/MruStack.cs
similarity index 100%
rename from BizHawk.MultiClient/MruStack.cs
rename to BizHawk.Common/MruStack.cs
diff --git a/BizHawk.MultiClient/tools/Watch/WatchHistory.cs b/BizHawk.Common/UndoHistory.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/WatchHistory.cs
rename to BizHawk.Common/UndoHistory.cs
diff --git a/BizHawk.MultiClient/tools/NES/MovieConvert.cs b/BizHawk.MultiClient/tools/NES/MovieConvert.cs
deleted file mode 100644
index cda25a13df..0000000000
--- a/BizHawk.MultiClient/tools/NES/MovieConvert.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace BizHawk.MultiClient.movie
-{
-    public static class MovieConvert
-    {
-        public static void ConvertFCM(string path)
-        {
-
-        }
-
-        public static void ConvertMMV(string path)
-        {
-
-        }
-
-        public static void ConvertMCM(string path)
-        {
-
-        }
-
-        public static void ConvertSMV(string path)
-        {
-
-        }
-
-        public static void ConvertGMV(string path)
-        {
-
-        }
-
-        public static void ConvertVBM(string path)
-        {
-
-        }
-    }
-}