diff --git a/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj b/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj
deleted file mode 100644
index 0ff914c21d..0000000000
--- a/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj
+++ /dev/null
@@ -1,608 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}
- Library
- Properties
- BizHawk.Emulation
- BizHawk.Emulation
- v4.5
- 512
-
-
- 3.5
-
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- false
- true
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- x86
- true
- false
- AllRules.ruleset
- false
-
-
- pdbonly
- true
- bin\Release\
- TRACE;VS2012
- prompt
- 4
- x86
- true
- AllRules.ruleset
- false
- false
-
-
-
- False
- ..\BizHawk.MultiClient\output\dll\EMU7800.dll
-
-
-
- 3.5
-
-
-
-
- 3.5
-
-
- 3.5
-
-
-
-
-
-
- VersionInfo.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
-
-
-
-
-
-
-
- Code
-
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
-
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
-
-
-
-
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
- Code
-
-
-
- Code
-
-
- Code
-
-
-
- Code
-
-
- Code
-
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
- .NET Framework 3.5 SP1 Client Profile
- false
-
-
- False
- .NET Framework 3.5 SP1
- true
-
-
- False
- Windows Installer 3.1
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- "$(SolutionDir)subwcrev.bat" "$(ProjectDir)"
- "$(SolutionDir)subwcrev.sh" "$(ProjectDir)"
-
-
-
\ No newline at end of file
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index f732204473..ab7f10487e 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -239,6 +239,21 @@
SoundConfig.cs
+
+
+
+
+
+
+ QuickProgressPopup.cs
+
+
+
+
+
+
+
+
@@ -757,6 +772,12 @@
RewindConfig.cs
+
+ InputConfigBase.cs
+
+
+ QuickProgressPopup.cs
+
MainForm.cs
Designer
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
deleted file mode 100644
index b57467b34a..0000000000
--- a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
+++ /dev/null
@@ -1,1223 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {DD448B37-BA3F-4544-9754-5406E8094723}
- WinExe
- Properties
- BizHawk.MultiClient
- BizHawk.MultiClient
- v4.5
- 512
-
-
- false
- images\logo.ico
-
-
- 3.5
-
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- true
-
- WINDOWS
-
-
- true
- full
- false
- output\
- $(DefineConstants);DEBUG
- prompt
- 4
- x86
- false
- true
- AllRules.ruleset
- false
-
-
- pdbonly
- true
- output\
- prompt
- 4
- x86
- true
- false
- AllRules.ruleset
- false
-
-
- true
-
-
-
- ..\ICSharpCode.SharpZipLib.dll
-
-
- False
- .\LuaInterface.dll
-
-
-
- False
- ..\Newtonsoft.Json.dll
-
-
-
- 3.5
-
-
-
-
-
- 3.5
-
-
- 3.5
-
-
-
-
-
-
-
- False
- ..\SlimDX.dll
-
-
-
-
- VersionInfo.cs
-
-
- Form
-
-
- AboutBox.cs
-
-
- Form
-
-
- ArchiveChooser.cs
-
-
-
-
-
- Form
-
-
- FFmpegWriterForm.cs
-
-
-
- Form
-
-
- GifWriterForm.cs
-
-
-
- Form
-
-
- JMDForm.cs
-
-
-
- Component
-
-
-
-
- Form
-
-
- VideoWriterChooserForm.cs
-
-
-
-
- Form
-
-
- BizBox.cs
-
-
-
-
- Form
-
-
- AutofireConfig.cs
-
-
- Form
-
-
- ControllerConfig.cs
-
-
- UserControl
-
-
- AnalogBindControl.cs
-
-
- UserControl
-
-
- UserControl
-
-
- ControllerConfigPanel.cs
-
-
- Form
-
-
- FirmwaresConfig.cs
-
-
- Form
-
-
- GifAnimator.cs
-
-
- Form
-
-
- HotkeyConfig.cs
-
-
- Component
-
-
- Form
-
-
- MessageConfig.cs
-
-
- Form
-
-
- PathConfig.cs
-
-
- Form
-
-
- PathInfo.cs
-
-
-
- Form
-
-
- RewindConfig.cs
-
-
- Form
-
-
- SoundConfig.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
- Form
-
-
- LogWindow.cs
-
-
- MainForm.cs
- Form
-
-
- MainForm.cs
- Form
-
-
- Form
-
-
- EditCommentsForm.cs
-
-
-
-
- Form
-
-
- MainForm.cs
-
-
- MainForm.cs
- Form
-
-
- Form
-
-
- EditSubtitlesForm.cs
-
-
-
-
-
-
-
-
-
- Form
-
-
- PlayMovie.cs
-
-
- Form
-
-
- RecordMovie.cs
-
-
-
-
- Form
-
-
- SubtitleMaker.cs
-
-
-
- Form
-
-
- NameStateForm.cs
-
-
-
-
- UserControl
-
-
- CheatEdit.cs
-
-
-
-
- Form
-
-
- CheatForm.cs
-
-
- Form
-
-
- GBAGPUView.cs
-
-
- Form
-
-
- MobileBmpView.cs
-
-
- Form
-
-
- MobileDetailView.cs
-
-
- Component
-
-
- Form
-
-
- CGBColorChooserForm.cs
-
-
- Form
-
-
- ColorChooserForm.cs
-
-
- UserControl
-
-
- DualGBFileSelector.cs
-
-
- Form
-
-
- DualGBXMLCreator.cs
-
-
- Form
-
-
- GBGameGenie.cs
-
-
- Form
-
-
- GBGPUView.cs
-
-
- Form
-
-
- GenGameGenie.cs
-
-
- Form
-
-
- HexColor.cs
-
-
- Form
-
-
- HexEditor.cs
-
-
- Form
-
-
- HexFind.cs
-
-
- Component
-
-
- Component
-
-
- Form
-
-
- LuaConsole.cs
-
-
-
-
- Form
-
-
- LuaFunctionList.cs
-
-
-
- Form
-
-
- LuaRegisteredFunctionsList.cs
-
-
-
- Component
-
-
- Form
-
-
- LuaWinform.cs
-
-
- Form
-
-
- LuaWriter.cs
-
-
- Component
-
-
- Form
-
-
- LuaWriterColorConfig.cs
-
-
- Form
-
-
- N64VideoPluginconfig.cs
-
-
-
- Component
-
-
- Form
-
-
- NESDebugger.cs
-
-
- Form
-
-
- NESGameGenie.cs
-
-
- Form
-
-
- NESGraphicsConfig.cs
-
-
- Form
-
-
- NESNameTableViewer.cs
-
-
- Form
-
-
- NESPPU.cs
-
-
- Form
-
-
- NESSoundConfig.cs
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Form
-
-
- PCEBGViewer.cs
-
-
- Form
-
-
- PCEGraphicsConfig.cs
-
-
- Form
-
-
- SaturnPrefs.cs
-
-
- Form
-
-
- SMSGraphicsConfig.cs
-
-
- Form
-
-
- SNESGameGenie.cs
-
-
- Form
-
-
- SNESGraphicsDebugger.cs
-
-
- Component
-
-
- Form
-
-
- SNESOptions.cs
-
-
-
- Form
-
-
- TI83KeyPad.cs
-
-
-
- Form
-
-
- TraceLogger.cs
-
-
- Component
-
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- UserControl
-
-
- VirtualPadA78.cs
-
-
- UserControl
-
-
- VirtualPadA78Control.cs
-
-
- Component
-
-
- UserControl
-
-
- VirtualPadC64Keyboard.cs
-
-
- UserControl
-
-
- VirtualPadColeco.cs
-
-
- Form
-
-
- VirtualPadForm.cs
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- UserControl
-
-
- VirtualPadN64.cs
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- UserControl
-
-
- VirtualPadSaturn.cs
-
-
- UserControl
-
-
- VirtualPadSaturnControl.cs
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Form
-
-
- RamSearch.cs
-
-
- Form
-
-
- RamPoke.cs
-
-
-
- Form
-
-
- RamWatch.cs
-
-
-
- Form
-
-
- WatchEditor.cs
-
-
-
-
- Component
-
-
-
- FFmpegWriterForm.cs
-
-
- GifWriterForm.cs
-
-
- JMDForm.cs
-
-
- VideoWriterChooserForm.cs
-
-
- ControllerConfig.cs
-
-
- AnalogBindControl.cs
-
-
- ControllerConfigPanel.cs
-
-
- FirmwaresConfig.cs
-
-
- GifAnimator.cs
-
-
- HotkeyConfig.cs
-
-
- PathConfig.cs
-
-
- PathInfo.cs
-
-
- RewindConfig.cs
-
-
- MainForm.cs
- Designer
-
-
- PlayMovie.cs
-
-
- RecordMovie.cs
-
-
- NameStateForm.cs
- Designer
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
- Designer
-
-
- True
- Resources.resx
- True
-
-
- CheatEdit.cs
-
-
- CheatForm.cs
-
-
- GBAGPUView.cs
-
-
- MobileBmpView.cs
-
-
- MobileDetailView.cs
-
-
- CGBColorChooserForm.cs
-
-
- ColorChooserForm.cs
-
-
- DualGBFileSelector.cs
-
-
- DualGBXMLCreator.cs
-
-
- GBGameGenie.cs
-
-
- GBGPUView.cs
-
-
- GenGameGenie.cs
-
-
- HexColor.cs
-
-
- HexEditor.cs
-
-
- HexFind.cs
-
-
- MemoryViewer.cs
-
-
- LuaConsole.cs
-
-
- LuaFunctionList.cs
-
-
- LuaRegisteredFunctionsList.cs
-
-
- LuaWinform.cs
-
-
- LuaWriter.cs
-
-
- LuaWriterColorConfig.cs
-
-
- N64VideoPluginconfig.cs
-
-
- NESDebugger.cs
-
-
- NESGameGenie.cs
-
-
- NESGraphicsConfig.cs
-
-
- NESNameTableViewer.cs
-
-
- NESPPU.cs
-
-
- NESSoundConfig.cs
-
-
- PatternViewer.cs
-
-
- PCEBGViewer.cs
-
-
- PCEGraphicsConfig.cs
-
-
- SaturnPrefs.cs
-
-
- SMSGraphicsConfig.cs
-
-
- SNESGameGenie.cs
-
-
- SNESGraphicsDebugger.cs
-
-
- SNESOptions.cs
-
-
- TI83KeyPad.cs
-
-
- VirtualPad.cs
-
-
- VirtualPadA78.cs
-
-
- VirtualPadA78Control.cs
-
-
- VirtualPadC64Keyboard.cs
-
-
- VirtualPadColeco.cs
-
-
- VirtualPadForm.cs
-
-
- VirtualPadN64.cs
-
-
- VirtualPadSaturn.cs
-
-
- VirtualPadSaturnControl.cs
-
-
- RamSearch.cs
-
-
- RamPoke.cs
-
-
- RamWatch.cs
-
-
- WatchEditor.cs
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
- True
- Settings.settings
- True
-
-
-
-
-
- Form
-
-
- InputPrompt.cs
-
-
-
-
-
-
-
- Form
-
-
- TAStudio.cs
-
-
- Form
-
-
- ToolBox.cs
-
-
-
-
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}
- BizHawk.Emulation
-
-
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}
- BizHawk.Util
-
-
-
-
- AboutBox.cs
- Designer
-
-
- ArchiveChooser.cs
- Designer
-
-
- BizBox.cs
-
-
- AutofireConfig.cs
-
-
- MessageConfig.cs
- Designer
-
-
- SoundConfig.cs
- Designer
-
-
-
-
-
-
-
- LogWindow.cs
-
-
- EditCommentsForm.cs
-
-
- EditSubtitlesForm.cs
-
-
- SubtitleMaker.cs
-
-
- TraceLogger.cs
-
-
- InputPrompt.cs
- Designer
-
-
- TAStudio.cs
-
-
- ToolBox.cs
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
- .NET Framework 3.5 SP1 Client Profile
- false
-
-
- False
- .NET Framework 2.0 %28x86%29
- false
-
-
- False
- .NET Framework 3.0 %28x86%29
- false
-
-
- False
- .NET Framework 3.5
- false
-
-
- False
- .NET Framework 3.5 SP1
- true
-
-
- False
- Windows Installer 3.1
- true
-
-
-
-
-
-
-
-
-
-
-
-
- "$(SolutionDir)subwcrev.bat" "$(ProjectDir)"
- "$(SolutionDir)subwcrev.sh" "$(ProjectDir)"
-
-
\ No newline at end of file
diff --git a/BizHawk.Util/FolderBrowserDialogEx.cs b/BizHawk.MultiClient/CustomControls/FolderBrowserDialogEx.cs
similarity index 100%
rename from BizHawk.Util/FolderBrowserDialogEx.cs
rename to BizHawk.MultiClient/CustomControls/FolderBrowserDialogEx.cs
diff --git a/BizHawk.Util/HexTextBox.cs b/BizHawk.MultiClient/CustomControls/HexTextBox.cs
similarity index 100%
rename from BizHawk.Util/HexTextBox.cs
rename to BizHawk.MultiClient/CustomControls/HexTextBox.cs
diff --git a/BizHawk.Util/InputConfigBase.cs b/BizHawk.MultiClient/CustomControls/InputConfigBase.cs
similarity index 100%
rename from BizHawk.Util/InputConfigBase.cs
rename to BizHawk.MultiClient/CustomControls/InputConfigBase.cs
diff --git a/BizHawk.Util/InputConfigBase.resx b/BizHawk.MultiClient/CustomControls/InputConfigBase.resx
similarity index 100%
rename from BizHawk.Util/InputConfigBase.resx
rename to BizHawk.MultiClient/CustomControls/InputConfigBase.resx
diff --git a/BizHawk.Util/MiscControls.cs b/BizHawk.MultiClient/CustomControls/MiscControls.cs
similarity index 100%
rename from BizHawk.Util/MiscControls.cs
rename to BizHawk.MultiClient/CustomControls/MiscControls.cs
diff --git a/BizHawk.Util/QuickProgressPopup.Designer.cs b/BizHawk.MultiClient/CustomControls/QuickProgressPopup.Designer.cs
similarity index 100%
rename from BizHawk.Util/QuickProgressPopup.Designer.cs
rename to BizHawk.MultiClient/CustomControls/QuickProgressPopup.Designer.cs
diff --git a/BizHawk.Util/QuickProgressPopup.cs b/BizHawk.MultiClient/CustomControls/QuickProgressPopup.cs
similarity index 100%
rename from BizHawk.Util/QuickProgressPopup.cs
rename to BizHawk.MultiClient/CustomControls/QuickProgressPopup.cs
diff --git a/BizHawk.Util/QuickProgressPopup.resx b/BizHawk.MultiClient/CustomControls/QuickProgressPopup.resx
similarity index 100%
rename from BizHawk.Util/QuickProgressPopup.resx
rename to BizHawk.MultiClient/CustomControls/QuickProgressPopup.resx
diff --git a/BizHawk.Util/SmartTextBoxControl.cs b/BizHawk.MultiClient/CustomControls/SmartTextBoxControl.cs
similarity index 100%
rename from BizHawk.Util/SmartTextBoxControl.cs
rename to BizHawk.MultiClient/CustomControls/SmartTextBoxControl.cs
diff --git a/BizHawk.Util/TextDebugView.cs b/BizHawk.MultiClient/CustomControls/TextDebugView.cs
similarity index 100%
rename from BizHawk.Util/TextDebugView.cs
rename to BizHawk.MultiClient/CustomControls/TextDebugView.cs
diff --git a/BizHawk.Util/ToolStripEx.cs b/BizHawk.MultiClient/CustomControls/ToolStripEx.cs
similarity index 100%
rename from BizHawk.Util/ToolStripEx.cs
rename to BizHawk.MultiClient/CustomControls/ToolStripEx.cs
diff --git a/BizHawk.Util/Util.cs b/BizHawk.MultiClient/CustomControls/Util.cs
similarity index 100%
rename from BizHawk.Util/Util.cs
rename to BizHawk.MultiClient/CustomControls/Util.cs
diff --git a/BizHawk.Util/ViewportPanel.cs b/BizHawk.MultiClient/CustomControls/ViewportPanel.cs
similarity index 100%
rename from BizHawk.Util/ViewportPanel.cs
rename to BizHawk.MultiClient/CustomControls/ViewportPanel.cs
diff --git a/BizHawk.Util/VirtualListView.cs b/BizHawk.MultiClient/CustomControls/VirtualListView.cs
similarity index 100%
rename from BizHawk.Util/VirtualListView.cs
rename to BizHawk.MultiClient/CustomControls/VirtualListView.cs
diff --git a/BizHawk.Util/Win32.cs b/BizHawk.MultiClient/CustomControls/Win32.cs
similarity index 100%
rename from BizHawk.Util/Win32.cs
rename to BizHawk.MultiClient/CustomControls/Win32.cs
diff --git a/BizHawk.Util/BizHawk.Util.csproj b/BizHawk.Util/BizHawk.Util.csproj
index 9029fafd05..063e83f7ab 100644
--- a/BizHawk.Util/BizHawk.Util.csproj
+++ b/BizHawk.Util/BizHawk.Util.csproj
@@ -110,43 +110,8 @@
-
- Component
-
-
- Component
-
-
- Form
-
-
- Form
-
-
- QuickProgressPopup.cs
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Component
-
-
-
- Component
-
-
- Component
-
-
@@ -159,16 +124,9 @@
-
- QuickProgressPopup.cs
-
-
- InputConfigBase.cs
- Designer
-
diff --git a/BizHawk.Util/BizHawk.Util_v4.5.csproj b/BizHawk.Util/BizHawk.Util_v4.5.csproj
deleted file mode 100644
index fdf29f8eeb..0000000000
--- a/BizHawk.Util/BizHawk.Util_v4.5.csproj
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}
- Library
- Properties
- BizHawk.Util
- BizHawk.Util
- v4.5
- 512
-
-
- 3.5
-
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- false
- true
-
-
-
- true
- full
- false
- bin\Debug\
- TRACE;DEBUG;DOTNET20;UNMANAGED;COMPRESS
- prompt
- 4
- x86
- AllRules.ruleset
- false
-
-
- pdbonly
- true
- bin\Release\
- TRACE;DOTNET20;UNMANAGED;COMPRESS
- prompt
- 4
- x86
- AllRules.ruleset
- false
-
-
-
-
- 3.5
-
-
-
-
- 3.5
-
-
- 3.5
-
-
-
-
-
-
- VersionInfo.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Component
-
-
- Component
-
-
- Form
-
-
-
-
-
- Component
-
-
-
-
- Component
-
-
- Component
-
-
- Component
-
-
-
- Component
-
-
- Component
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- InputConfigBase.cs
- Designer
-
-
-
-
- False
- .NET Framework 3.5 SP1 Client Profile
- false
-
-
- False
- .NET Framework 3.5 SP1
- true
-
-
- False
- Windows Installer 3.1
- true
-
-
-
-
- "$(SolutionDir)subwcrev.bat" "$(ProjectDir)"
- "$(SolutionDir)subwcrev.sh" "$(ProjectDir)"
-
-
-
\ No newline at end of file
diff --git a/BizHawk_2012.sln b/BizHawk_2012.sln
deleted file mode 100644
index 96a7eac34d..0000000000
--- a/BizHawk_2012.sln
+++ /dev/null
@@ -1,87 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation_v4.5", "BizHawk.Emulation\BizHawk.Emulation_v4.5.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Util_v4.5", "BizHawk.Util\BizHawk.Util_v4.5.csproj", "{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient_v4.5", "BizHawk.MultiClient\BizHawk.MultiClient_v4.5.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk_4.5", "DiscoHawk\DiscoHawk_4.5.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|Mixed Platforms = Debug|Mixed Platforms
- Debug|Win32 = Debug|Win32
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|Mixed Platforms = Release|Mixed Platforms
- Release|Win32 = Release|Win32
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Win32.Build.0 = Debug|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|x86.ActiveCfg = Debug|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Any CPU.Build.0 = Release|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.ActiveCfg = Release|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.Build.0 = Release|Any CPU
- {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x86.ActiveCfg = Release|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Win32.Build.0 = Debug|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Any CPU.Build.0 = Release|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Win32.ActiveCfg = Release|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Win32.Build.0 = Release|Any CPU
- {EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|x86.ActiveCfg = Release|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Win32.Build.0 = Debug|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|x86.ActiveCfg = Debug|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Any CPU.Build.0 = Release|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Win32.ActiveCfg = Release|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Win32.Build.0 = Release|Any CPU
- {DD448B37-BA3F-4544-9754-5406E8094723}.Release|x86.ActiveCfg = Release|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Win32.Build.0 = Debug|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Any CPU.Build.0 = Release|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.ActiveCfg = Release|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.Build.0 = Release|Any CPU
- {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|x86.ActiveCfg = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = BizHawk.MultiClient\BizHawk.MultiClient.csproj
- EndGlobalSection
-EndGlobal