diff --git a/BizHawk.MultiClient/AVOut/AviWriter.cs b/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/AviWriter.cs
rename to BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
diff --git a/BizHawk.MultiClient/AVOut/BmpVideoProvder.cs b/BizHawk.Client.EmuHawk/AVOut/BmpVideoProvder.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/BmpVideoProvder.cs
rename to BizHawk.Client.EmuHawk/AVOut/BmpVideoProvder.cs
diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriter.cs b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/FFmpegWriter.cs
rename to BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs
rename to BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.Designer.cs
diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs
rename to BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs
diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriterForm.resx b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.resx
similarity index 100%
rename from BizHawk.MultiClient/AVOut/FFmpegWriterForm.resx
rename to BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.resx
diff --git a/BizHawk.MultiClient/AVOut/GifWriter.cs b/BizHawk.Client.EmuHawk/AVOut/GifWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/GifWriter.cs
rename to BizHawk.Client.EmuHawk/AVOut/GifWriter.cs
diff --git a/BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs b/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs
rename to BizHawk.Client.EmuHawk/AVOut/GifWriterForm.Designer.cs
diff --git a/BizHawk.MultiClient/AVOut/GifWriterForm.cs b/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/GifWriterForm.cs
rename to BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs
diff --git a/BizHawk.MultiClient/AVOut/GifWriterForm.resx b/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.resx
similarity index 100%
rename from BizHawk.MultiClient/AVOut/GifWriterForm.resx
rename to BizHawk.Client.EmuHawk/AVOut/GifWriterForm.resx
diff --git a/BizHawk.MultiClient/AVOut/IVideoWriter.cs b/BizHawk.Client.EmuHawk/AVOut/IVideoWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/IVideoWriter.cs
rename to BizHawk.Client.EmuHawk/AVOut/IVideoWriter.cs
diff --git a/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs b/BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/JMDForm.Designer.cs
rename to BizHawk.Client.EmuHawk/AVOut/JMDForm.Designer.cs
diff --git a/BizHawk.MultiClient/AVOut/JMDForm.cs b/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/JMDForm.cs
rename to BizHawk.Client.EmuHawk/AVOut/JMDForm.cs
diff --git a/BizHawk.MultiClient/AVOut/JMDForm.resx b/BizHawk.Client.EmuHawk/AVOut/JMDForm.resx
similarity index 100%
rename from BizHawk.MultiClient/AVOut/JMDForm.resx
rename to BizHawk.Client.EmuHawk/AVOut/JMDForm.resx
diff --git a/BizHawk.MultiClient/AVOut/JMDWriter.cs b/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/JMDWriter.cs
rename to BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs
diff --git a/BizHawk.MultiClient/AVOut/NumericTextBox.cs b/BizHawk.Client.EmuHawk/AVOut/NumericTextBox.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/NumericTextBox.cs
rename to BizHawk.Client.EmuHawk/AVOut/NumericTextBox.cs
diff --git a/BizHawk.MultiClient/AVOut/NutMuxer.cs b/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/NutMuxer.cs
rename to BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs
diff --git a/BizHawk.MultiClient/AVOut/NutWriter.cs b/BizHawk.Client.EmuHawk/AVOut/NutWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/NutWriter.cs
rename to BizHawk.Client.EmuHawk/AVOut/NutWriter.cs
diff --git a/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs
rename to BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs
diff --git a/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs b/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs
rename to BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
diff --git a/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.resx b/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.resx
similarity index 100%
rename from BizHawk.MultiClient/AVOut/VideoWriterChooserForm.resx
rename to BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.resx
diff --git a/BizHawk.MultiClient/AVOut/WavWriter.cs b/BizHawk.Client.EmuHawk/AVOut/WavWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/AVOut/WavWriter.cs
rename to BizHawk.Client.EmuHawk/AVOut/WavWriter.cs
diff --git a/BizHawk.MultiClient/AboutBox.Designer.cs b/BizHawk.Client.EmuHawk/AboutBox.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/AboutBox.Designer.cs
rename to BizHawk.Client.EmuHawk/AboutBox.Designer.cs
diff --git a/BizHawk.MultiClient/AboutBox.cs b/BizHawk.Client.EmuHawk/AboutBox.cs
similarity index 100%
rename from BizHawk.MultiClient/AboutBox.cs
rename to BizHawk.Client.EmuHawk/AboutBox.cs
diff --git a/BizHawk.MultiClient/AboutBox.resx b/BizHawk.Client.EmuHawk/AboutBox.resx
similarity index 100%
rename from BizHawk.MultiClient/AboutBox.resx
rename to BizHawk.Client.EmuHawk/AboutBox.resx
diff --git a/BizHawk.MultiClient/ArchiveChooser.Designer.cs b/BizHawk.Client.EmuHawk/ArchiveChooser.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/ArchiveChooser.Designer.cs
rename to BizHawk.Client.EmuHawk/ArchiveChooser.Designer.cs
diff --git a/BizHawk.MultiClient/ArchiveChooser.cs b/BizHawk.Client.EmuHawk/ArchiveChooser.cs
similarity index 100%
rename from BizHawk.MultiClient/ArchiveChooser.cs
rename to BizHawk.Client.EmuHawk/ArchiveChooser.cs
diff --git a/BizHawk.MultiClient/ArchiveChooser.resx b/BizHawk.Client.EmuHawk/ArchiveChooser.resx
similarity index 100%
rename from BizHawk.MultiClient/ArchiveChooser.resx
rename to BizHawk.Client.EmuHawk/ArchiveChooser.resx
diff --git a/BizHawk.MultiClient/BizBox.Designer.cs b/BizHawk.Client.EmuHawk/BizBox.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/BizBox.Designer.cs
rename to BizHawk.Client.EmuHawk/BizBox.Designer.cs
diff --git a/BizHawk.MultiClient/BizBox.cs b/BizHawk.Client.EmuHawk/BizBox.cs
similarity index 100%
rename from BizHawk.MultiClient/BizBox.cs
rename to BizHawk.Client.EmuHawk/BizBox.cs
diff --git a/BizHawk.MultiClient/BizBox.resx b/BizHawk.Client.EmuHawk/BizBox.resx
similarity index 100%
rename from BizHawk.MultiClient/BizBox.resx
rename to BizHawk.Client.EmuHawk/BizBox.resx
diff --git a/BizHawk.MultiClient/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
similarity index 100%
rename from BizHawk.MultiClient/BizHawk.Client.EmuHawk.csproj
rename to BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
diff --git a/BizHawk.MultiClient/CustomControls/FolderBrowserDialogEx.cs b/BizHawk.Client.EmuHawk/CustomControls/FolderBrowserDialogEx.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/FolderBrowserDialogEx.cs
rename to BizHawk.Client.EmuHawk/CustomControls/FolderBrowserDialogEx.cs
diff --git a/BizHawk.MultiClient/CustomControls/HexTextBox.cs b/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/HexTextBox.cs
rename to BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
diff --git a/BizHawk.MultiClient/CustomControls/InputConfigBase.cs b/BizHawk.Client.EmuHawk/CustomControls/InputConfigBase.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/InputConfigBase.cs
rename to BizHawk.Client.EmuHawk/CustomControls/InputConfigBase.cs
diff --git a/BizHawk.MultiClient/CustomControls/InputConfigBase.resx b/BizHawk.Client.EmuHawk/CustomControls/InputConfigBase.resx
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/InputConfigBase.resx
rename to BizHawk.Client.EmuHawk/CustomControls/InputConfigBase.resx
diff --git a/BizHawk.MultiClient/CustomControls/MiscControls.cs b/BizHawk.Client.EmuHawk/CustomControls/MiscControls.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/MiscControls.cs
rename to BizHawk.Client.EmuHawk/CustomControls/MiscControls.cs
diff --git a/BizHawk.MultiClient/CustomControls/QuickProgressPopup.Designer.cs b/BizHawk.Client.EmuHawk/CustomControls/QuickProgressPopup.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/QuickProgressPopup.Designer.cs
rename to BizHawk.Client.EmuHawk/CustomControls/QuickProgressPopup.Designer.cs
diff --git a/BizHawk.MultiClient/CustomControls/QuickProgressPopup.cs b/BizHawk.Client.EmuHawk/CustomControls/QuickProgressPopup.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/QuickProgressPopup.cs
rename to BizHawk.Client.EmuHawk/CustomControls/QuickProgressPopup.cs
diff --git a/BizHawk.MultiClient/CustomControls/QuickProgressPopup.resx b/BizHawk.Client.EmuHawk/CustomControls/QuickProgressPopup.resx
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/QuickProgressPopup.resx
rename to BizHawk.Client.EmuHawk/CustomControls/QuickProgressPopup.resx
diff --git a/BizHawk.MultiClient/CustomControls/SmartTextBoxControl.cs b/BizHawk.Client.EmuHawk/CustomControls/SmartTextBoxControl.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/SmartTextBoxControl.cs
rename to BizHawk.Client.EmuHawk/CustomControls/SmartTextBoxControl.cs
diff --git a/BizHawk.MultiClient/CustomControls/TextDebugView.cs b/BizHawk.Client.EmuHawk/CustomControls/TextDebugView.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/TextDebugView.cs
rename to BizHawk.Client.EmuHawk/CustomControls/TextDebugView.cs
diff --git a/BizHawk.MultiClient/CustomControls/ToolStripEx.cs b/BizHawk.Client.EmuHawk/CustomControls/ToolStripEx.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/ToolStripEx.cs
rename to BizHawk.Client.EmuHawk/CustomControls/ToolStripEx.cs
diff --git a/BizHawk.MultiClient/CustomControls/Util.cs b/BizHawk.Client.EmuHawk/CustomControls/Util.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/Util.cs
rename to BizHawk.Client.EmuHawk/CustomControls/Util.cs
diff --git a/BizHawk.MultiClient/CustomControls/ViewportPanel.cs b/BizHawk.Client.EmuHawk/CustomControls/ViewportPanel.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/ViewportPanel.cs
rename to BizHawk.Client.EmuHawk/CustomControls/ViewportPanel.cs
diff --git a/BizHawk.MultiClient/CustomControls/VirtualListView.cs b/BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/VirtualListView.cs
rename to BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
diff --git a/BizHawk.MultiClient/CustomControls/Win32.cs b/BizHawk.Client.EmuHawk/CustomControls/Win32.cs
similarity index 100%
rename from BizHawk.MultiClient/CustomControls/Win32.cs
rename to BizHawk.Client.EmuHawk/CustomControls/Win32.cs
diff --git a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
similarity index 100%
rename from BizHawk.MultiClient/DisplayManager/DisplayManager.cs
rename to BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
diff --git a/BizHawk.MultiClient/DisplayManager/Filters/Hq2x.cs b/BizHawk.Client.EmuHawk/DisplayManager/Filters/Hq2x.cs
similarity index 100%
rename from BizHawk.MultiClient/DisplayManager/Filters/Hq2x.cs
rename to BizHawk.Client.EmuHawk/DisplayManager/Filters/Hq2x.cs
diff --git a/BizHawk.MultiClient/ExternalCoreSupport.cs b/BizHawk.Client.EmuHawk/ExternalCoreSupport.cs
similarity index 100%
rename from BizHawk.MultiClient/ExternalCoreSupport.cs
rename to BizHawk.Client.EmuHawk/ExternalCoreSupport.cs
diff --git a/BizHawk.MultiClient/GlobalWinF.cs b/BizHawk.Client.EmuHawk/GlobalWinF.cs
similarity index 100%
rename from BizHawk.MultiClient/GlobalWinF.cs
rename to BizHawk.Client.EmuHawk/GlobalWinF.cs
diff --git a/BizHawk.MultiClient/Input/GamePad.cs b/BizHawk.Client.EmuHawk/Input/GamePad.cs
similarity index 100%
rename from BizHawk.MultiClient/Input/GamePad.cs
rename to BizHawk.Client.EmuHawk/Input/GamePad.cs
diff --git a/BizHawk.MultiClient/Input/GamePad360.cs b/BizHawk.Client.EmuHawk/Input/GamePad360.cs
similarity index 100%
rename from BizHawk.MultiClient/Input/GamePad360.cs
rename to BizHawk.Client.EmuHawk/Input/GamePad360.cs
diff --git a/BizHawk.MultiClient/Input/Input.cs b/BizHawk.Client.EmuHawk/Input/Input.cs
similarity index 100%
rename from BizHawk.MultiClient/Input/Input.cs
rename to BizHawk.Client.EmuHawk/Input/Input.cs
diff --git a/BizHawk.MultiClient/Input/Keyboard.cs b/BizHawk.Client.EmuHawk/Input/Keyboard.cs
similarity index 100%
rename from BizHawk.MultiClient/Input/Keyboard.cs
rename to BizHawk.Client.EmuHawk/Input/Keyboard.cs
diff --git a/BizHawk.MultiClient/LogConsole.cs b/BizHawk.Client.EmuHawk/LogConsole.cs
similarity index 100%
rename from BizHawk.MultiClient/LogConsole.cs
rename to BizHawk.Client.EmuHawk/LogConsole.cs
diff --git a/BizHawk.MultiClient/LogWindow.Designer.cs b/BizHawk.Client.EmuHawk/LogWindow.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/LogWindow.Designer.cs
rename to BizHawk.Client.EmuHawk/LogWindow.Designer.cs
diff --git a/BizHawk.MultiClient/LogWindow.cs b/BizHawk.Client.EmuHawk/LogWindow.cs
similarity index 100%
rename from BizHawk.MultiClient/LogWindow.cs
rename to BizHawk.Client.EmuHawk/LogWindow.cs
diff --git a/BizHawk.MultiClient/LogWindow.resx b/BizHawk.Client.EmuHawk/LogWindow.resx
similarity index 100%
rename from BizHawk.MultiClient/LogWindow.resx
rename to BizHawk.Client.EmuHawk/LogWindow.resx
diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/MainForm.Designer.cs
rename to BizHawk.Client.EmuHawk/MainForm.Designer.cs
diff --git a/BizHawk.MultiClient/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
similarity index 100%
rename from BizHawk.MultiClient/MainForm.Events.cs
rename to BizHawk.Client.EmuHawk/MainForm.Events.cs
diff --git a/BizHawk.MultiClient/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
similarity index 100%
rename from BizHawk.MultiClient/MainForm.Movie.cs
rename to BizHawk.Client.EmuHawk/MainForm.Movie.cs
diff --git a/BizHawk.MultiClient/MainForm.Rewind.cs b/BizHawk.Client.EmuHawk/MainForm.Rewind.cs
similarity index 100%
rename from BizHawk.MultiClient/MainForm.Rewind.cs
rename to BizHawk.Client.EmuHawk/MainForm.Rewind.cs
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
similarity index 100%
rename from BizHawk.MultiClient/MainForm.cs
rename to BizHawk.Client.EmuHawk/MainForm.cs
diff --git a/BizHawk.MultiClient/MainForm.resources b/BizHawk.Client.EmuHawk/MainForm.resources
similarity index 100%
rename from BizHawk.MultiClient/MainForm.resources
rename to BizHawk.Client.EmuHawk/MainForm.resources
diff --git a/BizHawk.MultiClient/MainForm.resx b/BizHawk.Client.EmuHawk/MainForm.resx
similarity index 100%
rename from BizHawk.MultiClient/MainForm.resx
rename to BizHawk.Client.EmuHawk/MainForm.resx
diff --git a/BizHawk.MultiClient/NameStateForm.Designer.cs b/BizHawk.Client.EmuHawk/NameStateForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/NameStateForm.Designer.cs
rename to BizHawk.Client.EmuHawk/NameStateForm.Designer.cs
diff --git a/BizHawk.MultiClient/NameStateForm.cs b/BizHawk.Client.EmuHawk/NameStateForm.cs
similarity index 100%
rename from BizHawk.MultiClient/NameStateForm.cs
rename to BizHawk.Client.EmuHawk/NameStateForm.cs
diff --git a/BizHawk.MultiClient/NameStateForm.resources b/BizHawk.Client.EmuHawk/NameStateForm.resources
similarity index 100%
rename from BizHawk.MultiClient/NameStateForm.resources
rename to BizHawk.Client.EmuHawk/NameStateForm.resources
diff --git a/BizHawk.MultiClient/NameStateForm.resx b/BizHawk.Client.EmuHawk/NameStateForm.resx
similarity index 100%
rename from BizHawk.MultiClient/NameStateForm.resx
rename to BizHawk.Client.EmuHawk/NameStateForm.resx
diff --git a/BizHawk.MultiClient/Program.cs b/BizHawk.Client.EmuHawk/Program.cs
similarity index 100%
rename from BizHawk.MultiClient/Program.cs
rename to BizHawk.Client.EmuHawk/Program.cs
diff --git a/BizHawk.MultiClient/Properties/AssemblyInfo.cs b/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs
similarity index 100%
rename from BizHawk.MultiClient/Properties/AssemblyInfo.cs
rename to BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/Properties/Resources.Designer.cs
rename to BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
diff --git a/BizHawk.MultiClient/Properties/Resources.resources b/BizHawk.Client.EmuHawk/Properties/Resources.resources
similarity index 100%
rename from BizHawk.MultiClient/Properties/Resources.resources
rename to BizHawk.Client.EmuHawk/Properties/Resources.resources
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx
similarity index 100%
rename from BizHawk.MultiClient/Properties/Resources.resx
rename to BizHawk.Client.EmuHawk/Properties/Resources.resx
diff --git a/BizHawk.MultiClient/Properties/Settings.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Settings.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/Properties/Settings.Designer.cs
rename to BizHawk.Client.EmuHawk/Properties/Settings.Designer.cs
diff --git a/BizHawk.MultiClient/Properties/Settings.settings b/BizHawk.Client.EmuHawk/Properties/Settings.settings
similarity index 100%
rename from BizHawk.MultiClient/Properties/Settings.settings
rename to BizHawk.Client.EmuHawk/Properties/Settings.settings
diff --git a/BizHawk.MultiClient/Properties/svnrev_template b/BizHawk.Client.EmuHawk/Properties/svnrev_template
similarity index 100%
rename from BizHawk.MultiClient/Properties/svnrev_template
rename to BizHawk.Client.EmuHawk/Properties/svnrev_template
diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.Client.EmuHawk/RenderPanel.cs
similarity index 100%
rename from BizHawk.MultiClient/RenderPanel.cs
rename to BizHawk.Client.EmuHawk/RenderPanel.cs
diff --git a/BizHawk.MultiClient/ScreenSaver.cs b/BizHawk.Client.EmuHawk/ScreenSaver.cs
similarity index 100%
rename from BizHawk.MultiClient/ScreenSaver.cs
rename to BizHawk.Client.EmuHawk/ScreenSaver.cs
diff --git a/BizHawk.MultiClient/Sound.cs b/BizHawk.Client.EmuHawk/Sound.cs
similarity index 100%
rename from BizHawk.MultiClient/Sound.cs
rename to BizHawk.Client.EmuHawk/Sound.cs
diff --git a/BizHawk.MultiClient/Throttle.cs b/BizHawk.Client.EmuHawk/Throttle.cs
similarity index 100%
rename from BizHawk.MultiClient/Throttle.cs
rename to BizHawk.Client.EmuHawk/Throttle.cs
diff --git a/BizHawk.MultiClient/Watch.cs b/BizHawk.Client.EmuHawk/Watch.cs
similarity index 100%
rename from BizHawk.MultiClient/Watch.cs
rename to BizHawk.Client.EmuHawk/Watch.cs
diff --git a/BizHawk.MultiClient/config/AutofireConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/AutofireConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs
diff --git a/BizHawk.MultiClient/config/AutofireConfig.cs b/BizHawk.Client.EmuHawk/config/AutofireConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/config/AutofireConfig.cs
rename to BizHawk.Client.EmuHawk/config/AutofireConfig.cs
diff --git a/BizHawk.MultiClient/config/AutofireConfig.resx b/BizHawk.Client.EmuHawk/config/AutofireConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/config/AutofireConfig.resx
rename to BizHawk.Client.EmuHawk/config/AutofireConfig.resx
diff --git a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig.cs
rename to BizHawk.Client.EmuHawk/config/ControllerConfig.cs
diff --git a/BizHawk.MultiClient/config/ControllerConfig.resx b/BizHawk.Client.EmuHawk/config/ControllerConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig.resx
rename to BizHawk.Client.EmuHawk/config/ControllerConfig.resx
diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs
rename to BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs
diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.cs
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs
rename to BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.cs
diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.resx b/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.resx
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.resx
rename to BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.resx
diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindPanel.cs
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs
rename to BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindPanel.cs
diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs
rename to BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.Designer.cs
diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs
rename to BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.resx b/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.resx
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.resx
rename to BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.resx
diff --git a/BizHawk.MultiClient/config/ControllerImages/A78Joystick.png b/BizHawk.Client.EmuHawk/config/ControllerImages/A78Joystick.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/A78Joystick.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/A78Joystick.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/C64Joystick.png b/BizHawk.Client.EmuHawk/config/ControllerImages/C64Joystick.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/C64Joystick.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/C64Joystick.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/C64Keyboard.png b/BizHawk.Client.EmuHawk/config/ControllerImages/C64Keyboard.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/C64Keyboard.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/C64Keyboard.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/GBA_Controller.png b/BizHawk.Client.EmuHawk/config/ControllerImages/GBA_Controller.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/GBA_Controller.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/GBA_Controller.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/GBController.png b/BizHawk.Client.EmuHawk/config/ControllerImages/GBController.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/GBController.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/GBController.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/GENController.png b/BizHawk.Client.EmuHawk/config/ControllerImages/GENController.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/GENController.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/GENController.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/IntVController.png b/BizHawk.Client.EmuHawk/config/ControllerImages/IntVController.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/IntVController.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/IntVController.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/N64.png b/BizHawk.Client.EmuHawk/config/ControllerImages/N64.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/N64.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/N64.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/NES_Controller.png b/BizHawk.Client.EmuHawk/config/ControllerImages/NES_Controller.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/NES_Controller.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/NES_Controller.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/PCEngineController.png b/BizHawk.Client.EmuHawk/config/ControllerImages/PCEngineController.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/PCEngineController.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/PCEngineController.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/SMSController.png b/BizHawk.Client.EmuHawk/config/ControllerImages/SMSController.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/SMSController.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/SMSController.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/SNES_Controller.png b/BizHawk.Client.EmuHawk/config/ControllerImages/SNES_Controller.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/SNES_Controller.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/SNES_Controller.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/SaturnController.jpg b/BizHawk.Client.EmuHawk/config/ControllerImages/SaturnController.jpg
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/SaturnController.jpg
rename to BizHawk.Client.EmuHawk/config/ControllerImages/SaturnController.jpg
diff --git a/BizHawk.MultiClient/config/ControllerImages/TI83Calculator.png b/BizHawk.Client.EmuHawk/config/ControllerImages/TI83Calculator.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/TI83Calculator.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/TI83Calculator.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/TI83_Controller.png b/BizHawk.Client.EmuHawk/config/ControllerImages/TI83_Controller.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/TI83_Controller.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/TI83_Controller.png
diff --git a/BizHawk.MultiClient/config/ControllerImages/colecovisioncontroller.png b/BizHawk.Client.EmuHawk/config/ControllerImages/colecovisioncontroller.png
similarity index 100%
rename from BizHawk.MultiClient/config/ControllerImages/colecovisioncontroller.png
rename to BizHawk.Client.EmuHawk/config/ControllerImages/colecovisioncontroller.png
diff --git a/BizHawk.MultiClient/config/FirmwaresConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/FirmwaresConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs
diff --git a/BizHawk.MultiClient/config/FirmwaresConfig.cs b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/config/FirmwaresConfig.cs
rename to BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
diff --git a/BizHawk.MultiClient/config/FirmwaresConfig.resx b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/config/FirmwaresConfig.resx
rename to BizHawk.Client.EmuHawk/config/FirmwaresConfig.resx
diff --git a/BizHawk.MultiClient/config/FirmwaresConfigInfo.Designer.cs b/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/FirmwaresConfigInfo.Designer.cs
rename to BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.Designer.cs
diff --git a/BizHawk.MultiClient/config/FirmwaresConfigInfo.cs b/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs
similarity index 100%
rename from BizHawk.MultiClient/config/FirmwaresConfigInfo.cs
rename to BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs
diff --git a/BizHawk.MultiClient/config/FirmwaresConfigInfo.resx b/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.resx
similarity index 100%
rename from BizHawk.MultiClient/config/FirmwaresConfigInfo.resx
rename to BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.resx
diff --git a/BizHawk.MultiClient/config/GifAnimator.Designer.cs b/BizHawk.Client.EmuHawk/config/GifAnimator.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/GifAnimator.Designer.cs
rename to BizHawk.Client.EmuHawk/config/GifAnimator.Designer.cs
diff --git a/BizHawk.MultiClient/config/GifAnimator.cs b/BizHawk.Client.EmuHawk/config/GifAnimator.cs
similarity index 100%
rename from BizHawk.MultiClient/config/GifAnimator.cs
rename to BizHawk.Client.EmuHawk/config/GifAnimator.cs
diff --git a/BizHawk.MultiClient/config/GifAnimator.resx b/BizHawk.Client.EmuHawk/config/GifAnimator.resx
similarity index 100%
rename from BizHawk.MultiClient/config/GifAnimator.resx
rename to BizHawk.Client.EmuHawk/config/GifAnimator.resx
diff --git a/BizHawk.MultiClient/config/HotkeyConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/HotkeyConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs
diff --git a/BizHawk.MultiClient/config/HotkeyConfig.cs b/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/config/HotkeyConfig.cs
rename to BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
diff --git a/BizHawk.MultiClient/config/HotkeyConfig.resx b/BizHawk.Client.EmuHawk/config/HotkeyConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/config/HotkeyConfig.resx
rename to BizHawk.Client.EmuHawk/config/HotkeyConfig.resx
diff --git a/BizHawk.MultiClient/config/InputWidget.cs b/BizHawk.Client.EmuHawk/config/InputWidget.cs
similarity index 100%
rename from BizHawk.MultiClient/config/InputWidget.cs
rename to BizHawk.Client.EmuHawk/config/InputWidget.cs
diff --git a/BizHawk.MultiClient/config/MessageConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/MessageConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs
diff --git a/BizHawk.MultiClient/config/MessageConfig.cs b/BizHawk.Client.EmuHawk/config/MessageConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/config/MessageConfig.cs
rename to BizHawk.Client.EmuHawk/config/MessageConfig.cs
diff --git a/BizHawk.MultiClient/config/MessageConfig.resx b/BizHawk.Client.EmuHawk/config/MessageConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/config/MessageConfig.resx
rename to BizHawk.Client.EmuHawk/config/MessageConfig.resx
diff --git a/BizHawk.MultiClient/config/PathConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/PathConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/PathConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/PathConfig.Designer.cs
diff --git a/BizHawk.MultiClient/config/PathConfig.cs b/BizHawk.Client.EmuHawk/config/PathConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/config/PathConfig.cs
rename to BizHawk.Client.EmuHawk/config/PathConfig.cs
diff --git a/BizHawk.MultiClient/config/PathConfig.resx b/BizHawk.Client.EmuHawk/config/PathConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/config/PathConfig.resx
rename to BizHawk.Client.EmuHawk/config/PathConfig.resx
diff --git a/BizHawk.MultiClient/config/PathInfo.Designer.cs b/BizHawk.Client.EmuHawk/config/PathInfo.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/PathInfo.Designer.cs
rename to BizHawk.Client.EmuHawk/config/PathInfo.Designer.cs
diff --git a/BizHawk.MultiClient/config/PathInfo.cs b/BizHawk.Client.EmuHawk/config/PathInfo.cs
similarity index 100%
rename from BizHawk.MultiClient/config/PathInfo.cs
rename to BizHawk.Client.EmuHawk/config/PathInfo.cs
diff --git a/BizHawk.MultiClient/config/PathInfo.resx b/BizHawk.Client.EmuHawk/config/PathInfo.resx
similarity index 100%
rename from BizHawk.MultiClient/config/PathInfo.resx
rename to BizHawk.Client.EmuHawk/config/PathInfo.resx
diff --git a/BizHawk.MultiClient/config/RewindConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/RewindConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs
diff --git a/BizHawk.MultiClient/config/RewindConfig.cs b/BizHawk.Client.EmuHawk/config/RewindConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/config/RewindConfig.cs
rename to BizHawk.Client.EmuHawk/config/RewindConfig.cs
diff --git a/BizHawk.MultiClient/config/RewindConfig.resx b/BizHawk.Client.EmuHawk/config/RewindConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/config/RewindConfig.resx
rename to BizHawk.Client.EmuHawk/config/RewindConfig.resx
diff --git a/BizHawk.MultiClient/config/SoundConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/config/SoundConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs
diff --git a/BizHawk.MultiClient/config/SoundConfig.cs b/BizHawk.Client.EmuHawk/config/SoundConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/config/SoundConfig.cs
rename to BizHawk.Client.EmuHawk/config/SoundConfig.cs
diff --git a/BizHawk.MultiClient/config/SoundConfig.resx b/BizHawk.Client.EmuHawk/config/SoundConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/config/SoundConfig.resx
rename to BizHawk.Client.EmuHawk/config/SoundConfig.resx
diff --git a/BizHawk.MultiClient/images/.ico b/BizHawk.Client.EmuHawk/images/.ico
similarity index 100%
rename from BizHawk.MultiClient/images/.ico
rename to BizHawk.Client.EmuHawk/images/.ico
diff --git a/BizHawk.MultiClient/images/AVI.png b/BizHawk.Client.EmuHawk/images/AVI.png
similarity index 100%
rename from BizHawk.MultiClient/images/AVI.png
rename to BizHawk.Client.EmuHawk/images/AVI.png
diff --git a/BizHawk.MultiClient/images/AtariControllerIcon.png b/BizHawk.Client.EmuHawk/images/AtariControllerIcon.png
similarity index 100%
rename from BizHawk.MultiClient/images/AtariControllerIcon.png
rename to BizHawk.Client.EmuHawk/images/AtariControllerIcon.png
diff --git a/BizHawk.MultiClient/images/AudioHS.png b/BizHawk.Client.EmuHawk/images/AudioHS.png
similarity index 100%
rename from BizHawk.MultiClient/images/AudioHS.png
rename to BizHawk.Client.EmuHawk/images/AudioHS.png
diff --git a/BizHawk.MultiClient/images/AutoSearch.png b/BizHawk.Client.EmuHawk/images/AutoSearch.png
similarity index 100%
rename from BizHawk.MultiClient/images/AutoSearch.png
rename to BizHawk.Client.EmuHawk/images/AutoSearch.png
diff --git a/BizHawk.MultiClient/images/Back.png b/BizHawk.Client.EmuHawk/images/Back.png
similarity index 100%
rename from BizHawk.MultiClient/images/Back.png
rename to BizHawk.Client.EmuHawk/images/Back.png
diff --git a/BizHawk.MultiClient/images/BackMore.png b/BizHawk.Client.EmuHawk/images/BackMore.png
similarity index 100%
rename from BizHawk.MultiClient/images/BackMore.png
rename to BizHawk.Client.EmuHawk/images/BackMore.png
diff --git a/BizHawk.MultiClient/images/Blank.png b/BizHawk.Client.EmuHawk/images/Blank.png
similarity index 100%
rename from BizHawk.MultiClient/images/Blank.png
rename to BizHawk.Client.EmuHawk/images/Blank.png
diff --git a/BizHawk.MultiClient/images/BlueDown.png b/BizHawk.Client.EmuHawk/images/BlueDown.png
similarity index 100%
rename from BizHawk.MultiClient/images/BlueDown.png
rename to BizHawk.Client.EmuHawk/images/BlueDown.png
diff --git a/BizHawk.MultiClient/images/BlueUp.png b/BizHawk.Client.EmuHawk/images/BlueUp.png
similarity index 100%
rename from BizHawk.MultiClient/images/BlueUp.png
rename to BizHawk.Client.EmuHawk/images/BlueUp.png
diff --git a/BizHawk.MultiClient/images/Both.png b/BizHawk.Client.EmuHawk/images/Both.png
similarity index 100%
rename from BizHawk.MultiClient/images/Both.png
rename to BizHawk.Client.EmuHawk/images/Both.png
diff --git a/BizHawk.MultiClient/images/Bug.ico b/BizHawk.Client.EmuHawk/images/Bug.ico
similarity index 100%
rename from BizHawk.MultiClient/images/Bug.ico
rename to BizHawk.Client.EmuHawk/images/Bug.ico
diff --git a/BizHawk.MultiClient/images/Bug.png b/BizHawk.Client.EmuHawk/images/Bug.png
similarity index 100%
rename from BizHawk.MultiClient/images/Bug.png
rename to BizHawk.Client.EmuHawk/images/Bug.png
diff --git a/BizHawk.MultiClient/images/BuilderDialog_delete.bmp b/BizHawk.Client.EmuHawk/images/BuilderDialog_delete.bmp
similarity index 100%
rename from BizHawk.MultiClient/images/BuilderDialog_delete.bmp
rename to BizHawk.Client.EmuHawk/images/BuilderDialog_delete.bmp
diff --git a/BizHawk.MultiClient/images/BuilderDialog_movedown.bmp b/BizHawk.Client.EmuHawk/images/BuilderDialog_movedown.bmp
similarity index 100%
rename from BizHawk.MultiClient/images/BuilderDialog_movedown.bmp
rename to BizHawk.Client.EmuHawk/images/BuilderDialog_movedown.bmp
diff --git a/BizHawk.MultiClient/images/BuilderDialog_moveup.bmp b/BizHawk.Client.EmuHawk/images/BuilderDialog_moveup.bmp
similarity index 100%
rename from BizHawk.MultiClient/images/BuilderDialog_moveup.bmp
rename to BizHawk.Client.EmuHawk/images/BuilderDialog_moveup.bmp
diff --git a/BizHawk.MultiClient/images/C64Symbol.png b/BizHawk.Client.EmuHawk/images/C64Symbol.png
similarity index 100%
rename from BizHawk.MultiClient/images/C64Symbol.png
rename to BizHawk.Client.EmuHawk/images/C64Symbol.png
diff --git a/BizHawk.MultiClient/images/Cheats.ico b/BizHawk.Client.EmuHawk/images/Cheats.ico
similarity index 100%
rename from BizHawk.MultiClient/images/Cheats.ico
rename to BizHawk.Client.EmuHawk/images/Cheats.ico
diff --git a/BizHawk.MultiClient/images/Close.png b/BizHawk.Client.EmuHawk/images/Close.png
similarity index 100%
rename from BizHawk.MultiClient/images/Close.png
rename to BizHawk.Client.EmuHawk/images/Close.png
diff --git a/BizHawk.MultiClient/images/CopyFolderHS.png b/BizHawk.Client.EmuHawk/images/CopyFolderHS.png
similarity index 100%
rename from BizHawk.MultiClient/images/CopyFolderHS.png
rename to BizHawk.Client.EmuHawk/images/CopyFolderHS.png
diff --git a/BizHawk.MultiClient/images/CorpHawkSmall.png b/BizHawk.Client.EmuHawk/images/CorpHawkSmall.png
similarity index 100%
rename from BizHawk.MultiClient/images/CorpHawkSmall.png
rename to BizHawk.Client.EmuHawk/images/CorpHawkSmall.png
diff --git a/BizHawk.MultiClient/images/CutHS.png b/BizHawk.Client.EmuHawk/images/CutHS.png
similarity index 100%
rename from BizHawk.MultiClient/images/CutHS.png
rename to BizHawk.Client.EmuHawk/images/CutHS.png
diff --git a/BizHawk.MultiClient/images/Debugger.ico b/BizHawk.Client.EmuHawk/images/Debugger.ico
similarity index 100%
rename from BizHawk.MultiClient/images/Debugger.ico
rename to BizHawk.Client.EmuHawk/images/Debugger.ico
diff --git a/BizHawk.MultiClient/images/Debugger.png b/BizHawk.Client.EmuHawk/images/Debugger.png
similarity index 100%
rename from BizHawk.MultiClient/images/Debugger.png
rename to BizHawk.Client.EmuHawk/images/Debugger.png
diff --git a/BizHawk.MultiClient/images/Delete.png b/BizHawk.Client.EmuHawk/images/Delete.png
similarity index 100%
rename from BizHawk.MultiClient/images/Delete.png
rename to BizHawk.Client.EmuHawk/images/Delete.png
diff --git a/BizHawk.MultiClient/images/Duplicate.png b/BizHawk.Client.EmuHawk/images/Duplicate.png
similarity index 100%
rename from BizHawk.MultiClient/images/Duplicate.png
rename to BizHawk.Client.EmuHawk/images/Duplicate.png
diff --git a/BizHawk.MultiClient/images/ExclamationRed.png b/BizHawk.Client.EmuHawk/images/ExclamationRed.png
similarity index 100%
rename from BizHawk.MultiClient/images/ExclamationRed.png
rename to BizHawk.Client.EmuHawk/images/ExclamationRed.png
diff --git a/BizHawk.MultiClient/images/FastForward.png b/BizHawk.Client.EmuHawk/images/FastForward.png
similarity index 100%
rename from BizHawk.MultiClient/images/FastForward.png
rename to BizHawk.Client.EmuHawk/images/FastForward.png
diff --git a/BizHawk.MultiClient/images/FindHS.png b/BizHawk.Client.EmuHawk/images/FindHS.png
similarity index 100%
rename from BizHawk.MultiClient/images/FindHS.png
rename to BizHawk.Client.EmuHawk/images/FindHS.png
diff --git a/BizHawk.MultiClient/images/Forward.png b/BizHawk.Client.EmuHawk/images/Forward.png
similarity index 100%
rename from BizHawk.MultiClient/images/Forward.png
rename to BizHawk.Client.EmuHawk/images/Forward.png
diff --git a/BizHawk.MultiClient/images/ForwardMore.png b/BizHawk.Client.EmuHawk/images/ForwardMore.png
similarity index 100%
rename from BizHawk.MultiClient/images/ForwardMore.png
rename to BizHawk.Client.EmuHawk/images/ForwardMore.png
diff --git a/BizHawk.MultiClient/images/Freeze.ico b/BizHawk.Client.EmuHawk/images/Freeze.ico
similarity index 100%
rename from BizHawk.MultiClient/images/Freeze.ico
rename to BizHawk.Client.EmuHawk/images/Freeze.ico
diff --git a/BizHawk.MultiClient/images/Freeze.png b/BizHawk.Client.EmuHawk/images/Freeze.png
similarity index 100%
rename from BizHawk.MultiClient/images/Freeze.png
rename to BizHawk.Client.EmuHawk/images/Freeze.png
diff --git a/BizHawk.MultiClient/images/Fullscreen.png b/BizHawk.Client.EmuHawk/images/Fullscreen.png
similarity index 100%
rename from BizHawk.MultiClient/images/Fullscreen.png
rename to BizHawk.Client.EmuHawk/images/Fullscreen.png
diff --git a/BizHawk.MultiClient/images/GameController.ico b/BizHawk.Client.EmuHawk/images/GameController.ico
similarity index 100%
rename from BizHawk.MultiClient/images/GameController.ico
rename to BizHawk.Client.EmuHawk/images/GameController.ico
diff --git a/BizHawk.MultiClient/images/GameController.png b/BizHawk.Client.EmuHawk/images/GameController.png
similarity index 100%
rename from BizHawk.MultiClient/images/GameController.png
rename to BizHawk.Client.EmuHawk/images/GameController.png
diff --git a/BizHawk.MultiClient/images/GenesisControllerIcon.png b/BizHawk.Client.EmuHawk/images/GenesisControllerIcon.png
similarity index 100%
rename from BizHawk.MultiClient/images/GenesisControllerIcon.png
rename to BizHawk.Client.EmuHawk/images/GenesisControllerIcon.png
diff --git a/BizHawk.MultiClient/images/GreenCheck.png b/BizHawk.Client.EmuHawk/images/GreenCheck.png
similarity index 100%
rename from BizHawk.MultiClient/images/GreenCheck.png
rename to BizHawk.Client.EmuHawk/images/GreenCheck.png
diff --git a/BizHawk.MultiClient/images/Hack.png b/BizHawk.Client.EmuHawk/images/Hack.png
similarity index 100%
rename from BizHawk.MultiClient/images/Hack.png
rename to BizHawk.Client.EmuHawk/images/Hack.png
diff --git a/BizHawk.MultiClient/images/Help.png b/BizHawk.Client.EmuHawk/images/Help.png
similarity index 100%
rename from BizHawk.MultiClient/images/Help.png
rename to BizHawk.Client.EmuHawk/images/Help.png
diff --git a/BizHawk.MultiClient/images/HomeBrew.png b/BizHawk.Client.EmuHawk/images/HomeBrew.png
similarity index 100%
rename from BizHawk.MultiClient/images/HomeBrew.png
rename to BizHawk.Client.EmuHawk/images/HomeBrew.png
diff --git a/BizHawk.MultiClient/images/HotKeys.ico b/BizHawk.Client.EmuHawk/images/HotKeys.ico
similarity index 100%
rename from BizHawk.MultiClient/images/HotKeys.ico
rename to BizHawk.Client.EmuHawk/images/HotKeys.ico
diff --git a/BizHawk.MultiClient/images/HotKeys.png b/BizHawk.Client.EmuHawk/images/HotKeys.png
similarity index 100%
rename from BizHawk.MultiClient/images/HotKeys.png
rename to BizHawk.Client.EmuHawk/images/HotKeys.png
diff --git a/BizHawk.MultiClient/images/Import.png b/BizHawk.Client.EmuHawk/images/Import.png
similarity index 100%
rename from BizHawk.MultiClient/images/Import.png
rename to BizHawk.Client.EmuHawk/images/Import.png
diff --git a/BizHawk.MultiClient/images/InserSeparator.bmp b/BizHawk.Client.EmuHawk/images/InserSeparator.bmp
similarity index 100%
rename from BizHawk.MultiClient/images/InserSeparator.bmp
rename to BizHawk.Client.EmuHawk/images/InserSeparator.bmp
diff --git a/BizHawk.MultiClient/images/InsertSeparator.png b/BizHawk.Client.EmuHawk/images/InsertSeparator.png
similarity index 100%
rename from BizHawk.MultiClient/images/InsertSeparator.png
rename to BizHawk.Client.EmuHawk/images/InsertSeparator.png
diff --git a/BizHawk.MultiClient/images/LightOff.png b/BizHawk.Client.EmuHawk/images/LightOff.png
similarity index 100%
rename from BizHawk.MultiClient/images/LightOff.png
rename to BizHawk.Client.EmuHawk/images/LightOff.png
diff --git a/BizHawk.MultiClient/images/LightOn.png b/BizHawk.Client.EmuHawk/images/LightOn.png
similarity index 100%
rename from BizHawk.MultiClient/images/LightOn.png
rename to BizHawk.Client.EmuHawk/images/LightOn.png
diff --git a/BizHawk.MultiClient/images/Lightning.ico b/BizHawk.Client.EmuHawk/images/Lightning.ico
similarity index 100%
rename from BizHawk.MultiClient/images/Lightning.ico
rename to BizHawk.Client.EmuHawk/images/Lightning.ico
diff --git a/BizHawk.MultiClient/images/Lightning.png b/BizHawk.Client.EmuHawk/images/Lightning.png
similarity index 100%
rename from BizHawk.MultiClient/images/Lightning.png
rename to BizHawk.Client.EmuHawk/images/Lightning.png
diff --git a/BizHawk.MultiClient/images/LoadConfig.png b/BizHawk.Client.EmuHawk/images/LoadConfig.png
similarity index 100%
rename from BizHawk.MultiClient/images/LoadConfig.png
rename to BizHawk.Client.EmuHawk/images/LoadConfig.png
diff --git a/BizHawk.MultiClient/images/Lua.ico b/BizHawk.Client.EmuHawk/images/Lua.ico
similarity index 100%
rename from BizHawk.MultiClient/images/Lua.ico
rename to BizHawk.Client.EmuHawk/images/Lua.ico
diff --git a/BizHawk.MultiClient/images/Lua.png b/BizHawk.Client.EmuHawk/images/Lua.png
similarity index 100%
rename from BizHawk.MultiClient/images/Lua.png
rename to BizHawk.Client.EmuHawk/images/Lua.png
diff --git a/BizHawk.MultiClient/images/MessageConfig.png b/BizHawk.Client.EmuHawk/images/MessageConfig.png
similarity index 100%
rename from BizHawk.MultiClient/images/MessageConfig.png
rename to BizHawk.Client.EmuHawk/images/MessageConfig.png
diff --git a/BizHawk.MultiClient/images/MoveDown.png b/BizHawk.Client.EmuHawk/images/MoveDown.png
similarity index 100%
rename from BizHawk.MultiClient/images/MoveDown.png
rename to BizHawk.Client.EmuHawk/images/MoveDown.png
diff --git a/BizHawk.MultiClient/images/MoveLeft.png b/BizHawk.Client.EmuHawk/images/MoveLeft.png
similarity index 100%
rename from BizHawk.MultiClient/images/MoveLeft.png
rename to BizHawk.Client.EmuHawk/images/MoveLeft.png
diff --git a/BizHawk.MultiClient/images/MoveRight.png b/BizHawk.Client.EmuHawk/images/MoveRight.png
similarity index 100%
rename from BizHawk.MultiClient/images/MoveRight.png
rename to BizHawk.Client.EmuHawk/images/MoveRight.png
diff --git a/BizHawk.MultiClient/images/MoveUp.png b/BizHawk.Client.EmuHawk/images/MoveUp.png
similarity index 100%
rename from BizHawk.MultiClient/images/MoveUp.png
rename to BizHawk.Client.EmuHawk/images/MoveUp.png
diff --git a/BizHawk.MultiClient/images/NESControllerIcon.png b/BizHawk.Client.EmuHawk/images/NESControllerIcon.png
similarity index 100%
rename from BizHawk.MultiClient/images/NESControllerIcon.png
rename to BizHawk.Client.EmuHawk/images/NESControllerIcon.png
diff --git a/BizHawk.MultiClient/images/NewFile.png b/BizHawk.Client.EmuHawk/images/NewFile.png
similarity index 100%
rename from BizHawk.MultiClient/images/NewFile.png
rename to BizHawk.Client.EmuHawk/images/NewFile.png
diff --git a/BizHawk.MultiClient/images/OpenFile.png b/BizHawk.Client.EmuHawk/images/OpenFile.png
similarity index 100%
rename from BizHawk.MultiClient/images/OpenFile.png
rename to BizHawk.Client.EmuHawk/images/OpenFile.png
diff --git a/BizHawk.MultiClient/images/Paste.png b/BizHawk.Client.EmuHawk/images/Paste.png
similarity index 100%
rename from BizHawk.MultiClient/images/Paste.png
rename to BizHawk.Client.EmuHawk/images/Paste.png
diff --git a/BizHawk.MultiClient/images/Pause.png b/BizHawk.Client.EmuHawk/images/Pause.png
similarity index 100%
rename from BizHawk.MultiClient/images/Pause.png
rename to BizHawk.Client.EmuHawk/images/Pause.png
diff --git a/BizHawk.MultiClient/images/Play.png b/BizHawk.Client.EmuHawk/images/Play.png
similarity index 100%
rename from BizHawk.MultiClient/images/Play.png
rename to BizHawk.Client.EmuHawk/images/Play.png
diff --git a/BizHawk.MultiClient/images/Previous.ico b/BizHawk.Client.EmuHawk/images/Previous.ico
similarity index 100%
rename from BizHawk.MultiClient/images/Previous.ico
rename to BizHawk.Client.EmuHawk/images/Previous.ico
diff --git a/BizHawk.MultiClient/images/Previous.png b/BizHawk.Client.EmuHawk/images/Previous.png
similarity index 100%
rename from BizHawk.MultiClient/images/Previous.png
rename to BizHawk.Client.EmuHawk/images/Previous.png
diff --git a/BizHawk.MultiClient/images/PrintPreviewHS.png b/BizHawk.Client.EmuHawk/images/PrintPreviewHS.png
similarity index 100%
rename from BizHawk.MultiClient/images/PrintPreviewHS.png
rename to BizHawk.Client.EmuHawk/images/PrintPreviewHS.png
diff --git a/BizHawk.MultiClient/images/ReadOnly.png b/BizHawk.Client.EmuHawk/images/ReadOnly.png
similarity index 100%
rename from BizHawk.MultiClient/images/ReadOnly.png
rename to BizHawk.Client.EmuHawk/images/ReadOnly.png
diff --git a/BizHawk.MultiClient/images/Recent.png b/BizHawk.Client.EmuHawk/images/Recent.png
similarity index 100%
rename from BizHawk.MultiClient/images/Recent.png
rename to BizHawk.Client.EmuHawk/images/Recent.png
diff --git a/BizHawk.MultiClient/images/RecordHS.png b/BizHawk.Client.EmuHawk/images/RecordHS.png
similarity index 100%
rename from BizHawk.MultiClient/images/RecordHS.png
rename to BizHawk.Client.EmuHawk/images/RecordHS.png
diff --git a/BizHawk.MultiClient/images/Refresh.bmp b/BizHawk.Client.EmuHawk/images/Refresh.bmp
similarity index 100%
rename from BizHawk.MultiClient/images/Refresh.bmp
rename to BizHawk.Client.EmuHawk/images/Refresh.bmp
diff --git a/BizHawk.MultiClient/images/Refresh.png b/BizHawk.Client.EmuHawk/images/Refresh.png
similarity index 100%
rename from BizHawk.MultiClient/images/Refresh.png
rename to BizHawk.Client.EmuHawk/images/Refresh.png
diff --git a/BizHawk.MultiClient/images/RetroQuestion.png b/BizHawk.Client.EmuHawk/images/RetroQuestion.png
similarity index 100%
rename from BizHawk.MultiClient/images/RetroQuestion.png
rename to BizHawk.Client.EmuHawk/images/RetroQuestion.png
diff --git a/BizHawk.MultiClient/images/SNESControllerIcon.png b/BizHawk.Client.EmuHawk/images/SNESControllerIcon.png
similarity index 100%
rename from BizHawk.MultiClient/images/SNESControllerIcon.png
rename to BizHawk.Client.EmuHawk/images/SNESControllerIcon.png
diff --git a/BizHawk.MultiClient/images/Save.png b/BizHawk.Client.EmuHawk/images/Save.png
similarity index 100%
rename from BizHawk.MultiClient/images/Save.png
rename to BizHawk.Client.EmuHawk/images/Save.png
diff --git a/BizHawk.MultiClient/images/SaveAllHS.png b/BizHawk.Client.EmuHawk/images/SaveAllHS.png
similarity index 100%
rename from BizHawk.MultiClient/images/SaveAllHS.png
rename to BizHawk.Client.EmuHawk/images/SaveAllHS.png
diff --git a/BizHawk.MultiClient/images/SaveAs.png b/BizHawk.Client.EmuHawk/images/SaveAs.png
similarity index 100%
rename from BizHawk.MultiClient/images/SaveAs.png
rename to BizHawk.Client.EmuHawk/images/SaveAs.png
diff --git a/BizHawk.MultiClient/images/SaveConfig.png b/BizHawk.Client.EmuHawk/images/SaveConfig.png
similarity index 100%
rename from BizHawk.MultiClient/images/SaveConfig.png
rename to BizHawk.Client.EmuHawk/images/SaveConfig.png
diff --git a/BizHawk.MultiClient/images/Scan.png b/BizHawk.Client.EmuHawk/images/Scan.png
similarity index 100%
rename from BizHawk.MultiClient/images/Scan.png
rename to BizHawk.Client.EmuHawk/images/Scan.png
diff --git a/BizHawk.MultiClient/images/Stop.png b/BizHawk.Client.EmuHawk/images/Stop.png
similarity index 100%
rename from BizHawk.MultiClient/images/Stop.png
rename to BizHawk.Client.EmuHawk/images/Stop.png
diff --git a/BizHawk.MultiClient/images/TAStudio.png b/BizHawk.Client.EmuHawk/images/TAStudio.png
similarity index 100%
rename from BizHawk.MultiClient/images/TAStudio.png
rename to BizHawk.Client.EmuHawk/images/TAStudio.png
diff --git a/BizHawk.MultiClient/images/ToolBox.ico b/BizHawk.Client.EmuHawk/images/ToolBox.ico
similarity index 100%
rename from BizHawk.MultiClient/images/ToolBox.ico
rename to BizHawk.Client.EmuHawk/images/ToolBox.ico
diff --git a/BizHawk.MultiClient/images/ToolBox.png b/BizHawk.Client.EmuHawk/images/ToolBox.png
similarity index 100%
rename from BizHawk.MultiClient/images/ToolBox.png
rename to BizHawk.Client.EmuHawk/images/ToolBox.png
diff --git a/BizHawk.MultiClient/images/Translation.png b/BizHawk.Client.EmuHawk/images/Translation.png
similarity index 100%
rename from BizHawk.MultiClient/images/Translation.png
rename to BizHawk.Client.EmuHawk/images/Translation.png
diff --git a/BizHawk.MultiClient/images/TruncateFromFile.png b/BizHawk.Client.EmuHawk/images/TruncateFromFile.png
similarity index 100%
rename from BizHawk.MultiClient/images/TruncateFromFile.png
rename to BizHawk.Client.EmuHawk/images/TruncateFromFile.png
diff --git a/BizHawk.MultiClient/images/TruncateFromRW.png b/BizHawk.Client.EmuHawk/images/TruncateFromRW.png
similarity index 100%
rename from BizHawk.MultiClient/images/TruncateFromRW.png
rename to BizHawk.Client.EmuHawk/images/TruncateFromRW.png
diff --git a/BizHawk.MultiClient/images/TurboFastForward.png b/BizHawk.Client.EmuHawk/images/TurboFastForward.png
similarity index 100%
rename from BizHawk.MultiClient/images/TurboFastForward.png
rename to BizHawk.Client.EmuHawk/images/TurboFastForward.png
diff --git a/BizHawk.MultiClient/images/Unfreeze.png b/BizHawk.Client.EmuHawk/images/Unfreeze.png
similarity index 100%
rename from BizHawk.MultiClient/images/Unfreeze.png
rename to BizHawk.Client.EmuHawk/images/Unfreeze.png
diff --git a/BizHawk.MultiClient/images/WarningHS.png b/BizHawk.Client.EmuHawk/images/WarningHS.png
similarity index 100%
rename from BizHawk.MultiClient/images/WarningHS.png
rename to BizHawk.Client.EmuHawk/images/WarningHS.png
diff --git a/BizHawk.MultiClient/images/addWatch.ico b/BizHawk.Client.EmuHawk/images/addWatch.ico
similarity index 100%
rename from BizHawk.MultiClient/images/addWatch.ico
rename to BizHawk.Client.EmuHawk/images/addWatch.ico
diff --git a/BizHawk.MultiClient/images/atari_controller.png b/BizHawk.Client.EmuHawk/images/atari_controller.png
similarity index 100%
rename from BizHawk.MultiClient/images/atari_controller.png
rename to BizHawk.Client.EmuHawk/images/atari_controller.png
diff --git a/BizHawk.MultiClient/images/calculator.ico b/BizHawk.Client.EmuHawk/images/calculator.ico
similarity index 100%
rename from BizHawk.MultiClient/images/calculator.ico
rename to BizHawk.Client.EmuHawk/images/calculator.ico
diff --git a/BizHawk.MultiClient/images/calculator.png b/BizHawk.Client.EmuHawk/images/calculator.png
similarity index 100%
rename from BizHawk.MultiClient/images/calculator.png
rename to BizHawk.Client.EmuHawk/images/calculator.png
diff --git a/BizHawk.MultiClient/images/camera.png b/BizHawk.Client.EmuHawk/images/camera.png
similarity index 100%
rename from BizHawk.MultiClient/images/camera.png
rename to BizHawk.Client.EmuHawk/images/camera.png
diff --git a/BizHawk.MultiClient/images/cheat.png b/BizHawk.Client.EmuHawk/images/cheat.png
similarity index 100%
rename from BizHawk.MultiClient/images/cheat.png
rename to BizHawk.Client.EmuHawk/images/cheat.png
diff --git a/BizHawk.MultiClient/images/console16x16.png b/BizHawk.Client.EmuHawk/images/console16x16.png
similarity index 100%
rename from BizHawk.MultiClient/images/console16x16.png
rename to BizHawk.Client.EmuHawk/images/console16x16.png
diff --git a/BizHawk.MultiClient/images/console32x32.png b/BizHawk.Client.EmuHawk/images/console32x32.png
similarity index 100%
rename from BizHawk.MultiClient/images/console32x32.png
rename to BizHawk.Client.EmuHawk/images/console32x32.png
diff --git a/BizHawk.MultiClient/images/corphawk.ico b/BizHawk.Client.EmuHawk/images/corphawk.ico
similarity index 100%
rename from BizHawk.MultiClient/images/corphawk.ico
rename to BizHawk.Client.EmuHawk/images/corphawk.ico
diff --git a/BizHawk.MultiClient/images/corphawk.jpg b/BizHawk.Client.EmuHawk/images/corphawk.jpg
similarity index 100%
rename from BizHawk.MultiClient/images/corphawk.jpg
rename to BizHawk.Client.EmuHawk/images/corphawk.jpg
diff --git a/BizHawk.MultiClient/images/logo.ico b/BizHawk.Client.EmuHawk/images/logo.ico
similarity index 100%
rename from BizHawk.MultiClient/images/logo.ico
rename to BizHawk.Client.EmuHawk/images/logo.ico
diff --git a/BizHawk.MultiClient/images/monitor.ico b/BizHawk.Client.EmuHawk/images/monitor.ico
similarity index 100%
rename from BizHawk.MultiClient/images/monitor.ico
rename to BizHawk.Client.EmuHawk/images/monitor.ico
diff --git a/BizHawk.MultiClient/images/monitor.png b/BizHawk.Client.EmuHawk/images/monitor.png
similarity index 100%
rename from BizHawk.MultiClient/images/monitor.png
rename to BizHawk.Client.EmuHawk/images/monitor.png
diff --git a/BizHawk.MultiClient/images/pencil.ico b/BizHawk.Client.EmuHawk/images/pencil.ico
similarity index 100%
rename from BizHawk.MultiClient/images/pencil.ico
rename to BizHawk.Client.EmuHawk/images/pencil.ico
diff --git a/BizHawk.MultiClient/images/pencil.png b/BizHawk.Client.EmuHawk/images/pencil.png
similarity index 100%
rename from BizHawk.MultiClient/images/pencil.png
rename to BizHawk.Client.EmuHawk/images/pencil.png
diff --git a/BizHawk.MultiClient/images/poke.ico b/BizHawk.Client.EmuHawk/images/poke.ico
similarity index 100%
rename from BizHawk.MultiClient/images/poke.ico
rename to BizHawk.Client.EmuHawk/images/poke.ico
diff --git a/BizHawk.MultiClient/images/poke.png b/BizHawk.Client.EmuHawk/images/poke.png
similarity index 100%
rename from BizHawk.MultiClient/images/poke.png
rename to BizHawk.Client.EmuHawk/images/poke.png
diff --git a/BizHawk.MultiClient/images/reboot.png b/BizHawk.Client.EmuHawk/images/reboot.png
similarity index 100%
rename from BizHawk.MultiClient/images/reboot.png
rename to BizHawk.Client.EmuHawk/images/reboot.png
diff --git a/BizHawk.MultiClient/images/redo.png b/BizHawk.Client.EmuHawk/images/redo.png
similarity index 100%
rename from BizHawk.MultiClient/images/redo.png
rename to BizHawk.Client.EmuHawk/images/redo.png
diff --git a/BizHawk.MultiClient/images/restart.png b/BizHawk.Client.EmuHawk/images/restart.png
similarity index 100%
rename from BizHawk.MultiClient/images/restart.png
rename to BizHawk.Client.EmuHawk/images/restart.png
diff --git a/BizHawk.MultiClient/images/search.ico b/BizHawk.Client.EmuHawk/images/search.ico
similarity index 100%
rename from BizHawk.MultiClient/images/search.ico
rename to BizHawk.Client.EmuHawk/images/search.ico
diff --git a/BizHawk.MultiClient/images/search.png b/BizHawk.Client.EmuHawk/images/search.png
similarity index 100%
rename from BizHawk.MultiClient/images/search.png
rename to BizHawk.Client.EmuHawk/images/search.png
diff --git a/BizHawk.MultiClient/images/textdoc.ico b/BizHawk.Client.EmuHawk/images/textdoc.ico
similarity index 100%
rename from BizHawk.MultiClient/images/textdoc.ico
rename to BizHawk.Client.EmuHawk/images/textdoc.ico
diff --git a/BizHawk.MultiClient/images/textdoc.png b/BizHawk.Client.EmuHawk/images/textdoc.png
similarity index 100%
rename from BizHawk.MultiClient/images/textdoc.png
rename to BizHawk.Client.EmuHawk/images/textdoc.png
diff --git a/BizHawk.MultiClient/images/undo.png b/BizHawk.Client.EmuHawk/images/undo.png
similarity index 100%
rename from BizHawk.MultiClient/images/undo.png
rename to BizHawk.Client.EmuHawk/images/undo.png
diff --git a/BizHawk.MultiClient/images/watch.ico b/BizHawk.Client.EmuHawk/images/watch.ico
similarity index 100%
rename from BizHawk.MultiClient/images/watch.ico
rename to BizHawk.Client.EmuHawk/images/watch.ico
diff --git a/BizHawk.MultiClient/images/whiteTriDown.png b/BizHawk.Client.EmuHawk/images/whiteTriDown.png
similarity index 100%
rename from BizHawk.MultiClient/images/whiteTriDown.png
rename to BizHawk.Client.EmuHawk/images/whiteTriDown.png
diff --git a/BizHawk.MultiClient/images/whiteTriLeft.png b/BizHawk.Client.EmuHawk/images/whiteTriLeft.png
similarity index 100%
rename from BizHawk.MultiClient/images/whiteTriLeft.png
rename to BizHawk.Client.EmuHawk/images/whiteTriLeft.png
diff --git a/BizHawk.MultiClient/images/whiteTriRight.png b/BizHawk.Client.EmuHawk/images/whiteTriRight.png
similarity index 100%
rename from BizHawk.MultiClient/images/whiteTriRight.png
rename to BizHawk.Client.EmuHawk/images/whiteTriRight.png
diff --git a/BizHawk.MultiClient/images/whiteTriUp.png b/BizHawk.Client.EmuHawk/images/whiteTriUp.png
similarity index 100%
rename from BizHawk.MultiClient/images/whiteTriUp.png
rename to BizHawk.Client.EmuHawk/images/whiteTriUp.png
diff --git a/BizHawk.MultiClient/lua51.dll b/BizHawk.Client.EmuHawk/lua51.dll
similarity index 100%
rename from BizHawk.MultiClient/lua51.dll
rename to BizHawk.Client.EmuHawk/lua51.dll
diff --git a/BizHawk.MultiClient/movie/EditCommentsForm.Designer.cs b/BizHawk.Client.EmuHawk/movie/EditCommentsForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/EditCommentsForm.Designer.cs
rename to BizHawk.Client.EmuHawk/movie/EditCommentsForm.Designer.cs
diff --git a/BizHawk.MultiClient/movie/EditCommentsForm.cs b/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/EditCommentsForm.cs
rename to BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs
diff --git a/BizHawk.MultiClient/movie/EditCommentsForm.resx b/BizHawk.Client.EmuHawk/movie/EditCommentsForm.resx
similarity index 100%
rename from BizHawk.MultiClient/movie/EditCommentsForm.resx
rename to BizHawk.Client.EmuHawk/movie/EditCommentsForm.resx
diff --git a/BizHawk.MultiClient/movie/EditSubtitlesForm.Designer.cs b/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/EditSubtitlesForm.Designer.cs
rename to BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs
diff --git a/BizHawk.MultiClient/movie/EditSubtitlesForm.cs b/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/EditSubtitlesForm.cs
rename to BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs
diff --git a/BizHawk.MultiClient/movie/EditSubtitlesForm.resx b/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.resx
similarity index 100%
rename from BizHawk.MultiClient/movie/EditSubtitlesForm.resx
rename to BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.resx
diff --git a/BizHawk.MultiClient/movie/PlayMovie.Designer.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/PlayMovie.Designer.cs
rename to BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs
diff --git a/BizHawk.MultiClient/movie/PlayMovie.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/PlayMovie.cs
rename to BizHawk.Client.EmuHawk/movie/PlayMovie.cs
diff --git a/BizHawk.MultiClient/movie/PlayMovie.resx b/BizHawk.Client.EmuHawk/movie/PlayMovie.resx
similarity index 100%
rename from BizHawk.MultiClient/movie/PlayMovie.resx
rename to BizHawk.Client.EmuHawk/movie/PlayMovie.resx
diff --git a/BizHawk.MultiClient/movie/RecordMovie.Designer.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/RecordMovie.Designer.cs
rename to BizHawk.Client.EmuHawk/movie/RecordMovie.Designer.cs
diff --git a/BizHawk.MultiClient/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/RecordMovie.cs
rename to BizHawk.Client.EmuHawk/movie/RecordMovie.cs
diff --git a/BizHawk.MultiClient/movie/RecordMovie.resx b/BizHawk.Client.EmuHawk/movie/RecordMovie.resx
similarity index 100%
rename from BizHawk.MultiClient/movie/RecordMovie.resx
rename to BizHawk.Client.EmuHawk/movie/RecordMovie.resx
diff --git a/BizHawk.MultiClient/movie/SubtitleMaker.Designer.cs b/BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/SubtitleMaker.Designer.cs
rename to BizHawk.Client.EmuHawk/movie/SubtitleMaker.Designer.cs
diff --git a/BizHawk.MultiClient/movie/SubtitleMaker.cs b/BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs
similarity index 100%
rename from BizHawk.MultiClient/movie/SubtitleMaker.cs
rename to BizHawk.Client.EmuHawk/movie/SubtitleMaker.cs
diff --git a/BizHawk.MultiClient/movie/SubtitleMaker.resx b/BizHawk.Client.EmuHawk/movie/SubtitleMaker.resx
similarity index 100%
rename from BizHawk.MultiClient/movie/SubtitleMaker.resx
rename to BizHawk.Client.EmuHawk/movie/SubtitleMaker.resx
diff --git a/BizHawk.MultiClient/output/7z.dll b/BizHawk.Client.EmuHawk/output/7z.dll
similarity index 100%
rename from BizHawk.MultiClient/output/7z.dll
rename to BizHawk.Client.EmuHawk/output/7z.dll
diff --git a/BizHawk.MultiClient/output/Firmware/BIOS_Info.txt b/BizHawk.Client.EmuHawk/output/Firmware/BIOS_Info.txt
similarity index 100%
rename from BizHawk.MultiClient/output/Firmware/BIOS_Info.txt
rename to BizHawk.Client.EmuHawk/output/Firmware/BIOS_Info.txt
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/ALLEY WAY.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ALLEY WAY.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/ALLEY WAY.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ALLEY WAY.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/ASTEROIDS&MISCMD.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ASTEROIDS&MISCMD.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/ASTEROIDS&MISCMD.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ASTEROIDS&MISCMD.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/BA.TOSHINDEN.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BA.TOSHINDEN.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/BA.TOSHINDEN.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BA.TOSHINDEN.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/BALLOON KID.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BALLOON KID.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/BALLOON KID.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BALLOON KID.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/BASEBALL.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BASEBALL.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/BASEBALL.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BASEBALL.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/BGB (lcd green).pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BGB (lcd green).pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/BGB (lcd green).pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BGB (lcd green).pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/BOY AND BLOB GB1.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BOY AND BLOB GB1.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/BOY AND BLOB GB1.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BOY AND BLOB GB1.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/BOY AND BLOB GB2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BOY AND BLOB GB2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/BOY AND BLOB GB2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BOY AND BLOB GB2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/BT2RAGNAROKWORLD.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BT2RAGNAROKWORLD.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/BT2RAGNAROKWORLD.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/BT2RAGNAROKWORLD.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/DEFENDER&JOUST.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DEFENDER&JOUST.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/DEFENDER&JOUST.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DEFENDER&JOUST.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/DMG FOOTBALL.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DMG FOOTBALL.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/DMG FOOTBALL.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DMG FOOTBALL.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/DONKEY KONG.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEY KONG.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/DONKEY KONG.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEY KONG.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/DONKEYKONGLAND 2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEYKONGLAND 2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/DONKEYKONGLAND 2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEYKONGLAND 2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/DONKEYKONGLAND 3.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEYKONGLAND 3.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/DONKEYKONGLAND 3.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEYKONGLAND 3.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/DONKEYKONGLAND.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEYKONGLAND.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/DONKEYKONGLAND.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEYKONGLAND.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/DONKEYKONGLAND95.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEYKONGLAND95.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/DONKEYKONGLAND95.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DONKEYKONGLAND95.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/DR.MARIO.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DR.MARIO.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/DR.MARIO.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DR.MARIO.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/DYNABLASTER.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DYNABLASTER.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/DYNABLASTER.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/DYNABLASTER.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/F1RACE.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/F1RACE.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/F1RACE.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/F1RACE.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/G&W GALLERY.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/G&W GALLERY.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/G&W GALLERY.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/G&W GALLERY.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GALAGA&GALAXIAN.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GALAGA&GALAXIAN.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GALAGA&GALAXIAN.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GALAGA&GALAXIAN.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GAME&WATCH.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GAME&WATCH.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GAME&WATCH.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GAME&WATCH.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GAMEBOY GALLERY.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GAMEBOY GALLERY.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GAMEBOY GALLERY.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GAMEBOY GALLERY.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GAMEBOY GALLERY2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GAMEBOY GALLERY2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GAMEBOY GALLERY2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GAMEBOY GALLERY2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Blue.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Blue.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Blue.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Blue.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Brown.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Brown.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Brown.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Brown.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Dark Blue.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Dark Blue.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Dark Blue.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Dark Blue.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Dark Brown.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Dark Brown.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Dark Brown.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Dark Brown.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Dark Green.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Dark Green.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Dark Green.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Dark Green.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Grayscale.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Grayscale.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Grayscale.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Grayscale.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Green.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Green.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Green.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Green.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Inverted.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Inverted.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Inverted.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Inverted.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Orange.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Orange.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Orange.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Orange.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Pastel Mix.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Pastel Mix.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Pastel Mix.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Pastel Mix.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Red.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Red.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Red.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Red.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Yellow.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Yellow.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBC - Yellow.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBC - Yellow.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GBWARS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBWARS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GBWARS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GBWARS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/GOLF.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GOLF.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/GOLF.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/GOLF.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/Game and Watch 2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/Game and Watch 2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/Game and Watch 2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/Game and Watch 2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/HOSHINOKA-BI.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/HOSHINOKA-BI.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/HOSHINOKA-BI.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/HOSHINOKA-BI.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/JAMES  BOND  007.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/JAMES  BOND  007.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/JAMES  BOND  007.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/JAMES  BOND  007.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KAERUNOTAMENI.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KAERUNOTAMENI.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KAERUNOTAMENI.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KAERUNOTAMENI.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KEN GRIFFEY JR.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KEN GRIFFEY JR.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KEN GRIFFEY JR.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KEN GRIFFEY JR.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KID ICARUS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KID ICARUS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KID ICARUS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KID ICARUS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KILLERINSTINCT95.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KILLERINSTINCT95.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KILLERINSTINCT95.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KILLERINSTINCT95.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KINGOFTHEZOO.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KINGOFTHEZOO.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KINGOFTHEZOO.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KINGOFTHEZOO.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KIRAKIRA KIDS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRAKIRA KIDS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KIRAKIRA KIDS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRAKIRA KIDS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KIRBY BLOCKBALL.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRBY BLOCKBALL.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KIRBY BLOCKBALL.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRBY BLOCKBALL.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KIRBY DREAM LAND.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRBY DREAM LAND.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KIRBY DREAM LAND.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRBY DREAM LAND.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KIRBY'S PINBALL.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRBY'S PINBALL.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KIRBY'S PINBALL.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRBY'S PINBALL.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/KIRBY2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRBY2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/KIRBY2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/KIRBY2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/LOLO2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/LOLO2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/LOLO2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/LOLO2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MAGNETIC SOCCER.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MAGNETIC SOCCER.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MAGNETIC SOCCER.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MAGNETIC SOCCER.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MANSELL.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MANSELL.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MANSELL.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MANSELL.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MARIO & YOSHI.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MARIO & YOSHI.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MARIO & YOSHI.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MARIO & YOSHI.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MARIO'S PICROSS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MARIO'S PICROSS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MARIO'S PICROSS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MARIO'S PICROSS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MARIOLAND2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MARIOLAND2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MARIOLAND2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MARIOLAND2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MEGA MAN 2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MEGA MAN 2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MEGA MAN 2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MEGA MAN 2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MEGAMAN.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MEGAMAN.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MEGAMAN.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MEGAMAN.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MEGAMAN3.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MEGAMAN3.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MEGAMAN3.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MEGAMAN3.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/METROID2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/METROID2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/METROID2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/METROID2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MILLI&CENTI&PEDE.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MILLI&CENTI&PEDE.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MILLI&CENTI&PEDE.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MILLI&CENTI&PEDE.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MOGURANYA.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MOGURANYA.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MOGURANYA.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MOGURANYA.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/MYSTIC QUEST.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MYSTIC QUEST.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/MYSTIC QUEST.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/MYSTIC QUEST.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/NETTOU KOF 95.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/NETTOU KOF 95.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/NETTOU KOF 95.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/NETTOU KOF 95.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/NEW CHESSMASTER.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/NEW CHESSMASTER.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/NEW CHESSMASTER.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/NEW CHESSMASTER.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/OTHELLO.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/OTHELLO.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/OTHELLO.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/OTHELLO.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/PAC-IN-TIME.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/PAC-IN-TIME.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/PAC-IN-TIME.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/PAC-IN-TIME.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/PICROSS 2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/PICROSS 2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/PICROSS 2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/PICROSS 2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/PINOCCHIO.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/PINOCCHIO.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/PINOCCHIO.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/PINOCCHIO.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/POKEBOM.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEBOM.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/POKEBOM.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEBOM.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/POKEMON BLUE.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEMON BLUE.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/POKEMON BLUE.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEMON BLUE.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/POKEMON GREEN.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEMON GREEN.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/POKEMON GREEN.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEMON GREEN.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/POKEMON RED.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEMON RED.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/POKEMON RED.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEMON RED.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/POKEMON YELLOW.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEMON YELLOW.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/POKEMON YELLOW.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/POKEMON YELLOW.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/QIX.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/QIX.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/QIX.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/QIX.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/RADARMISSION.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/RADARMISSION.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/RADARMISSION.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/RADARMISSION.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/ROCKMAN WORLD.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ROCKMAN WORLD.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/ROCKMAN WORLD.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ROCKMAN WORLD.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/ROCKMAN WORLD2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ROCKMAN WORLD2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/ROCKMAN WORLD2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ROCKMAN WORLD2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/ROCKMANWORLD3.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ROCKMANWORLD3.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/ROCKMANWORLD3.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ROCKMANWORLD3.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/SEIKEN DENSETSU.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SEIKEN DENSETSU.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/SEIKEN DENSETSU.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SEIKEN DENSETSU.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/SOCCER.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SOCCER.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/SOCCER.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SOCCER.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/SOLARSTRIKER.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SOLARSTRIKER.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/SOLARSTRIKER.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SOLARSTRIKER.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/SPACE INVADERS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SPACE INVADERS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/SPACE INVADERS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SPACE INVADERS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/STAR STACKER.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/STAR STACKER.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/STAR STACKER.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/STAR STACKER.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/STAR WARS-NOA.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/STAR WARS-NOA.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/STAR WARS-NOA.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/STAR WARS-NOA.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/STAR WARS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/STAR WARS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/STAR WARS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/STAR WARS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/STREET FIGHTER 2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/STREET FIGHTER 2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/STREET FIGHTER 2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/STREET FIGHTER 2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/SUPER MARIOLAND.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SUPER MARIOLAND.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/SUPER MARIOLAND.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SUPER MARIOLAND.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/SUPER RC PRO-AM.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SUPER RC PRO-AM.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/SUPER RC PRO-AM.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SUPER RC PRO-AM.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/SUPERDONKEYKONG.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SUPERDONKEYKONG.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/SUPERDONKEYKONG.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SUPERDONKEYKONG.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/SUPERMARIOLAND3.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SUPERMARIOLAND3.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/SUPERMARIOLAND3.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/SUPERMARIOLAND3.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TENNIS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TENNIS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TENNIS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TENNIS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS ATTACK.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS ATTACK.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS ATTACK.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS ATTACK.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS BLAST.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS BLAST.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS BLAST.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS BLAST.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS FLASH.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS FLASH.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS FLASH.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS FLASH.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS PLUS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS PLUS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS PLUS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS PLUS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TETRIS2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TETRIS2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/THE CHESSMASTER.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/THE CHESSMASTER.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/THE CHESSMASTER.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/THE CHESSMASTER.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TOPRANKINGTENNIS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TOPRANKINGTENNIS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TOPRANKINGTENNIS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TOPRANKINGTENNIS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TOPRANKTENNIS.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TOPRANKTENNIS.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TOPRANKTENNIS.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TOPRANKTENNIS.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TOY STORY.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TOY STORY.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TOY STORY.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TOY STORY.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/TRIP WORLD.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TRIP WORLD.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/TRIP WORLD.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/TRIP WORLD.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/VEGAS STAKES.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/VEGAS STAKES.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/VEGAS STAKES.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/VEGAS STAKES.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/WARIO BLAST.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/WARIO BLAST.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/WARIO BLAST.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/WARIO BLAST.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/WARIOLAND2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/WARIOLAND2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/WARIOLAND2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/WARIOLAND2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/WAVERACE.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/WAVERACE.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/WAVERACE.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/WAVERACE.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/WORLD CUP.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/WORLD CUP.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/WORLD CUP.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/WORLD CUP.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/X.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/X.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/X.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/X.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/YAKUMAN.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YAKUMAN.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/YAKUMAN.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YAKUMAN.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/YOSHI'S COOKIE.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YOSHI'S COOKIE.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/YOSHI'S COOKIE.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YOSHI'S COOKIE.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/YOSSY NO COOKIE.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YOSSY NO COOKIE.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/YOSSY NO COOKIE.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YOSSY NO COOKIE.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/YOSSY NO PANEPON.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YOSSY NO PANEPON.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/YOSSY NO PANEPON.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YOSSY NO PANEPON.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/YOSSY NO TAMAGO.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YOSSY NO TAMAGO.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/YOSSY NO TAMAGO.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/YOSSY NO TAMAGO.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/ZELDA.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ZELDA.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/ZELDA.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ZELDA.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/ZELDA2.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ZELDA2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/ZELDA2.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/ZELDA2.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/bsnes v087.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/bsnes v087.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/bsnes v087.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/bsnes v087.pal
diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/default.pal b/BizHawk.Client.EmuHawk/output/Gameboy/Palettes/default.pal
similarity index 100%
rename from BizHawk.MultiClient/output/Gameboy/Palettes/default.pal
rename to BizHawk.Client.EmuHawk/output/Gameboy/Palettes/default.pal
diff --git a/BizHawk.MultiClient/output/Lua/ButtonCount.lua b/BizHawk.Client.EmuHawk/output/Lua/ButtonCount.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/ButtonCount.lua
rename to BizHawk.Client.EmuHawk/output/Lua/ButtonCount.lua
diff --git a/BizHawk.MultiClient/output/Lua/Genesis/Castlevania Bloodlines.lua b/BizHawk.Client.EmuHawk/output/Lua/Genesis/Castlevania Bloodlines.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/Genesis/Castlevania Bloodlines.lua
rename to BizHawk.Client.EmuHawk/output/Lua/Genesis/Castlevania Bloodlines.lua
diff --git a/BizHawk.MultiClient/output/Lua/Genesis/Legend of Toki.lua b/BizHawk.Client.EmuHawk/output/Lua/Genesis/Legend of Toki.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/Genesis/Legend of Toki.lua
rename to BizHawk.Client.EmuHawk/output/Lua/Genesis/Legend of Toki.lua
diff --git a/BizHawk.MultiClient/output/Lua/N64/M64_reader.lua b/BizHawk.Client.EmuHawk/output/Lua/N64/M64_reader.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/N64/M64_reader.lua
rename to BizHawk.Client.EmuHawk/output/Lua/N64/M64_reader.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Castlevania.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Castlevania.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Castlevania.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Castlevania.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Contra force.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Contra force.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Contra force.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Contra force.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Crystalis.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Crystalis.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Crystalis.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Crystalis.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Faxandu.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Faxandu.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Faxandu.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Faxandu.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Holy Diver.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Holy Diver.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Holy Diver.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Holy Diver.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Megaman 4.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Megaman 4.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Megaman 4.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Megaman 4.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/NinjaGaiden_Hitbox.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/NinjaGaiden_Hitbox.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/NinjaGaiden_Hitbox.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/NinjaGaiden_Hitbox.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/PunchOutStats.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/PunchOutStats.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/PunchOutStats.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/PunchOutStats.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/RBIBaseball.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/RBIBaseball.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/RBIBaseball.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/RBIBaseball.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/SMB2U.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/SMB2U.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/SMB2U.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/SMB2U.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Simons Quest.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Simons Quest.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Simons Quest.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Simons Quest.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Snake Rattle N' Roll.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Snake Rattle N' Roll.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Snake Rattle N' Roll.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Snake Rattle N' Roll.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Super C.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Super C.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Super C.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Super C.lua
diff --git a/BizHawk.MultiClient/output/Lua/NES/Vice Project Doom.lua b/BizHawk.Client.EmuHawk/output/Lua/NES/Vice Project Doom.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/NES/Vice Project Doom.lua
rename to BizHawk.Client.EmuHawk/output/Lua/NES/Vice Project Doom.lua
diff --git a/BizHawk.MultiClient/output/Lua/PCE/Castlevania_Rondo_of_Blood.lua b/BizHawk.Client.EmuHawk/output/Lua/PCE/Castlevania_Rondo_of_Blood.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/PCE/Castlevania_Rondo_of_Blood.lua
rename to BizHawk.Client.EmuHawk/output/Lua/PCE/Castlevania_Rondo_of_Blood.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Congo's Caper.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Congo's Caper.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Congo's Caper.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Congo's Caper.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Contra 3.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Contra 3.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Contra 3.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Contra 3.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Donkey Kong Country 3.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Donkey Kong Country 3.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Donkey Kong Country 3.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Donkey Kong Country 3.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Megaman X.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Megaman X.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Megaman X.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Megaman X.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Megaman X2.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Megaman X2.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Megaman X2.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Megaman X2.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Megaman X3.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Megaman X3.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Megaman X3.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Megaman X3.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Rockman & Forte.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Rockman & Forte.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Rockman & Forte.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Rockman & Forte.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Super Castlevania 4.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Super Castlevania 4.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Super Castlevania 4.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Super Castlevania 4.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Super Ghouls N Ghost.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Super Ghouls N Ghost.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Super Ghouls N Ghost.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Super Ghouls N Ghost.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Super Mario World.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Super Mario World.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Super Mario World.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Super Mario World.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Super Metroid.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Super Metroid.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Super Metroid.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Super Metroid.lua
diff --git a/BizHawk.MultiClient/output/Lua/SNES/Y's III.lua b/BizHawk.Client.EmuHawk/output/Lua/SNES/Y's III.lua
similarity index 100%
rename from BizHawk.MultiClient/output/Lua/SNES/Y's III.lua
rename to BizHawk.Client.EmuHawk/output/Lua/SNES/Y's III.lua
diff --git a/BizHawk.MultiClient/output/MakeRelease.bat b/BizHawk.Client.EmuHawk/output/MakeRelease.bat
similarity index 100%
rename from BizHawk.MultiClient/output/MakeRelease.bat
rename to BizHawk.Client.EmuHawk/output/MakeRelease.bat
diff --git a/BizHawk.MultiClient/output/NES/Palettes/ASQ_realityA.pal b/BizHawk.Client.EmuHawk/output/NES/Palettes/ASQ_realityA.pal
similarity index 100%
rename from BizHawk.MultiClient/output/NES/Palettes/ASQ_realityA.pal
rename to BizHawk.Client.EmuHawk/output/NES/Palettes/ASQ_realityA.pal
diff --git a/BizHawk.MultiClient/output/NES/Palettes/ASQ_realityB.pal b/BizHawk.Client.EmuHawk/output/NES/Palettes/ASQ_realityB.pal
similarity index 100%
rename from BizHawk.MultiClient/output/NES/Palettes/ASQ_realityB.pal
rename to BizHawk.Client.EmuHawk/output/NES/Palettes/ASQ_realityB.pal
diff --git a/BizHawk.MultiClient/output/NES/Palettes/BMF_final2.pal b/BizHawk.Client.EmuHawk/output/NES/Palettes/BMF_final2.pal
similarity index 100%
rename from BizHawk.MultiClient/output/NES/Palettes/BMF_final2.pal
rename to BizHawk.Client.EmuHawk/output/NES/Palettes/BMF_final2.pal
diff --git a/BizHawk.MultiClient/output/NES/Palettes/BMF_final3.pal b/BizHawk.Client.EmuHawk/output/NES/Palettes/BMF_final3.pal
similarity index 100%
rename from BizHawk.MultiClient/output/NES/Palettes/BMF_final3.pal
rename to BizHawk.Client.EmuHawk/output/NES/Palettes/BMF_final3.pal
diff --git a/BizHawk.MultiClient/output/NES/Palettes/FCEU-13-default_nitsuja.pal b/BizHawk.Client.EmuHawk/output/NES/Palettes/FCEU-13-default_nitsuja.pal
similarity index 100%
rename from BizHawk.MultiClient/output/NES/Palettes/FCEU-13-default_nitsuja.pal
rename to BizHawk.Client.EmuHawk/output/NES/Palettes/FCEU-13-default_nitsuja.pal
diff --git a/BizHawk.MultiClient/output/NES/Palettes/FCEU-15-nitsuja_new.pal b/BizHawk.Client.EmuHawk/output/NES/Palettes/FCEU-15-nitsuja_new.pal
similarity index 100%
rename from BizHawk.MultiClient/output/NES/Palettes/FCEU-15-nitsuja_new.pal
rename to BizHawk.Client.EmuHawk/output/NES/Palettes/FCEU-15-nitsuja_new.pal
diff --git a/BizHawk.MultiClient/output/NES/Palettes/FCEUX.pal b/BizHawk.Client.EmuHawk/output/NES/Palettes/FCEUX.pal
similarity index 100%
rename from BizHawk.MultiClient/output/NES/Palettes/FCEUX.pal
rename to BizHawk.Client.EmuHawk/output/NES/Palettes/FCEUX.pal
diff --git a/BizHawk.MultiClient/output/NES/Palettes/SONY_CXA2025AS_US.pal b/BizHawk.Client.EmuHawk/output/NES/Palettes/SONY_CXA2025AS_US.pal
similarity index 100%
rename from BizHawk.MultiClient/output/NES/Palettes/SONY_CXA2025AS_US.pal
rename to BizHawk.Client.EmuHawk/output/NES/Palettes/SONY_CXA2025AS_US.pal
diff --git a/BizHawk.MultiClient/output/PSP/assets/icon-114.png b/BizHawk.Client.EmuHawk/output/PSP/assets/icon-114.png
similarity index 100%
rename from BizHawk.MultiClient/output/PSP/assets/icon-114.png
rename to BizHawk.Client.EmuHawk/output/PSP/assets/icon-114.png
diff --git a/BizHawk.MultiClient/output/PSP/assets/icon.svg b/BizHawk.Client.EmuHawk/output/PSP/assets/icon.svg
similarity index 100%
rename from BizHawk.MultiClient/output/PSP/assets/icon.svg
rename to BizHawk.Client.EmuHawk/output/PSP/assets/icon.svg
diff --git a/BizHawk.MultiClient/output/PSP/assets/ppge_atlas.zim b/BizHawk.Client.EmuHawk/output/PSP/assets/ppge_atlas.zim
similarity index 100%
rename from BizHawk.MultiClient/output/PSP/assets/ppge_atlas.zim
rename to BizHawk.Client.EmuHawk/output/PSP/assets/ppge_atlas.zim
diff --git a/BizHawk.MultiClient/output/PSP/assets/ui_atlas.zim b/BizHawk.Client.EmuHawk/output/PSP/assets/ui_atlas.zim
similarity index 100%
rename from BizHawk.MultiClient/output/PSP/assets/ui_atlas.zim
rename to BizHawk.Client.EmuHawk/output/PSP/assets/ui_atlas.zim
diff --git a/BizHawk.MultiClient/output/PSP/assets/unknown.png b/BizHawk.Client.EmuHawk/output/PSP/assets/unknown.png
similarity index 100%
rename from BizHawk.MultiClient/output/PSP/assets/unknown.png
rename to BizHawk.Client.EmuHawk/output/PSP/assets/unknown.png
diff --git a/BizHawk.MultiClient/output/defctrl.json b/BizHawk.Client.EmuHawk/output/defctrl.json
similarity index 100%
rename from BizHawk.MultiClient/output/defctrl.json
rename to BizHawk.Client.EmuHawk/output/defctrl.json
diff --git a/BizHawk.MultiClient/output/dll/EMU7800.dll b/BizHawk.Client.EmuHawk/output/dll/EMU7800.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/EMU7800.dll
rename to BizHawk.Client.EmuHawk/output/dll/EMU7800.dll
diff --git a/BizHawk.MultiClient/output/dll/MusashiDLL.dll b/BizHawk.Client.EmuHawk/output/dll/MusashiDLL.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/MusashiDLL.dll
rename to BizHawk.Client.EmuHawk/output/dll/MusashiDLL.dll
diff --git a/BizHawk.MultiClient/output/dll/PPSSPPBizhawk.dll b/BizHawk.Client.EmuHawk/output/dll/PPSSPPBizhawk.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/PPSSPPBizhawk.dll
rename to BizHawk.Client.EmuHawk/output/dll/PPSSPPBizhawk.dll
diff --git a/BizHawk.MultiClient/output/dll/SDL.dll b/BizHawk.Client.EmuHawk/output/dll/SDL.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/SDL.dll
rename to BizHawk.Client.EmuHawk/output/dll/SDL.dll
diff --git a/BizHawk.MultiClient/output/dll/at3plusdecoder.dll b/BizHawk.Client.EmuHawk/output/dll/at3plusdecoder.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/at3plusdecoder.dll
rename to BizHawk.Client.EmuHawk/output/dll/at3plusdecoder.dll
diff --git a/BizHawk.MultiClient/output/dll/blip_buf.dll b/BizHawk.Client.EmuHawk/output/dll/blip_buf.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/blip_buf.dll
rename to BizHawk.Client.EmuHawk/output/dll/blip_buf.dll
diff --git a/BizHawk.MultiClient/output/dll/ffmpeg.exe b/BizHawk.Client.EmuHawk/output/dll/ffmpeg.exe
similarity index 100%
rename from BizHawk.MultiClient/output/dll/ffmpeg.exe
rename to BizHawk.Client.EmuHawk/output/dll/ffmpeg.exe
diff --git a/BizHawk.MultiClient/output/dll/ffmpeg_readme.txt b/BizHawk.Client.EmuHawk/output/dll/ffmpeg_readme.txt
similarity index 100%
rename from BizHawk.MultiClient/output/dll/ffmpeg_readme.txt
rename to BizHawk.Client.EmuHawk/output/dll/ffmpeg_readme.txt
diff --git a/BizHawk.MultiClient/output/dll/freetype6.dll b/BizHawk.Client.EmuHawk/output/dll/freetype6.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/freetype6.dll
rename to BizHawk.Client.EmuHawk/output/dll/freetype6.dll
diff --git a/BizHawk.MultiClient/output/dll/libco_msvc_win32.dll b/BizHawk.Client.EmuHawk/output/dll/libco_msvc_win32.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libco_msvc_win32.dll
rename to BizHawk.Client.EmuHawk/output/dll/libco_msvc_win32.dll
diff --git a/BizHawk.MultiClient/output/dll/libgambatte.dll b/BizHawk.Client.EmuHawk/output/dll/libgambatte.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libgambatte.dll
rename to BizHawk.Client.EmuHawk/output/dll/libgambatte.dll
diff --git a/BizHawk.MultiClient/output/dll/libmednahawk.dll b/BizHawk.Client.EmuHawk/output/dll/libmednahawk.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libmednahawk.dll
rename to BizHawk.Client.EmuHawk/output/dll/libmednahawk.dll
diff --git a/BizHawk.MultiClient/output/dll/libmeteor.dll b/BizHawk.Client.EmuHawk/output/dll/libmeteor.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libmeteor.dll
rename to BizHawk.Client.EmuHawk/output/dll/libmeteor.dll
diff --git a/BizHawk.MultiClient/output/dll/libpng12.dll b/BizHawk.Client.EmuHawk/output/dll/libpng12.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libpng12.dll
rename to BizHawk.Client.EmuHawk/output/dll/libpng12.dll
diff --git a/BizHawk.MultiClient/output/dll/libsneshawk-32-compatibility.exe b/BizHawk.Client.EmuHawk/output/dll/libsneshawk-32-compatibility.exe
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libsneshawk-32-compatibility.exe
rename to BizHawk.Client.EmuHawk/output/dll/libsneshawk-32-compatibility.exe
diff --git a/BizHawk.MultiClient/output/dll/libsneshawk-32-performance.exe b/BizHawk.Client.EmuHawk/output/dll/libsneshawk-32-performance.exe
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libsneshawk-32-performance.exe
rename to BizHawk.Client.EmuHawk/output/dll/libsneshawk-32-performance.exe
diff --git a/BizHawk.MultiClient/output/dll/libsneshawk-64-compatibility.exe b/BizHawk.Client.EmuHawk/output/dll/libsneshawk-64-compatibility.exe
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libsneshawk-64-compatibility.exe
rename to BizHawk.Client.EmuHawk/output/dll/libsneshawk-64-compatibility.exe
diff --git a/BizHawk.MultiClient/output/dll/libsneshawk-64-performance.exe b/BizHawk.Client.EmuHawk/output/dll/libsneshawk-64-performance.exe
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libsneshawk-64-performance.exe
rename to BizHawk.Client.EmuHawk/output/dll/libsneshawk-64-performance.exe
diff --git a/BizHawk.MultiClient/output/dll/libspeexdsp.dll b/BizHawk.Client.EmuHawk/output/dll/libspeexdsp.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libspeexdsp.dll
rename to BizHawk.Client.EmuHawk/output/dll/libspeexdsp.dll
diff --git a/BizHawk.MultiClient/output/dll/libyabause.dll b/BizHawk.Client.EmuHawk/output/dll/libyabause.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/libyabause.dll
rename to BizHawk.Client.EmuHawk/output/dll/libyabause.dll
diff --git a/BizHawk.MultiClient/output/dll/mupen64plus-audio-bkm.dll b/BizHawk.Client.EmuHawk/output/dll/mupen64plus-audio-bkm.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/mupen64plus-audio-bkm.dll
rename to BizHawk.Client.EmuHawk/output/dll/mupen64plus-audio-bkm.dll
diff --git a/BizHawk.MultiClient/output/dll/mupen64plus-input-bkm.dll b/BizHawk.Client.EmuHawk/output/dll/mupen64plus-input-bkm.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/mupen64plus-input-bkm.dll
rename to BizHawk.Client.EmuHawk/output/dll/mupen64plus-input-bkm.dll
diff --git a/BizHawk.MultiClient/output/dll/mupen64plus-rsp-hle.dll b/BizHawk.Client.EmuHawk/output/dll/mupen64plus-rsp-hle.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/mupen64plus-rsp-hle.dll
rename to BizHawk.Client.EmuHawk/output/dll/mupen64plus-rsp-hle.dll
diff --git a/BizHawk.MultiClient/output/dll/mupen64plus-video-glide64.dll b/BizHawk.Client.EmuHawk/output/dll/mupen64plus-video-glide64.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/mupen64plus-video-glide64.dll
rename to BizHawk.Client.EmuHawk/output/dll/mupen64plus-video-glide64.dll
diff --git a/BizHawk.MultiClient/output/dll/mupen64plus-video-glide64mk2.dll b/BizHawk.Client.EmuHawk/output/dll/mupen64plus-video-glide64mk2.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/mupen64plus-video-glide64mk2.dll
rename to BizHawk.Client.EmuHawk/output/dll/mupen64plus-video-glide64mk2.dll
diff --git a/BizHawk.MultiClient/output/dll/mupen64plus-video-rice.dll b/BizHawk.Client.EmuHawk/output/dll/mupen64plus-video-rice.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/mupen64plus-video-rice.dll
rename to BizHawk.Client.EmuHawk/output/dll/mupen64plus-video-rice.dll
diff --git a/BizHawk.MultiClient/output/dll/mupen64plus.dll b/BizHawk.Client.EmuHawk/output/dll/mupen64plus.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/mupen64plus.dll
rename to BizHawk.Client.EmuHawk/output/dll/mupen64plus.dll
diff --git a/BizHawk.MultiClient/output/dll/zlib1.dll b/BizHawk.Client.EmuHawk/output/dll/zlib1.dll
similarity index 100%
rename from BizHawk.MultiClient/output/dll/zlib1.dll
rename to BizHawk.Client.EmuHawk/output/dll/zlib1.dll
diff --git a/BizHawk.MultiClient/output/gamedb/EMU7800.csv b/BizHawk.Client.EmuHawk/output/gamedb/EMU7800.csv
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/EMU7800.csv
rename to BizHawk.Client.EmuHawk/output/gamedb/EMU7800.csv
diff --git a/BizHawk.MultiClient/output/gamedb/NesCarts.7z b/BizHawk.Client.EmuHawk/output/gamedb/NesCarts.7z
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/NesCarts.7z
rename to BizHawk.Client.EmuHawk/output/gamedb/NesCarts.7z
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_a2600.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_a2600.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_a2600.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_a2600.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_coleco.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_coleco.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_coleco.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_coleco.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_gb.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_gb.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_gb.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_gb.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_gbc.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_gbc.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_gbc.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_gbc.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_n64.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_n64.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_n64.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_n64.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_neshomebrew.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_neshomebrew.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_neshomebrew.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_neshomebrew.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_pce_cd.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_pce_cd.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_pce_cd.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_pce_cd.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_pce_hucards.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_pce_hucards.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_pce_hucards.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_pce_hucards.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_sega_8bit.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_sega_8bit.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_sega_8bit.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_sega_8bit.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_sega_md.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_sega_md.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_sega_md.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_sega_md.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_snes.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_snes.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_snes.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_snes.txt
diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_vs.txt b/BizHawk.Client.EmuHawk/output/gamedb/gamedb_vs.txt
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/gamedb_vs.txt
rename to BizHawk.Client.EmuHawk/output/gamedb/gamedb_vs.txt
diff --git a/BizHawk.MultiClient/output/gamedb/update_gamedb.bat b/BizHawk.Client.EmuHawk/output/gamedb/update_gamedb.bat
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/update_gamedb.bat
rename to BizHawk.Client.EmuHawk/output/gamedb/update_gamedb.bat
diff --git a/BizHawk.MultiClient/output/gamedb/wget.exe b/BizHawk.Client.EmuHawk/output/gamedb/wget.exe
similarity index 100%
rename from BizHawk.MultiClient/output/gamedb/wget.exe
rename to BizHawk.Client.EmuHawk/output/gamedb/wget.exe
diff --git a/BizHawk.MultiClient/output/zip.exe b/BizHawk.Client.EmuHawk/output/zip.exe
similarity index 100%
rename from BizHawk.MultiClient/output/zip.exe
rename to BizHawk.Client.EmuHawk/output/zip.exe
diff --git a/BizHawk.MultiClient/tools/Cheats/CheatEdit.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Cheats/CheatEdit.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Cheats/CheatEdit.cs
rename to BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
diff --git a/BizHawk.MultiClient/tools/Cheats/CheatEdit.resx b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Cheats/CheatEdit.resx
rename to BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.resx
diff --git a/BizHawk.MultiClient/tools/Cheats/CheatForm.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Cheats/CheatForm.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Cheats/CheatForm.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Cheats/CheatForm.cs
rename to BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.cs
diff --git a/BizHawk.MultiClient/tools/Cheats/CheatForm.resx b/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Cheats/CheatForm.resx
rename to BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.resx
diff --git a/BizHawk.MultiClient/tools/GB/BmpView.cs b/BizHawk.Client.EmuHawk/tools/GB/BmpView.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/BmpView.cs
rename to BizHawk.Client.EmuHawk/tools/GB/BmpView.cs
diff --git a/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/CGBColorChooserForm.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.Designer.cs
diff --git a/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.cs b/BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/CGBColorChooserForm.cs
rename to BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.cs
diff --git a/BizHawk.MultiClient/tools/GB/CGBColorChooserForm.resx b/BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/CGBColorChooserForm.resx
rename to BizHawk.Client.EmuHawk/tools/GB/CGBColorChooserForm.resx
diff --git a/BizHawk.MultiClient/tools/GB/ColorChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/ColorChooserForm.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.Designer.cs
diff --git a/BizHawk.MultiClient/tools/GB/ColorChooserForm.cs b/BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/ColorChooserForm.cs
rename to BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.cs
diff --git a/BizHawk.MultiClient/tools/GB/ColorChooserForm.resx b/BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/ColorChooserForm.resx
rename to BizHawk.Client.EmuHawk/tools/GB/ColorChooserForm.resx
diff --git a/BizHawk.MultiClient/tools/GB/DualGBFileSelector.Designer.cs b/BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/DualGBFileSelector.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.Designer.cs
diff --git a/BizHawk.MultiClient/tools/GB/DualGBFileSelector.cs b/BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/DualGBFileSelector.cs
rename to BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.cs
diff --git a/BizHawk.MultiClient/tools/GB/DualGBFileSelector.resx b/BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/DualGBFileSelector.resx
rename to BizHawk.Client.EmuHawk/tools/GB/DualGBFileSelector.resx
diff --git a/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.Designer.cs b/BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/DualGBXMLCreator.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.Designer.cs
diff --git a/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.cs b/BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/DualGBXMLCreator.cs
rename to BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.cs
diff --git a/BizHawk.MultiClient/tools/GB/DualGBXMLCreator.resx b/BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/DualGBXMLCreator.resx
rename to BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.resx
diff --git a/BizHawk.MultiClient/tools/GB/GBGPUView.Designer.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/GBGPUView.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/GB/GBGPUView.Designer.cs
diff --git a/BizHawk.MultiClient/tools/GB/GBGPUView.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/GBGPUView.cs
rename to BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
diff --git a/BizHawk.MultiClient/tools/GB/GBGPUView.resx b/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/GBGPUView.resx
rename to BizHawk.Client.EmuHawk/tools/GB/GBGPUView.resx
diff --git a/BizHawk.MultiClient/tools/GB/GBGameGenie.Designer.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/GBGameGenie.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.Designer.cs
diff --git a/BizHawk.MultiClient/tools/GB/GBGameGenie.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/GBGameGenie.cs
rename to BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
diff --git a/BizHawk.MultiClient/tools/GB/GBGameGenie.resx b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/GB/GBGameGenie.resx
rename to BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.resx
diff --git a/BizHawk.MultiClient/tools/GBA/GBAGPUView.Designer.cs b/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GBA/GBAGPUView.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.Designer.cs
diff --git a/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs b/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GBA/GBAGPUView.cs
rename to BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
diff --git a/BizHawk.MultiClient/tools/GBA/GBAGPUView.resx b/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/GBA/GBAGPUView.resx
rename to BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.resx
diff --git a/BizHawk.MultiClient/tools/GBA/MobileBmpView.Designer.cs b/BizHawk.Client.EmuHawk/tools/GBA/MobileBmpView.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GBA/MobileBmpView.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/GBA/MobileBmpView.Designer.cs
diff --git a/BizHawk.MultiClient/tools/GBA/MobileBmpView.cs b/BizHawk.Client.EmuHawk/tools/GBA/MobileBmpView.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GBA/MobileBmpView.cs
rename to BizHawk.Client.EmuHawk/tools/GBA/MobileBmpView.cs
diff --git a/BizHawk.MultiClient/tools/GBA/MobileBmpView.resx b/BizHawk.Client.EmuHawk/tools/GBA/MobileBmpView.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/GBA/MobileBmpView.resx
rename to BizHawk.Client.EmuHawk/tools/GBA/MobileBmpView.resx
diff --git a/BizHawk.MultiClient/tools/GBA/MobileDetailView.Designer.cs b/BizHawk.Client.EmuHawk/tools/GBA/MobileDetailView.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GBA/MobileDetailView.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/GBA/MobileDetailView.Designer.cs
diff --git a/BizHawk.MultiClient/tools/GBA/MobileDetailView.cs b/BizHawk.Client.EmuHawk/tools/GBA/MobileDetailView.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/GBA/MobileDetailView.cs
rename to BizHawk.Client.EmuHawk/tools/GBA/MobileDetailView.cs
diff --git a/BizHawk.MultiClient/tools/GBA/MobileDetailView.resx b/BizHawk.Client.EmuHawk/tools/GBA/MobileDetailView.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/GBA/MobileDetailView.resx
rename to BizHawk.Client.EmuHawk/tools/GBA/MobileDetailView.resx
diff --git a/BizHawk.MultiClient/tools/Genesis/GenGameGenie.Designer.cs b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Genesis/GenGameGenie.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Genesis/GenGameGenie.cs b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Genesis/GenGameGenie.cs
rename to BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
diff --git a/BizHawk.MultiClient/tools/Genesis/GenGameGenie.resx b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Genesis/GenGameGenie.resx
rename to BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.resx
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexColor.Designer.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/HexColor.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.Designer.cs
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexColor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/HexColor.cs
rename to BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.cs
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexColor.resx b/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/HexColor.resx
rename to BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.resx
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexEditor.Designer.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/HexEditor.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/HexEditor.cs
rename to BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexEditor.resx b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/HexEditor.resx
rename to BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.resx
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexFind.Designer.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/HexFind.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.Designer.cs
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexFind.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/HexFind.cs
rename to BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexFind.resx b/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/HexFind.resx
rename to BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.resx
diff --git a/BizHawk.MultiClient/tools/HexEditor/MemoryViewer.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/MemoryViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/MemoryViewer.cs
rename to BizHawk.Client.EmuHawk/tools/HexEditor/MemoryViewer.cs
diff --git a/BizHawk.MultiClient/tools/HexEditor/MemoryViewer.resx b/BizHawk.Client.EmuHawk/tools/HexEditor/MemoryViewer.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/HexEditor/MemoryViewer.resx
rename to BizHawk.Client.EmuHawk/tools/HexEditor/MemoryViewer.resx
diff --git a/BizHawk.MultiClient/tools/IToolForm.cs b/BizHawk.Client.EmuHawk/tools/IToolForm.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/IToolForm.cs
rename to BizHawk.Client.EmuHawk/tools/IToolForm.cs
diff --git a/BizHawk.MultiClient/tools/InputPrompt.Designer.cs b/BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/InputPrompt.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs
diff --git a/BizHawk.MultiClient/tools/InputPrompt.cs b/BizHawk.Client.EmuHawk/tools/InputPrompt.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/InputPrompt.cs
rename to BizHawk.Client.EmuHawk/tools/InputPrompt.cs
diff --git a/BizHawk.MultiClient/tools/InputPrompt.resx b/BizHawk.Client.EmuHawk/tools/InputPrompt.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/InputPrompt.resx
rename to BizHawk.Client.EmuHawk/tools/InputPrompt.resx
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Input.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Input.cs
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaButton.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaButton.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaButton.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaButton.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaConsole.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaConsole.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaConsole.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaConsole.resx b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaConsole.resx
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.resx
diff --git a/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.resx b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.resx
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.resx
diff --git a/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.resx b/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaRegisteredFunctionsList.resx
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.resx
diff --git a/BizHawk.MultiClient/tools/Lua/LuaTextBox.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaTextBox.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaTextBox.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaTextBox.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWinform.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWinform.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWinform.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWinform.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWinform.resx b/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWinform.resx
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.resx
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriter.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWriter.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriter.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWriter.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriter.resx b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWriter.resx
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.resx
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriterBox.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriterBox.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWriterBox.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWriterBox.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriterColorConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWriterColorConfig.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriterColorConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.cs
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWriterColorConfig.cs
diff --git a/BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.resx b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriterColorConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.resx
rename to BizHawk.Client.EmuHawk/tools/Lua/LuaWriterColorConfig.resx
diff --git a/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.Designer.cs b/BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.Designer.cs
diff --git a/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.cs b/BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.cs
rename to BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.cs
diff --git a/BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.resx b/BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.resx
rename to BizHawk.Client.EmuHawk/tools/N64/N64VideoPluginconfig.resx
diff --git a/BizHawk.MultiClient/tools/NES/NESDebugger.Designer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESDebugger.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESDebugger.Designer.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESDebugger.cs b/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESDebugger.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESDebugger.resx b/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESDebugger.resx
rename to BizHawk.Client.EmuHawk/tools/NES/NESDebugger.resx
diff --git a/BizHawk.MultiClient/tools/NES/NESGameGenie.Designer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESGameGenie.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.Designer.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESGameGenie.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESGameGenie.resx b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESGameGenie.resx
rename to BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.resx
diff --git a/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.Designer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESGraphicsConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.Designer.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.resx b/BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESGraphicsConfig.resx
rename to BizHawk.Client.EmuHawk/tools/NES/NESGraphicsConfig.resx
diff --git a/BizHawk.MultiClient/tools/NES/NESNameTableViewer.Designer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESNameTableViewer.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESNameTableViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESNameTableViewer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESNameTableViewer.resx b/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESNameTableViewer.resx
rename to BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.resx
diff --git a/BizHawk.MultiClient/tools/NES/NESPPU.Designer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESPPU.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESPPU.cs b/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESPPU.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESPPU.resx b/BizHawk.Client.EmuHawk/tools/NES/NESPPU.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESPPU.resx
rename to BizHawk.Client.EmuHawk/tools/NES/NESPPU.resx
diff --git a/BizHawk.MultiClient/tools/NES/NESSoundConfig.Designer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESSoundConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.Designer.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESSoundConfig.cs b/BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESSoundConfig.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.cs
diff --git a/BizHawk.MultiClient/tools/NES/NESSoundConfig.resx b/BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NESSoundConfig.resx
rename to BizHawk.Client.EmuHawk/tools/NES/NESSoundConfig.resx
diff --git a/BizHawk.MultiClient/tools/NES/NameTableViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/NameTableViewer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs
diff --git a/BizHawk.MultiClient/tools/NES/PaletteViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/PaletteViewer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs
diff --git a/BizHawk.MultiClient/tools/NES/PatternViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/PatternViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/PatternViewer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/PatternViewer.cs
diff --git a/BizHawk.MultiClient/tools/NES/PatternViewer.resx b/BizHawk.Client.EmuHawk/tools/NES/PatternViewer.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/PatternViewer.resx
rename to BizHawk.Client.EmuHawk/tools/NES/PatternViewer.resx
diff --git a/BizHawk.MultiClient/tools/NES/SpriteViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/NES/SpriteViewer.cs
rename to BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs
diff --git a/BizHawk.MultiClient/tools/PCE/PCEBGCanvas.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCEBGCanvas.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/PCE/PCEBGCanvas.cs
rename to BizHawk.Client.EmuHawk/tools/PCE/PCEBGCanvas.cs
diff --git a/BizHawk.MultiClient/tools/PCE/PCEBGViewer.Designer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/PCE/PCEBGViewer.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs
diff --git a/BizHawk.MultiClient/tools/PCE/PCEBGViewer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/PCE/PCEBGViewer.cs
rename to BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs
diff --git a/BizHawk.MultiClient/tools/PCE/PCEBGViewer.resx b/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/PCE/PCEBGViewer.resx
rename to BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.resx
diff --git a/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.Designer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.Designer.cs
diff --git a/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.cs
rename to BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.cs
diff --git a/BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.resx b/BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.resx
rename to BizHawk.Client.EmuHawk/tools/PCE/PCEGraphicsConfig.resx
diff --git a/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.Designer.cs b/BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.Designer.cs
diff --git a/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.cs b/BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.cs
rename to BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.cs
diff --git a/BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.resx b/BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.resx
rename to BizHawk.Client.EmuHawk/tools/SMS/SMSGraphicsConfig.resx
diff --git a/BizHawk.MultiClient/tools/SNES/SNESGameGenie.Designer.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESGameGenie.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.Designer.cs
diff --git a/BizHawk.MultiClient/tools/SNES/SNESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESGameGenie.cs
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs
diff --git a/BizHawk.MultiClient/tools/SNES/SNESGameGenie.resx b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESGameGenie.resx
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.resx
diff --git a/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.Designer.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs
diff --git a/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs
diff --git a/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.resx b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.resx
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.resx
diff --git a/BizHawk.MultiClient/tools/SNES/SNESGraphicsViewer.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsViewer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESGraphicsViewer.cs
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsViewer.cs
diff --git a/BizHawk.MultiClient/tools/SNES/SNESOptions.Designer.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESOptions.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.Designer.cs
diff --git a/BizHawk.MultiClient/tools/SNES/SNESOptions.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESOptions.cs
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.cs
diff --git a/BizHawk.MultiClient/tools/SNES/SNESOptions.resx b/BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/SNES/SNESOptions.resx
rename to BizHawk.Client.EmuHawk/tools/SNES/SNESOptions.resx
diff --git a/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.Designer.cs b/BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Saturn/SaturnPrefs.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.cs b/BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Saturn/SaturnPrefs.cs
rename to BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.cs
diff --git a/BizHawk.MultiClient/tools/Saturn/SaturnPrefs.resx b/BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Saturn/SaturnPrefs.resx
rename to BizHawk.Client.EmuHawk/tools/Saturn/SaturnPrefs.resx
diff --git a/BizHawk.MultiClient/tools/StateVisualizer.cs b/BizHawk.Client.EmuHawk/tools/StateVisualizer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/StateVisualizer.cs
rename to BizHawk.Client.EmuHawk/tools/StateVisualizer.cs
diff --git a/BizHawk.MultiClient/tools/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/TAStudio.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/TAStudio.Designer.cs
diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/TAStudio.cs
rename to BizHawk.Client.EmuHawk/tools/TAStudio.cs
diff --git a/BizHawk.MultiClient/tools/TAStudio.resx b/BizHawk.Client.EmuHawk/tools/TAStudio.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/TAStudio.resx
rename to BizHawk.Client.EmuHawk/tools/TAStudio.resx
diff --git a/BizHawk.MultiClient/tools/TI83/TI83KeyPad.Designer.cs b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/TI83/TI83KeyPad.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs
diff --git a/BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs
rename to BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
diff --git a/BizHawk.MultiClient/tools/TI83/TI83KeyPad.resx b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/TI83/TI83KeyPad.resx
rename to BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.resx
diff --git a/BizHawk.MultiClient/tools/ToolBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/ToolBox.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
diff --git a/BizHawk.MultiClient/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/ToolBox.cs
rename to BizHawk.Client.EmuHawk/tools/ToolBox.cs
diff --git a/BizHawk.MultiClient/tools/ToolBox.resx b/BizHawk.Client.EmuHawk/tools/ToolBox.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/ToolBox.resx
rename to BizHawk.Client.EmuHawk/tools/ToolBox.resx
diff --git a/BizHawk.MultiClient/tools/ToolHelpers.cs b/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/ToolHelpers.cs
rename to BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
diff --git a/BizHawk.MultiClient/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/ToolManager.cs
rename to BizHawk.Client.EmuHawk/tools/ToolManager.cs
diff --git a/BizHawk.MultiClient/tools/TraceLogger.Designer.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/TraceLogger.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs
diff --git a/BizHawk.MultiClient/tools/TraceLogger.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/TraceLogger.cs
rename to BizHawk.Client.EmuHawk/tools/TraceLogger.cs
diff --git a/BizHawk.MultiClient/tools/TraceLogger.resx b/BizHawk.Client.EmuHawk/tools/TraceLogger.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/TraceLogger.resx
rename to BizHawk.Client.EmuHawk/tools/TraceLogger.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPads/AnalogControlPanel.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/AnalogControlPanel.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/AnalogControlPanel.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/AnalogControlPanel.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/IVirtualPad.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/IVirtualPad.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/IVirtualPad.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/IVirtualPad.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPad.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPad.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPad.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPad.resx
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA26.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA26.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26Control.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA26Control.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26Control.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA26Control.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.resx
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78Control.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78Control.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78Control.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78Control.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78Control.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.resx
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadA78Control.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadButton.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadButton.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadButton.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadButton.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadC64Keyboard.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadC64Keyboard.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadC64Keyboard.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadC64Keyboard.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.resx
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadC64Keyboard.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadColeco.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadColeco.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadColeco.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadColeco.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadColeco.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.resx
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadColeco.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.resx
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGB.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadGB.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadGB.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadGB.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBA.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadGBA.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBA.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadGBA.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBControl.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadGBControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBControl.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadGBControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadGen3Button.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadGen3Button.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadGen3Button.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadGen3Button.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.resx
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64Control.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64Control.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64Control.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64Control.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNES.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadNES.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadNES.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadNES.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadNESControl.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadNESControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadNESControl.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadNESControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadPCE.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadPCE.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadPCE.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadPCE.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMS.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSMS.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMS.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSMS.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMSControl.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSMSControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMSControl.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSMSControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNES.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSNES.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNES.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSNES.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNESControl.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSNESControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNESControl.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSNESControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturn.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturn.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturn.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturn.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturn.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.resx
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturn.resx
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturnControl.Designer.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturnControl.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.cs
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturnControl.cs
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturnControl.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.resx
rename to BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadSaturnControl.resx
diff --git a/BizHawk.MultiClient/tools/Watch/RamPoke.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamPoke.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Watch/RamPoke.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamPoke.cs
rename to BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs
diff --git a/BizHawk.MultiClient/tools/Watch/RamPoke.resx b/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamPoke.resx
rename to BizHawk.Client.EmuHawk/tools/Watch/RamPoke.resx
diff --git a/BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamSearch.cs
rename to BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
diff --git a/BizHawk.MultiClient/tools/Watch/RamSearch.resx b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamSearch.resx
rename to BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx
diff --git a/BizHawk.MultiClient/tools/Watch/RamWatch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamWatch.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamWatch.cs
rename to BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
diff --git a/BizHawk.MultiClient/tools/Watch/RamWatch.resx b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamWatch.resx
rename to BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx
diff --git a/BizHawk.MultiClient/tools/Watch/WatchEditor.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/WatchEditor.Designer.cs
rename to BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs
diff --git a/BizHawk.MultiClient/tools/Watch/WatchEditor.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/WatchEditor.cs
rename to BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
diff --git a/BizHawk.MultiClient/tools/Watch/WatchEditor.resx b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.resx
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/WatchEditor.resx
rename to BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.resx
diff --git a/BizHawk.MultiClient/tools/Watch/WatchValueBox.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/WatchValueBox.cs
rename to BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
diff --git a/BizHawk.sln b/BizHawk.sln
index 21111b50c5..88b95f0814 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "Bi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Common", "BizHawk.Common\BizHawk.Common.csproj", "{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.EmuHawk", "BizHawk.MultiClient\BizHawk.Client.EmuHawk.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.EmuHawk", "BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -92,6 +92,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = BizHawk.MultiClient\BizHawk.Client.EmuHawk.csproj
+		StartupItem = BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj
 	EndGlobalSection
 EndGlobal
diff --git a/DiscoHawk/DiscoHawk.csproj b/DiscoHawk/DiscoHawk.csproj
index d2e4a33b3b..4daae891db 100644
--- a/DiscoHawk/DiscoHawk.csproj
+++ b/DiscoHawk/DiscoHawk.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{C4366030-6D03-424B-AE53-F4F43BB217C3}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DiscoHawk</RootNamespace>
+    <RootNamespace>BizHawk.Client.DiscoHawk</RootNamespace>
     <AssemblyName>DiscoHawk</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>