Rename Bizhawk.MultiClient to BizHawk.Client.EmuHawk including namespaces and projects. Rename executable to EmuHawk.exe

BizHawk.Client.Common/RomGame.cs

@@ -2,9 +2,8 @@
 using System.Globalization;
 
 using BizHawk.Common;
-using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public class RomGame
 	{

BizHawk.MultiClient/AVOut/AviWriter.cs

@@ -7,7 +7,7 @@ using BizHawk.Client.Common;
 
 //some helpful p/invoke from http://www.codeproject.com/KB/audio-video/Motion_Detection.aspx?msg=1142967
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	class AviWriter : IVideoWriter
 	{

BizHawk.MultiClient/AVOut/BmpVideoProvder.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Drawing;
 
-namespace BizHawk.MultiClient.AVOut
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// an IVideoProivder wrapping a Bitmap

BizHawk.MultiClient/AVOut/FFmpegWriter.cs

@@ -5,7 +5,7 @@ using System.Diagnostics;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// uses pipes to launch an external ffmpeg process and encode

BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class FFmpegWriterForm
 	{

BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// configures the FFmpegWriter

BizHawk.MultiClient/AVOut/GifWriter.cs

@@ -7,7 +7,7 @@ using System.Drawing;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient.AVOut
+namespace BizHawk.Client.EmuHawk
 {
 	public class GifWriter : IVideoWriter
 	{

BizHawk.MultiClient/AVOut/GifWriterForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient.AVOut
+namespace BizHawk.Client.EmuHawk
 {
 	partial class GifWriterForm
 	{

BizHawk.MultiClient/AVOut/GifWriterForm.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient.AVOut
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class GifWriterForm : Form
 	{

BizHawk.MultiClient/AVOut/IVideoWriter.cs

@@ -1,16 +1,15 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using BizHawk.MultiClient;
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
-    public interface IVideoWriter : IDisposable
+	public interface IVideoWriter : IDisposable
-    {
+	{
-        /// <summary>
+		/// <summary>
-        /// sets the codec token to be used for video compression
+		/// sets the codec token to be used for video compression
-        /// </summary>
+		/// </summary>
-        void SetVideoCodecToken(IDisposable token);
+		void SetVideoCodecToken(IDisposable token);
 
 		/// <summary>
 		/// sets to a default video codec token without calling any UI - for automated dumping
@@ -18,68 +17,68 @@ namespace BizHawk
 		void SetDefaultVideoCodecToken();
 
 
-        // why no OpenFile(IEnumerator<string>) ?
+		// why no OpenFile(IEnumerator<string>) ?
-        // different video writers may have different ideas of how and why splitting is to occur
+		// different video writers may have different ideas of how and why splitting is to occur
-        /// <summary>
+		/// <summary>
-        /// opens a recording stream
+		/// opens a recording stream
-        /// set a video codec token first.
+		/// set a video codec token first.
-        /// </summary>
+		/// </summary>
-        void OpenFile(string baseName);
+		void OpenFile(string baseName);
 
-        /// <summary>
+		/// <summary>
-        /// close recording stream
+		/// close recording stream
-        /// </summary>
+		/// </summary>
-        void CloseFile();
+		void CloseFile();
 
-        /// <summary>
+		/// <summary>
-        /// adds a frame to the stream
+		/// adds a frame to the stream
-        /// </summary>
+		/// </summary>
-        void AddFrame(IVideoProvider source);
+		void AddFrame(IVideoProvider source);
 
-        /// <summary>
+		/// <summary>
-        /// adds audio samples to the stream
+		/// adds audio samples to the stream
-        /// no attempt is made to sync this to the video
+		/// no attempt is made to sync this to the video
-        /// reccomendation: try not to have the size or pacing of the audio chunks be too "weird"
+		/// reccomendation: try not to have the size or pacing of the audio chunks be too "weird"
-        /// </summary>
+		/// </summary>
-        void AddSamples(short[] samples);
+		void AddSamples(short[] samples);
 
-        /// <summary>
+		/// <summary>
-        /// obtain a set of recording compression parameters
+		/// obtain a set of recording compression parameters
-        /// return null on user cancel
+		/// return null on user cancel
-        /// </summary>
+		/// </summary>
-        /// <param name="hwnd">hwnd to attach to if the user is shown config dialog</param>
+		/// <param name="hwnd">hwnd to attach to if the user is shown config dialog</param>
-        /// <returns>codec token, dispose of it when you're done with it</returns>
+		/// <returns>codec token, dispose of it when you're done with it</returns>
-        IDisposable AcquireVideoCodecToken(System.Windows.Forms.IWin32Window hwnd);
+		IDisposable AcquireVideoCodecToken(System.Windows.Forms.IWin32Window hwnd);
 
-        /// <summary>
+		/// <summary>
-        /// set framerate to fpsnum/fpsden (assumed to be unchanging over the life of the stream)
+		/// set framerate to fpsnum/fpsden (assumed to be unchanging over the life of the stream)
-        /// </summary>
+		/// </summary>
-        void SetMovieParameters(int fpsnum, int fpsden);
+		void SetMovieParameters(int fpsnum, int fpsden);
 
-        /// <summary>
+		/// <summary>
-        /// set resolution parameters (width x height)
+		/// set resolution parameters (width x height)
-        /// must be set before file is opened
+		/// must be set before file is opened
-        /// can be changed in future
+		/// can be changed in future
-        /// should always match IVideoProvider
+		/// should always match IVideoProvider
-        /// </summary>
+		/// </summary>
-        /// <param name="width"></param>
+		/// <param name="width"></param>
-        /// <param name="height"></param>
+		/// <param name="height"></param>
-        void SetVideoParameters(int width, int height);
+		void SetVideoParameters(int width, int height);
 
-        /// <summary>
+		/// <summary>
-        /// set audio parameters.  cannot change later
+		/// set audio parameters.  cannot change later
-        /// </summary>
+		/// </summary>
-        void SetAudioParameters(int sampleRate, int channels, int bits);
+		void SetAudioParameters(int sampleRate, int channels, int bits);
 
-        /// <summary>
+		/// <summary>
-        /// set metadata parameters; should be called before opening file
+		/// set metadata parameters; should be called before opening file
-        /// ok to not set at all, if not applicable
+		/// ok to not set at all, if not applicable
-        /// </summary>
+		/// </summary>
-        /// <param name="gameName">The name of the game loaded</param>
+		/// <param name="gameName">The name of the game loaded</param>
-        /// <param name="authors">Authors on movie file</param>
+		/// <param name="authors">Authors on movie file</param>
-        /// <param name="lengthMS">Length of movie file in milliseconds</param>
+		/// <param name="lengthMS">Length of movie file in milliseconds</param>
-        /// <param name="rerecords">Number of rerecords on movie file</param>
+		/// <param name="rerecords">Number of rerecords on movie file</param>
-        void SetMetaData(string gameName, string authors, UInt64 lengthMS, UInt64 rerecords);
+		void SetMetaData(string gameName, string authors, UInt64 lengthMS, UInt64 rerecords);
 
 		/// <summary>
 		/// short description of this IVideoWriter
@@ -94,7 +93,7 @@ namespace BizHawk
 		/// </summary>
 		/// <returns></returns>
 		string ShortName();
-    }
+	}
 
 	/// <summary>
 	/// contains methods to find all IVideoWriter
@@ -110,7 +109,7 @@ namespace BizHawk
 				new WavWriterV(),
 				new FFmpegWriter(),
 				new NutWriter(),
-				new BizHawk.MultiClient.AVOut.GifWriter()
+				new GifWriter()
 			};
 			return ret;
 		}

BizHawk.MultiClient/AVOut/JMDForm.Designer.cs

@@ -1,33 +1,33 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
-    partial class JMDForm
+	partial class JMDForm
-    {
+	{
-        /// <summary>
+		/// <summary>
-        /// Required designer variable.
+		/// Required designer variable.
-        /// </summary>
+		/// </summary>
-        private System.ComponentModel.IContainer components = null;
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
+		/// <summary>
-        /// Clean up any resources being used.
+		/// Clean up any resources being used.
-        /// </summary>
+		/// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
+		protected override void Dispose(bool disposing)
-        {
+		{
-            if (disposing && (components != null))
+			if (disposing && (components != null))
-            {
+			{
-                components.Dispose();
+				components.Dispose();
-            }
+			}
-            base.Dispose(disposing);
+			base.Dispose(disposing);
-        }
+		}
 
-        #region Windows Form Designer generated code
+		#region Windows Form Designer generated code
 
-        /// <summary>
+		/// <summary>
-        /// Required method for Designer support - do not modify
+		/// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
+		/// the contents of this method with the code editor.
-        /// </summary>
+		/// </summary>
-        private void InitializeComponent()
+		private void InitializeComponent()
-        {
+		{
 			this.okButton = new System.Windows.Forms.Button();
 			this.threadsBar = new System.Windows.Forms.TrackBar();
 			this.compressionBar = new System.Windows.Forms.TrackBar();
@@ -163,19 +163,19 @@
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
-        }
+		}
 
-        #endregion
+		#endregion
 
-        private System.Windows.Forms.Button okButton;
+		private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.TrackBar threadsBar;
+		private System.Windows.Forms.TrackBar threadsBar;
-        private System.Windows.Forms.TrackBar compressionBar;
+		private System.Windows.Forms.TrackBar compressionBar;
-        private System.Windows.Forms.Label threadLeft;
+		private System.Windows.Forms.Label threadLeft;
-        private System.Windows.Forms.Label threadRight;
+		private System.Windows.Forms.Label threadRight;
-        private System.Windows.Forms.Label compressionLeft;
+		private System.Windows.Forms.Label compressionLeft;
-        private System.Windows.Forms.Label compressionRight;
+		private System.Windows.Forms.Label compressionRight;
-        private System.Windows.Forms.Label threadTop;
+		private System.Windows.Forms.Label threadTop;
-        private System.Windows.Forms.Label compressionTop;
+		private System.Windows.Forms.Label compressionTop;
-        private System.Windows.Forms.Button cancelButton;
+		private System.Windows.Forms.Button cancelButton;
-    }
+	}
 }

BizHawk.MultiClient/AVOut/JMDForm.cs

@@ -7,80 +7,80 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
-    /// <summary>
+	/// <summary>
-    /// implements a minimal dialog for configuring JMDWriter
+	/// implements a minimal dialog for configuring JMDWriter
-    /// </summary>
+	/// </summary>
-    public partial class JMDForm : Form
+	public partial class JMDForm : Form
-    {
+	{
-        public JMDForm()
+		public JMDForm()
-        {
+		{
-            InitializeComponent();
+			InitializeComponent();
-        }
+		}
 
-        private void okButton_Click(object sender, EventArgs e)
+		private void okButton_Click(object sender, EventArgs e)
-        {
+		{
 
-        }
+		}
 
-        private void cancelButton_Click(object sender, EventArgs e)
+		private void cancelButton_Click(object sender, EventArgs e)
-        {
+		{
 
-        }
+		}
 
-        private void threadsBar_Scroll(object sender, EventArgs e)
+		private void threadsBar_Scroll(object sender, EventArgs e)
-        {
+		{
-            threadTop.Text = String.Format("Number of compression threads: {0}", threadsBar.Value);
+			threadTop.Text = String.Format("Number of compression threads: {0}", threadsBar.Value);
-        }
+		}
 
-        private void compressionBar_Scroll(object sender, EventArgs e)
+		private void compressionBar_Scroll(object sender, EventArgs e)
-        {
+		{
-            if (compressionBar.Value == compressionBar.Minimum)
+			if (compressionBar.Value == compressionBar.Minimum)
-                compressionTop.Text = "Compression Level: NONE";
+				compressionTop.Text = "Compression Level: NONE";
-            else
+			else
-                compressionTop.Text = String.Format("Compression Level: {0}", compressionBar.Value);
+				compressionTop.Text = String.Format("Compression Level: {0}", compressionBar.Value);
-        }
+		}
 
-        /// <summary>
+		/// <summary>
-        /// Show a configuration dialog (modal) for JMDWriter
+		/// Show a configuration dialog (modal) for JMDWriter
-        /// </summary>
+		/// </summary>
-        /// <param name="threads">number of threads</param>
+		/// <param name="threads">number of threads</param>
-        /// <param name="complevel">compression level</param>
+		/// <param name="complevel">compression level</param>
-        /// <param name="tmin">minimum possible number of threads</param>
+		/// <param name="tmin">minimum possible number of threads</param>
-        /// <param name="tmax">maximum possible number of threads</param>
+		/// <param name="tmax">maximum possible number of threads</param>
-        /// <param name="cmin">minimum compression level, assumed to be "no compression"</param>
+		/// <param name="cmin">minimum compression level, assumed to be "no compression"</param>
-        /// <param name="cmax">maximum compression level</param>
+		/// <param name="cmax">maximum compression level</param>
-        /// <param name="hwnd">hwnd of parent</param>
+		/// <param name="hwnd">hwnd of parent</param>
-        /// <returns>false if user canceled; true if user consented</returns>
+		/// <returns>false if user canceled; true if user consented</returns>
-        public static bool DoCompressionDlg(ref int threads, ref int complevel, int tmin, int tmax, int cmin, int cmax, System.Windows.Forms.IWin32Window hwnd)
+		public static bool DoCompressionDlg(ref int threads, ref int complevel, int tmin, int tmax, int cmin, int cmax, System.Windows.Forms.IWin32Window hwnd)
-        {
+		{
-            JMDForm j = new JMDForm();
+			JMDForm j = new JMDForm();
-            j.threadsBar.Minimum = tmin;
+			j.threadsBar.Minimum = tmin;
-            j.threadsBar.Maximum = tmax;
+			j.threadsBar.Maximum = tmax;
-            j.compressionBar.Minimum = cmin;
+			j.compressionBar.Minimum = cmin;
-            j.compressionBar.Maximum = cmax;
+			j.compressionBar.Maximum = cmax;
-            j.threadsBar.Value = threads;
+			j.threadsBar.Value = threads;
-            j.compressionBar.Value = complevel;
+			j.compressionBar.Value = complevel;
-            j.threadsBar_Scroll(null, null);
+			j.threadsBar_Scroll(null, null);
-            j.compressionBar_Scroll(null, null);
+			j.compressionBar_Scroll(null, null);
-            j.threadLeft.Text = String.Format("{0}", tmin);
+			j.threadLeft.Text = String.Format("{0}", tmin);
-            j.threadRight.Text = String.Format("{0}", tmax);
+			j.threadRight.Text = String.Format("{0}", tmax);
-            j.compressionLeft.Text = String.Format("{0}", cmin);
+			j.compressionLeft.Text = String.Format("{0}", cmin);
-            j.compressionRight.Text = String.Format("{0}", cmax);
+			j.compressionRight.Text = String.Format("{0}", cmax);
 
-            DialogResult d = j.ShowDialog(hwnd);
+			DialogResult d = j.ShowDialog(hwnd);
 
-            threads = j.threadsBar.Value;
+			threads = j.threadsBar.Value;
-            complevel = j.compressionBar.Value;
+			complevel = j.compressionBar.Value;
 
-            j.Dispose();
+			j.Dispose();
-            if (d == DialogResult.OK)
+			if (d == DialogResult.OK)
-                return true;
+				return true;
-            else
+			else
-                return false;
+				return false;
-        }
+		}
 
 
-    }
+	}
 }

BizHawk.MultiClient/AVOut/JMDWriter.cs

@@ -9,7 +9,7 @@ using ICSharpCode.SharpZipLib.Zip.Compression;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// implements IVideoWriter, outputting to format "JMD"

BizHawk.MultiClient/AVOut/NumericTextBox.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows.Forms;
 using System.Globalization;
 
-namespace BizHawk.MultiClient.AVOut
+namespace BizHawk.Client.EmuHawk
 {
 	// http://msdn.microsoft.com/en-us/library/ms229644%28v=vs.80%29.aspx
 	public class NumericTextBox : TextBox

BizHawk.MultiClient/AVOut/NutMuxer.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.IO;
 using System.Numerics;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// implements a simple muxer for the NUT media format

BizHawk.MultiClient/AVOut/NutWriter.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// dumps in the "nut" container format

BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class VideoWriterChooserForm
 	{
@@ -36,8 +36,8 @@
 			this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
 			this.labelDescription = new System.Windows.Forms.Label();
 			this.labelDescriptionBody = new System.Windows.Forms.Label();
-			this.numericTextBoxW = new BizHawk.MultiClient.AVOut.NumericTextBox();
+			this.numericTextBoxW = new NumericTextBox();
-			this.numericTextBoxH = new BizHawk.MultiClient.AVOut.NumericTextBox();
+			this.numericTextBoxH = new NumericTextBox();
 			this.label3 = new System.Windows.Forms.Label();
 			this.label4 = new System.Windows.Forms.Label();
 			this.buttonAuto = new System.Windows.Forms.Button();
@@ -224,12 +224,11 @@
 		private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
 		private System.Windows.Forms.Label labelDescription;
 		private System.Windows.Forms.Label labelDescriptionBody;
-		private AVOut.NumericTextBox numericTextBoxW;
+		private NumericTextBox numericTextBoxW;
-		private AVOut.NumericTextBox numericTextBoxH;
+		private NumericTextBox numericTextBoxH;
 		private System.Windows.Forms.Label label3;
 		private System.Windows.Forms.Label label4;
 		private System.Windows.Forms.Button buttonAuto;
 		private System.Windows.Forms.Panel panelSizeSelect;
-
 	}
 }

BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// implements a simple dialog which chooses an IVideoWriter to record with

BizHawk.MultiClient/AVOut/WavWriter.cs

@@ -6,7 +6,7 @@ using System.IO;
 
 using BizHawk.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// writes MS standard riff files containing uncompressed PCM wav data

BizHawk.MultiClient/AboutBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class AboutBox
 	{
@@ -35,7 +35,7 @@
 			this.timer1 = new System.Windows.Forms.Timer(this.components);
 			this.label3 = new System.Windows.Forms.Label();
 			this.label4 = new System.Windows.Forms.Label();
-			this.HR = new BizHawk.Core.HorizontalLine();
+			this.HR = new HorizontalLine();
 			this.label5 = new System.Windows.Forms.Label();
 			this.mom2 = new System.Windows.Forms.PictureBox();
 			this.pictureBox2 = new System.Windows.Forms.PictureBox();
@@ -43,7 +43,7 @@
 			this.pictureBox4 = new System.Windows.Forms.PictureBox();
 			this.pictureBox3 = new System.Windows.Forms.PictureBox();
 			this.pictureBox1 = new System.Windows.Forms.PictureBox();
-			this.pictureBox5 = new BizHawk.MultiClient.MyViewportPanel();
+			this.pictureBox5 = new MyViewportPanel();
 			this.CloseBtn = new System.Windows.Forms.Button();
 			((System.ComponentModel.ISupportInitialize)(this.mom2)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
@@ -243,7 +243,7 @@
 		private System.Windows.Forms.Label label2;
 		private System.Windows.Forms.Timer timer1;
 		private System.Windows.Forms.Label label3;
-		private BizHawk.Core.HorizontalLine HR;
+		private HorizontalLine HR;
 		private System.Windows.Forms.Label label4;
 		private System.Windows.Forms.PictureBox mom2;
 		private System.Windows.Forms.Label label5;

BizHawk.MultiClient/AboutBox.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Media;
 using System.Windows.Forms;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class AboutBox : Form
 	{

BizHawk.MultiClient/ArchiveChooser.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class ArchiveChooser
 	{

BizHawk.MultiClient/ArchiveChooser.cs

@@ -7,7 +7,7 @@ using System.Windows.Forms;
 using BizHawk.Common;
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class ArchiveChooser : Form
 	{

BizHawk.MultiClient/BizBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class BizBox
 	{
@@ -96,7 +96,7 @@
 			// 
 			// pictureBox1
 			// 
-			this.pictureBox1.Image = global::BizHawk.MultiClient.Properties.Resources.corphawk;
+			this.pictureBox1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.corphawk;
 			this.pictureBox1.Location = new System.Drawing.Point(12, 12);
 			this.pictureBox1.Name = "pictureBox1";
 			this.pictureBox1.Size = new System.Drawing.Size(164, 164);

BizHawk.MultiClient/BizBox.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class BizBox : Form
 	{

BizHawk.MultiClient/BizHawk.Client.EmuHawk.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{DD448B37-BA3F-4544-9754-5406E8094723}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BizHawk.MultiClient</RootNamespace>
+    <RootNamespace>BizHawk.Client.EmuHawk</RootNamespace>
-    <AssemblyName>BizHawk.MultiClient</AssemblyName>
+    <AssemblyName>EmuHawk</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>

BizHawk.MultiClient/CustomControls/FolderBrowserDialogEx.cs

@@ -6,7 +6,7 @@ using System.ComponentModel;
 using System.Security.Permissions;
 
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 
 	/// <summary>

BizHawk.MultiClient/CustomControls/HexTextBox.cs

@@ -4,7 +4,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 	public interface INumberBox
 	{

BizHawk.MultiClient/CustomControls/InputConfigBase.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 	public class InputConfigBase : Form
 	{

BizHawk.MultiClient/CustomControls/MiscControls.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace BizHawk.Core
+namespace BizHawk.Client.EmuHawk
 {
 	public class HorizontalLine : Control
 	{

BizHawk.MultiClient/CustomControls/QuickProgressPopup.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 	partial class QuickProgressPopup
 	{

BizHawk.MultiClient/CustomControls/QuickProgressPopup.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class QuickProgressPopup : Form
 	{

BizHawk.MultiClient/CustomControls/SmartTextBoxControl.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 	public class SmartTextBoxControl : TextBox
 	{

BizHawk.MultiClient/CustomControls/TextDebugView.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 	public class TextDebugView : Control
 	{

BizHawk.MultiClient/CustomControls/Util.cs

@@ -4,7 +4,7 @@ using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 	public static class Extensions
 	{

BizHawk.MultiClient/CustomControls/ViewportPanel.cs

@@ -6,7 +6,7 @@ using System.Drawing.Imaging;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
 
-namespace BizHawk.Core
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// A programmatic PictureBox, really, which will paint itself using the last bitmap that was provided

BizHawk.MultiClient/CustomControls/VirtualListView.cs

@@ -5,7 +5,7 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Drawing;
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 
 	#region win32interop

BizHawk.MultiClient/CustomControls/Win32.cs

@@ -5,11 +5,10 @@ using System.Drawing;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
 
-namespace BizHawk
+namespace BizHawk.Client.EmuHawk
 {
 	public static class Win32
 	{
-
 		public static bool Is64BitProcess { get { return (IntPtr.Size == 8); } }
 		public static bool Is64BitOperatingSystem { get { return Is64BitProcess || InternalCheckIsWow64(); } }
 

BizHawk.MultiClient/DisplayManager/DisplayManager.cs

@@ -14,7 +14,7 @@ using System.Drawing.Imaging;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// encapsulates thread-safe concept of pending/current display surfaces, reusing buffers where matching 

BizHawk.MultiClient/DisplayManager/Filters/Hq2x.cs

@@ -10,7 +10,7 @@ using System.Drawing.Imaging;
 //what license is this?? who knows??
 //ref: http://vba-rerecording.googlecode.com/svn/trunk/src/2xsai.cpp
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 
 	class Hq2xBase_2xSai : Hq2xBase {}

BizHawk.MultiClient/ExternalCoreSupport.cs

@@ -8,7 +8,7 @@ using System.Collections.Generic;
 
 using BizHawk;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 
 	/// <summary>

BizHawk.MultiClient/GlobalWinF.cs

@@ -3,7 +3,7 @@ using SlimDX.DirectSound;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public static class GlobalWinF
 	{

BizHawk.MultiClient/Input/GamePad.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using SlimDX;
 using SlimDX.DirectInput;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public class GamePad
 	{

BizHawk.MultiClient/Input/GamePad360.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using SlimDX.XInput;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public class GamePad360
 	{

BizHawk.MultiClient/Input/Input.cs

@@ -8,7 +8,7 @@ using SlimDX.DirectInput;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	//coalesces events back into instantaneous states
 	public class InputCoalescer : SimpleController

BizHawk.MultiClient/Input/Keyboard.cs

@@ -1,7 +1,7 @@
 using SlimDX;
 using SlimDX.DirectInput;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public static class KeyInput
 	{

BizHawk.MultiClient/LogConsole.cs

@@ -14,7 +14,7 @@ using BizHawk.Client.Common;
 //also, collect log data independently of whether the log window is open
 //we also need to dice it into lines so that we can have a backlog policy
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	static class LogConsole
 	{

BizHawk.MultiClient/LogWindow.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class LogWindow
 	{
@@ -32,7 +32,7 @@
 			this.btnClear = new System.Windows.Forms.Button();
 			this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
 			this.buttonCopy = new System.Windows.Forms.Button();
-			this.virtualListView1 = new BizHawk.VirtualListView();
+			this.virtualListView1 = new VirtualListView();
 			this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.buttonCopyAll = new System.Windows.Forms.Button();
 			this.tableLayoutPanel1.SuspendLayout();
@@ -107,7 +107,7 @@
 			this.virtualListView1.UseCompatibleStateImageBehavior = false;
 			this.virtualListView1.View = System.Windows.Forms.View.Details;
 			this.virtualListView1.VirtualMode = true;
-			this.virtualListView1.QueryItemText += new BizHawk.QueryItemTextHandler(this.virtualListView1_QueryItemText);
+			this.virtualListView1.QueryItemText += new QueryItemTextHandler(this.virtualListView1_QueryItemText);
 			this.virtualListView1.ClientSizeChanged += new System.EventHandler(this.virtualListView1_ClientSizeChanged);
 			// 
 			// buttonCopyAll

BizHawk.MultiClient/LogWindow.cs

@@ -8,7 +8,7 @@ using BizHawk.Client.Common;
 
 //todo - perks - pause, copy to clipboard, backlog length limiting
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class LogWindow : Form
 	{

BizHawk.MultiClient/MainForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class MainForm
 	{
@@ -405,7 +405,7 @@
 			// 
 			// OpenRomMenuItem
 			// 
-			this.OpenRomMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+			this.OpenRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
 			this.OpenRomMenuItem.Name = "OpenRomMenuItem";
 			this.OpenRomMenuItem.Size = new System.Drawing.Size(140, 22);
 			this.OpenRomMenuItem.Text = "Open ROM";
@@ -415,7 +415,7 @@
 			// 
 			this.RecentRomSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripSeparator3});
-			this.RecentRomSubMenu.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+			this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
 			this.RecentRomSubMenu.Name = "RecentRomSubMenu";
 			this.RecentRomSubMenu.Size = new System.Drawing.Size(140, 22);
 			this.RecentRomSubMenu.Text = "Recent ROM";
@@ -428,7 +428,7 @@
 			// 
 			// CloseRomMenuItem
 			// 
-			this.CloseRomMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
+			this.CloseRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
 			this.CloseRomMenuItem.Name = "CloseRomMenuItem";
 			this.CloseRomMenuItem.Size = new System.Drawing.Size(140, 22);
 			this.CloseRomMenuItem.Text = "&Close ROM";
@@ -752,7 +752,7 @@
 			// 
 			// PreviousSlotMenuItem
 			// 
-			this.PreviousSlotMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft;
+			this.PreviousSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveLeft;
 			this.PreviousSlotMenuItem.Name = "PreviousSlotMenuItem";
 			this.PreviousSlotMenuItem.Size = new System.Drawing.Size(178, 22);
 			this.PreviousSlotMenuItem.Text = "Previous Slot";
@@ -760,7 +760,7 @@
 			// 
 			// NextSlotMenuItem
 			// 
-			this.NextSlotMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight;
+			this.NextSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveRight;
 			this.NextSlotMenuItem.Name = "NextSlotMenuItem";
 			this.NextSlotMenuItem.Size = new System.Drawing.Size(178, 22);
 			this.NextSlotMenuItem.Text = "Next Slot";
@@ -814,7 +814,7 @@
 			// 
 			// ReadonlyMenuItem
 			// 
-			this.ReadonlyMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly;
+			this.ReadonlyMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ReadOnly;
 			this.ReadonlyMenuItem.Name = "ReadonlyMenuItem";
 			this.ReadonlyMenuItem.Size = new System.Drawing.Size(231, 22);
 			this.ReadonlyMenuItem.Text = "Read-only";
@@ -829,7 +829,7 @@
 			// 
 			this.RecentMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripSeparator16});
-			this.RecentMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+			this.RecentMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
 			this.RecentMenuItem.Name = "RecentMenuItem";
 			this.RecentMenuItem.Size = new System.Drawing.Size(231, 22);
 			this.RecentMenuItem.Text = "Recent";
@@ -842,7 +842,7 @@
 			// 
 			// RecordMovieMenuItem
 			// 
-			this.RecordMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS;
+			this.RecordMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS;
 			this.RecordMovieMenuItem.Name = "RecordMovieMenuItem";
 			this.RecordMovieMenuItem.Size = new System.Drawing.Size(231, 22);
 			this.RecordMovieMenuItem.Text = "&Record Movie...";
@@ -850,7 +850,7 @@
 			// 
 			// PlayMovieMenuItem
 			// 
-			this.PlayMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play;
+			this.PlayMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
 			this.PlayMovieMenuItem.Name = "PlayMovieMenuItem";
 			this.PlayMovieMenuItem.Size = new System.Drawing.Size(231, 22);
 			this.PlayMovieMenuItem.Text = "&Play Movie...";
@@ -858,7 +858,7 @@
 			// 
 			// StopMovieMenuItem
 			// 
-			this.StopMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+			this.StopMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
 			this.StopMovieMenuItem.Name = "StopMovieMenuItem";
 			this.StopMovieMenuItem.Size = new System.Drawing.Size(231, 22);
 			this.StopMovieMenuItem.Text = "Stop Movie";
@@ -866,7 +866,7 @@
 			// 
 			// PlayFromBeginningMenuItem
 			// 
-			this.PlayFromBeginningMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart;
+			this.PlayFromBeginningMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
 			this.PlayFromBeginningMenuItem.Name = "PlayFromBeginningMenuItem";
 			this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(231, 22);
 			this.PlayFromBeginningMenuItem.Text = "Play from Beginning";
@@ -874,7 +874,7 @@
 			// 
 			// ImportMoviesMenuItem
 			// 
-			this.ImportMoviesMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import;
+			this.ImportMoviesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Import;
 			this.ImportMoviesMenuItem.Name = "ImportMoviesMenuItem";
 			this.ImportMoviesMenuItem.Size = new System.Drawing.Size(231, 22);
 			this.ImportMoviesMenuItem.Text = "Import Movies...";
@@ -882,7 +882,7 @@
 			// 
 			// SaveMovieMenuItem
 			// 
-			this.SaveMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
+			this.SaveMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
 			this.SaveMovieMenuItem.Name = "SaveMovieMenuItem";
 			this.SaveMovieMenuItem.Size = new System.Drawing.Size(231, 22);
 			this.SaveMovieMenuItem.Text = "&Save Movie";
@@ -890,7 +890,7 @@
 			// 
 			// StopMovieWithoutSavingMenuItem
 			// 
-			this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+			this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
 			this.StopMovieWithoutSavingMenuItem.Name = "StopMovieWithoutSavingMenuItem";
 			this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(231, 22);
 			this.StopMovieWithoutSavingMenuItem.Text = "Stop Movie without Saving";
@@ -936,7 +936,7 @@
 			// 
 			// RecordAVMenuItem
 			// 
-			this.RecordAVMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI;
+			this.RecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AVI;
 			this.RecordAVMenuItem.Name = "RecordAVMenuItem";
 			this.RecordAVMenuItem.Size = new System.Drawing.Size(163, 22);
 			this.RecordAVMenuItem.Text = "Record AVI/WAV";
@@ -944,7 +944,7 @@
 			// 
 			// StopAVIMenuItem
 			// 
-			this.StopAVIMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+			this.StopAVIMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
 			this.StopAVIMenuItem.Name = "StopAVIMenuItem";
 			this.StopAVIMenuItem.Size = new System.Drawing.Size(163, 22);
 			this.StopAVIMenuItem.Text = "Stop AVI/WAV";
@@ -977,7 +977,7 @@
 			// 
 			// ScreenshotMenuItem
 			// 
-			this.ScreenshotMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera;
+			this.ScreenshotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera;
 			this.ScreenshotMenuItem.Name = "ScreenshotMenuItem";
 			this.ScreenshotMenuItem.Size = new System.Drawing.Size(245, 22);
 			this.ScreenshotMenuItem.Text = "Screenshot";
@@ -1038,7 +1038,7 @@
 			// 
 			// PauseMenuItem
 			// 
-			this.PauseMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
+			this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
 			this.PauseMenuItem.Name = "PauseMenuItem";
 			this.PauseMenuItem.Size = new System.Drawing.Size(140, 22);
 			this.PauseMenuItem.Text = "&Pause";
@@ -1046,7 +1046,7 @@
 			// 
 			// RebootCoreMenuItem
 			// 
-			this.RebootCoreMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot;
+			this.RebootCoreMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
 			this.RebootCoreMenuItem.Name = "RebootCoreMenuItem";
 			this.RebootCoreMenuItem.Size = new System.Drawing.Size(140, 22);
 			this.RebootCoreMenuItem.Text = "&Reboot Core";
@@ -1190,7 +1190,7 @@
 			// 
 			// SwitchToFullscreenMenuItem
 			// 
-			this.SwitchToFullscreenMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen;
+			this.SwitchToFullscreenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Fullscreen;
 			this.SwitchToFullscreenMenuItem.Name = "SwitchToFullscreenMenuItem";
 			this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(198, 22);
 			this.SwitchToFullscreenMenuItem.Text = "Switch to Fullscreen";
@@ -1289,7 +1289,7 @@
 			// 
 			// ControllersMenuItem
 			// 
-			this.ControllersMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController;
+			this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
 			this.ControllersMenuItem.Name = "ControllersMenuItem";
 			this.ControllersMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.ControllersMenuItem.Text = "&Controllers...";
@@ -1297,7 +1297,7 @@
 			// 
 			// HotkeysMenuItem
 			// 
-			this.HotkeysMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys;
+			this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys;
 			this.HotkeysMenuItem.Name = "HotkeysMenuItem";
 			this.HotkeysMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.HotkeysMenuItem.Text = "&Hotkeys...";
@@ -1305,7 +1305,7 @@
 			// 
 			// MessagesMenuItem
 			// 
-			this.MessagesMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig;
+			this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig;
 			this.MessagesMenuItem.Name = "MessagesMenuItem";
 			this.MessagesMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.MessagesMenuItem.Text = "&Messages...";
@@ -1313,7 +1313,7 @@
 			// 
 			// PathsMenuItem
 			// 
-			this.PathsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS;
+			this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS;
 			this.PathsMenuItem.Name = "PathsMenuItem";
 			this.PathsMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.PathsMenuItem.Text = "Paths...";
@@ -1321,7 +1321,7 @@
 			// 
 			// SoundMenuItem
 			// 
-			this.SoundMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS;
+			this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
 			this.SoundMenuItem.Name = "SoundMenuItem";
 			this.SoundMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.SoundMenuItem.Text = "&Sound...";
@@ -1329,7 +1329,7 @@
 			// 
 			// AutofireMenuItem
 			// 
-			this.AutofireMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning;
+			this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning;
 			this.AutofireMenuItem.Name = "AutofireMenuItem";
 			this.AutofireMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.AutofireMenuItem.Text = "&Autofire...";
@@ -1337,7 +1337,7 @@
 			// 
 			// RewindOptionsMenuItem
 			// 
-			this.RewindOptionsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous;
+			this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
 			this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem";
 			this.RewindOptionsMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.RewindOptionsMenuItem.Text = "&Rewind...";
@@ -1784,7 +1784,7 @@
 			// 
 			// SaveConfigMenuItem
 			// 
-			this.SaveConfigMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save;
+			this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save;
 			this.SaveConfigMenuItem.Name = "SaveConfigMenuItem";
 			this.SaveConfigMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.SaveConfigMenuItem.Text = "Save Config";
@@ -1792,7 +1792,7 @@
 			// 
 			// LoadConfigMenuItem
 			// 
-			this.LoadConfigMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig;
+			this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig;
 			this.LoadConfigMenuItem.Name = "LoadConfigMenuItem";
 			this.LoadConfigMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.LoadConfigMenuItem.Text = "Load Config";
@@ -1821,7 +1821,7 @@
 			// 
 			// ToolBoxMenuItem
 			// 
-			this.ToolBoxMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox;
+			this.ToolBoxMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ToolBox;
 			this.ToolBoxMenuItem.Name = "ToolBoxMenuItem";
 			this.ToolBoxMenuItem.Size = new System.Drawing.Size(189, 22);
 			this.ToolBoxMenuItem.Text = "&Tool Box";
@@ -1834,7 +1834,7 @@
 			// 
 			// RamWatchMenuItem
 			// 
-			this.RamWatchMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.watch;
+			this.RamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.watch;
 			this.RamWatchMenuItem.Name = "RamWatchMenuItem";
 			this.RamWatchMenuItem.Size = new System.Drawing.Size(189, 22);
 			this.RamWatchMenuItem.Text = "RAM &Watch";
@@ -1842,7 +1842,7 @@
 			// 
 			// RamSearchMenuItem
 			// 
-			this.RamSearchMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search;
+			this.RamSearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
 			this.RamSearchMenuItem.Name = "RamSearchMenuItem";
 			this.RamSearchMenuItem.Size = new System.Drawing.Size(189, 22);
 			this.RamSearchMenuItem.Text = "RAM &Search";
@@ -1850,7 +1850,7 @@
 			// 
 			// HexEditorMenuItem
 			// 
-			this.HexEditorMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
+			this.HexEditorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
 			this.HexEditorMenuItem.Name = "HexEditorMenuItem";
 			this.HexEditorMenuItem.Size = new System.Drawing.Size(189, 22);
 			this.HexEditorMenuItem.Text = "&Hex Editor";
@@ -1858,7 +1858,7 @@
 			// 
 			// TraceLoggerMenuItem
 			// 
-			this.TraceLoggerMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil;
+			this.TraceLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
 			this.TraceLoggerMenuItem.Name = "TraceLoggerMenuItem";
 			this.TraceLoggerMenuItem.Size = new System.Drawing.Size(189, 22);
 			this.TraceLoggerMenuItem.Text = "Trace &Logger";
@@ -1866,7 +1866,7 @@
 			// 
 			// TAStudioMenuItem
 			// 
-			this.TAStudioMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
+			this.TAStudioMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio;
 			this.TAStudioMenuItem.Name = "TAStudioMenuItem";
 			this.TAStudioMenuItem.Size = new System.Drawing.Size(189, 22);
 			this.TAStudioMenuItem.Text = "&TAStudio";
@@ -1874,7 +1874,7 @@
 			// 
 			// VirtualPadMenuItem
 			// 
-			this.VirtualPadMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController;
+			this.VirtualPadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
 			this.VirtualPadMenuItem.Name = "VirtualPadMenuItem";
 			this.VirtualPadMenuItem.Size = new System.Drawing.Size(189, 22);
 			this.VirtualPadMenuItem.Text = "Virtual Pad";
@@ -1887,7 +1887,7 @@
 			// 
 			// CheatsMenuItem
 			// 
-			this.CheatsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
+			this.CheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
 			this.CheatsMenuItem.Name = "CheatsMenuItem";
 			this.CheatsMenuItem.Size = new System.Drawing.Size(189, 22);
 			this.CheatsMenuItem.Text = "Cheats";
@@ -1895,7 +1895,7 @@
 			// 
 			// LuaConsoleMenuItem
 			// 
-			this.LuaConsoleMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua;
+			this.LuaConsoleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lua;
 			this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem";
 			this.LuaConsoleMenuItem.Size = new System.Drawing.Size(189, 22);
 			this.LuaConsoleMenuItem.Text = "Lua Console";
@@ -1930,7 +1930,7 @@
 			// 
 			// NESDebuggerMenuItem
 			// 
-			this.NESDebuggerMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug;
+			this.NESDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug;
 			this.NESDebuggerMenuItem.Name = "NESDebuggerMenuItem";
 			this.NESDebuggerMenuItem.Size = new System.Drawing.Size(233, 22);
 			this.NESDebuggerMenuItem.Text = "&Debugger";
@@ -2128,7 +2128,7 @@
 			// 
 			// KeypadMenuItem
 			// 
-			this.KeypadMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator;
+			this.KeypadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator;
 			this.KeypadMenuItem.Name = "KeypadMenuItem";
 			this.KeypadMenuItem.Size = new System.Drawing.Size(165, 22);
 			this.KeypadMenuItem.Text = "Keypad";
@@ -2427,7 +2427,7 @@
 			// 
 			// SnesGfxDebuggerMenuItem
 			// 
-			this.SnesGfxDebuggerMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug;
+			this.SnesGfxDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug;
 			this.SnesGfxDebuggerMenuItem.Name = "SnesGfxDebuggerMenuItem";
 			this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(233, 22);
 			this.SnesGfxDebuggerMenuItem.Text = "Graphics Debugger";
@@ -2513,7 +2513,7 @@
 			// 
 			// OnlineHelpMenuItem
 			// 
-			this.OnlineHelpMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Help;
+			this.OnlineHelpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help;
 			this.OnlineHelpMenuItem.Name = "OnlineHelpMenuItem";
 			this.OnlineHelpMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.OnlineHelpMenuItem.Text = "&Online Help...";
@@ -2521,7 +2521,7 @@
 			// 
 			// ForumsMenuItem
 			// 
-			this.ForumsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
+			this.ForumsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio;
 			this.ForumsMenuItem.Name = "ForumsMenuItem";
 			this.ForumsMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.ForumsMenuItem.Text = "Forums...";
@@ -2529,7 +2529,7 @@
 			// 
 			// AboutMenuItem
 			// 
-			this.AboutMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall;
+			this.AboutMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall;
 			this.AboutMenuItem.Name = "AboutMenuItem";
 			this.AboutMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.AboutMenuItem.Text = "&About";
@@ -2569,7 +2569,7 @@
 			// DumpStatusButton
 			// 
 			this.DumpStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.DumpStatusButton.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+			this.DumpStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
 			this.DumpStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.DumpStatusButton.Name = "DumpStatusButton";
 			this.DumpStatusButton.ShowDropDownArrow = false;
@@ -2585,7 +2585,7 @@
 			// PlayRecordStatusButton
 			// 
 			this.PlayRecordStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.PlayRecordStatusButton.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+			this.PlayRecordStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
 			this.PlayRecordStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.PlayRecordStatusButton.Name = "PlayRecordStatusButton";
 			this.PlayRecordStatusButton.ShowDropDownArrow = false;
@@ -2596,7 +2596,7 @@
 			// 
 			this.PauseStatusButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
 			this.PauseStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.PauseStatusButton.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+			this.PauseStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
 			this.PauseStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.PauseStatusButton.Name = "PauseStatusButton";
 			this.PauseStatusButton.ShowDropDownArrow = false;
@@ -2608,7 +2608,7 @@
 			// RebootStatusBarIcon
 			// 
 			this.RebootStatusBarIcon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.RebootStatusBarIcon.Image = global::BizHawk.MultiClient.Properties.Resources.reboot;
+			this.RebootStatusBarIcon.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
 			this.RebootStatusBarIcon.Name = "RebootStatusBarIcon";
 			this.RebootStatusBarIcon.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			this.RebootStatusBarIcon.Size = new System.Drawing.Size(16, 17);
@@ -2619,14 +2619,14 @@
 			// AVIStatusLabel
 			// 
 			this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+			this.AVIStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
 			this.AVIStatusLabel.Name = "AVIStatusLabel";
 			this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17);
 			this.AVIStatusLabel.Text = "AVI Capture";
 			// 
 			// LedLightStatusLabel
 			// 
-			this.LedLightStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.LightOff;
+			this.LedLightStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LightOff;
 			this.LedLightStatusLabel.Name = "LedLightStatusLabel";
 			this.LedLightStatusLabel.Size = new System.Drawing.Size(16, 17);
 			this.LedLightStatusLabel.ToolTipText = "Disk Drive LED Light";
@@ -2717,7 +2717,7 @@
 			// KeyPriorityStatusLabel
 			// 
 			this.KeyPriorityStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.KeyPriorityStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Both;
+			this.KeyPriorityStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Both;
 			this.KeyPriorityStatusLabel.Name = "KeyPriorityStatusLabel";
 			this.KeyPriorityStatusLabel.Size = new System.Drawing.Size(16, 17);
 			this.KeyPriorityStatusLabel.Text = "KeyPriority";
@@ -2756,7 +2756,7 @@
 			// 
 			// OpenRomContextMenuItem
 			// 
-			this.OpenRomContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+			this.OpenRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
 			this.OpenRomContextMenuItem.Name = "OpenRomContextMenuItem";
 			this.OpenRomContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.OpenRomContextMenuItem.Text = "Open Rom";
@@ -2764,7 +2764,7 @@
 			// 
 			// LoadLastRomContextMenuItem
 			// 
-			this.LoadLastRomContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+			this.LoadLastRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
 			this.LoadLastRomContextMenuItem.Name = "LoadLastRomContextMenuItem";
 			this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.LoadLastRomContextMenuItem.Text = "Load Last ROM";
@@ -2777,7 +2777,7 @@
 			// 
 			// RecordMovieContextMenuItem
 			// 
-			this.RecordMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS;
+			this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS;
 			this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem";
 			this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.RecordMovieContextMenuItem.Text = "Record Movie";
@@ -2785,7 +2785,7 @@
 			// 
 			// PlayMovieContextMenuItem
 			// 
-			this.PlayMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play;
+			this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
 			this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem";
 			this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.PlayMovieContextMenuItem.Text = "Play Movie";
@@ -2793,7 +2793,7 @@
 			// 
 			// RestartMovieContextMenuItem
 			// 
-			this.RestartMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart;
+			this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
 			this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem";
 			this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.RestartMovieContextMenuItem.Text = "Restart Movie";
@@ -2801,7 +2801,7 @@
 			// 
 			// StopMovieContextMenuItem
 			// 
-			this.StopMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+			this.StopMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
 			this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem";
 			this.StopMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.StopMovieContextMenuItem.Text = "Stop Movie";
@@ -2809,7 +2809,7 @@
 			// 
 			// LoadLastMovieContextMenuItem
 			// 
-			this.LoadLastMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+			this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
 			this.LoadLastMovieContextMenuItem.Name = "LoadLastMovieContextMenuItem";
 			this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.LoadLastMovieContextMenuItem.Text = "Load Last Movie";
@@ -2824,7 +2824,7 @@
 			// 
 			// StopNoSaveContextMenuItem
 			// 
-			this.StopNoSaveContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+			this.StopNoSaveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
 			this.StopNoSaveContextMenuItem.Name = "StopNoSaveContextMenuItem";
 			this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.StopNoSaveContextMenuItem.Text = "Stop Movie without Saving";
@@ -2853,7 +2853,7 @@
 			// 
 			// SaveMovieContextMenuItem
 			// 
-			this.SaveMovieContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
+			this.SaveMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
 			this.SaveMovieContextMenuItem.Name = "SaveMovieContextMenuItem";
 			this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.SaveMovieContextMenuItem.Text = "Save Movie";
@@ -2866,7 +2866,7 @@
 			// 
 			// UndoSavestateContextMenuItem
 			// 
-			this.UndoSavestateContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo;
+			this.UndoSavestateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
 			this.UndoSavestateContextMenuItem.Name = "UndoSavestateContextMenuItem";
 			this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.UndoSavestateContextMenuItem.Text = "Undo Savestate";
@@ -2897,7 +2897,7 @@
 			// 
 			// controllersToolStripMenuItem1
 			// 
-			this.controllersToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.GameController;
+			this.controllersToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
 			this.controllersToolStripMenuItem1.Name = "controllersToolStripMenuItem1";
 			this.controllersToolStripMenuItem1.Size = new System.Drawing.Size(141, 22);
 			this.controllersToolStripMenuItem1.Text = "&Controllers...";
@@ -2905,7 +2905,7 @@
 			// 
 			// hotkeysToolStripMenuItem1
 			// 
-			this.hotkeysToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys;
+			this.hotkeysToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys;
 			this.hotkeysToolStripMenuItem1.Name = "hotkeysToolStripMenuItem1";
 			this.hotkeysToolStripMenuItem1.Size = new System.Drawing.Size(141, 22);
 			this.hotkeysToolStripMenuItem1.Text = "&Hotkeys...";
@@ -2913,7 +2913,7 @@
 			// 
 			// messagesToolStripMenuItem1
 			// 
-			this.messagesToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig;
+			this.messagesToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig;
 			this.messagesToolStripMenuItem1.Name = "messagesToolStripMenuItem1";
 			this.messagesToolStripMenuItem1.Size = new System.Drawing.Size(141, 22);
 			this.messagesToolStripMenuItem1.Text = "&Messages...";
@@ -2921,7 +2921,7 @@
 			// 
 			// pathsToolStripMenuItem1
 			// 
-			this.pathsToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS;
+			this.pathsToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS;
 			this.pathsToolStripMenuItem1.Name = "pathsToolStripMenuItem1";
 			this.pathsToolStripMenuItem1.Size = new System.Drawing.Size(141, 22);
 			this.pathsToolStripMenuItem1.Text = "Paths...";
@@ -2929,7 +2929,7 @@
 			// 
 			// soundToolStripMenuItem1
 			// 
-			this.soundToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS;
+			this.soundToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
 			this.soundToolStripMenuItem1.Name = "soundToolStripMenuItem1";
 			this.soundToolStripMenuItem1.Size = new System.Drawing.Size(141, 22);
 			this.soundToolStripMenuItem1.Text = "&Sound...";
@@ -2937,14 +2937,14 @@
 			// 
 			// autofireToolStripMenuItem1
 			// 
-			this.autofireToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning;
+			this.autofireToolStripMenuItem1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning;
 			this.autofireToolStripMenuItem1.Name = "autofireToolStripMenuItem1";
 			this.autofireToolStripMenuItem1.Size = new System.Drawing.Size(141, 22);
 			this.autofireToolStripMenuItem1.Text = "&Autofire...";
 			// 
 			// rewindToolStripMenuItem
 			// 
-			this.rewindToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous;
+			this.rewindToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
 			this.rewindToolStripMenuItem.Name = "rewindToolStripMenuItem";
 			this.rewindToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
 			this.rewindToolStripMenuItem.Text = "&Rewind";
@@ -2964,7 +2964,7 @@
 			// 
 			// toolStripMenuItem6
 			// 
-			this.toolStripMenuItem6.Image = global::BizHawk.MultiClient.Properties.Resources.Save;
+			this.toolStripMenuItem6.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save;
 			this.toolStripMenuItem6.Name = "toolStripMenuItem6";
 			this.toolStripMenuItem6.Size = new System.Drawing.Size(141, 22);
 			this.toolStripMenuItem6.Text = "Save Config";
@@ -2972,7 +2972,7 @@
 			// 
 			// toolStripMenuItem7
 			// 
-			this.toolStripMenuItem7.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig;
+			this.toolStripMenuItem7.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig;
 			this.toolStripMenuItem7.Name = "toolStripMenuItem7";
 			this.toolStripMenuItem7.Size = new System.Drawing.Size(141, 22);
 			this.toolStripMenuItem7.Text = "Load Config";
@@ -2980,7 +2980,7 @@
 			// 
 			// ScreenshotContextMenuItem
 			// 
-			this.ScreenshotContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera;
+			this.ScreenshotContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera;
 			this.ScreenshotContextMenuItem.Name = "ScreenshotContextMenuItem";
 			this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.ScreenshotContextMenuItem.Text = "Screenshot";
@@ -2988,7 +2988,7 @@
 			// 
 			// CloseRomContextMenuItem
 			// 
-			this.CloseRomContextMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
+			this.CloseRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
 			this.CloseRomContextMenuItem.Name = "CloseRomContextMenuItem";
 			this.CloseRomContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.CloseRomContextMenuItem.Text = "Close ROM";

BizHawk.MultiClient/MainForm.Events.cs

@@ -9,7 +9,7 @@ using BizHawk.Emulation.Consoles.Nintendo.SNES;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class MainForm
 	{

BizHawk.MultiClient/MainForm.Movie.cs

@@ -4,7 +4,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class MainForm
 	{

BizHawk.MultiClient/MainForm.Rewind.cs

@@ -6,7 +6,7 @@ using System.Collections.Concurrent;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class MainForm
 	{

BizHawk.MultiClient/MainForm.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
-using BizHawk.Core;
 using BizHawk.DiscSystem;
 using BizHawk.Emulation;
 using BizHawk.Emulation.Computers.Commodore64;
@@ -25,7 +24,7 @@ using BizHawk.Emulation.Consoles.TurboGrafx;
 using BizHawk.Common;
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class MainForm : Form
 	{
@@ -2925,19 +2924,19 @@ namespace BizHawk.MultiClient
 						using (Graphics g = Graphics.FromImage(bmpout))
 							g.DrawImage(bmpin, new Rectangle(0, 0, bmpout.Width, bmpout.Height));
 						bmpin.Dispose();
-						output = new AVOut.BmpVideoProvder(bmpout);
+						output = new BmpVideoProvder(bmpout);
 					}
 					else
 					{
 						if (Global.Config.AVI_CaptureOSD)
-							output = new AVOut.BmpVideoProvder(CaptureOSD());
+							output = new BmpVideoProvder(CaptureOSD());
 						else
 							output = Global.Emulator.VideoProvider;
 					}
 
 					CurrAviWriter.AddFrame(output);
-					if (output is AVOut.BmpVideoProvder)
+					if (output is BmpVideoProvder)
-						(output as AVOut.BmpVideoProvder).Dispose();
+						(output as BmpVideoProvder).Dispose();
 
 					CurrAviWriter.AddSamples(temp);
 				}

BizHawk.MultiClient/NameStateForm.Designer.cs

@@ -1,33 +1,33 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
-    partial class NameStateForm
+	partial class NameStateForm
-    {
+	{
-        /// <summary>
+		/// <summary>
-        /// Required designer variable.
+		/// Required designer variable.
-        /// </summary>
+		/// </summary>
-        private System.ComponentModel.IContainer components = null;
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
+		/// <summary>
-        /// Clean up any resources being used.
+		/// Clean up any resources being used.
-        /// </summary>
+		/// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
+		protected override void Dispose(bool disposing)
-        {
+		{
-            if (disposing && (components != null))
+			if (disposing && (components != null))
-            {
+			{
-                components.Dispose();
+				components.Dispose();
-            }
+			}
-            base.Dispose(disposing);
+			base.Dispose(disposing);
-        }
+		}
 
-        #region Windows Form Designer generated code
+		#region Windows Form Designer generated code
 
-        /// <summary>
+		/// <summary>
-        /// Required method for Designer support - do not modify
+		/// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
+		/// the contents of this method with the code editor.
-        /// </summary>
+		/// </summary>
-        private void InitializeComponent()
+		private void InitializeComponent()
-        {
+		{
 			this.cancelButton = new System.Windows.Forms.Button();
 			this.saveButton = new System.Windows.Forms.Button();
 			this.label1 = new System.Windows.Forms.Label();
@@ -90,13 +90,13 @@
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
-        }
+		}
 
-        #endregion
+		#endregion
 
-        private System.Windows.Forms.Button cancelButton;
+		private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.Button saveButton;
+		private System.Windows.Forms.Button saveButton;
-        private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox stateLabelTextBox;
+		private System.Windows.Forms.TextBox stateLabelTextBox;
-    }
+	}
 }

BizHawk.MultiClient/NameStateForm.cs

@@ -1,38 +1,38 @@
 using System;
 using System.Windows.Forms;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
-    public partial class NameStateForm : Form
+	public partial class NameStateForm : Form
-    {
+	{
-        public string Result;
+		public string Result;
-        public bool OK;
+		public bool OK;
 
-        public NameStateForm()
+		public NameStateForm()
-        {
+		{
-            InitializeComponent();
+			InitializeComponent();
-            AcceptButton = saveButton;
+			AcceptButton = saveButton;
-            CancelButton = cancelButton;
+			CancelButton = cancelButton;
-        }
+		}
 
-        private void cancelButton_Click(object sender, EventArgs e)
+		private void cancelButton_Click(object sender, EventArgs e)
-        {
+		{
-            Close();
+			Close();
-        }
+		}
 
-        private void saveButton_Click(object sender, EventArgs e)
+		private void saveButton_Click(object sender, EventArgs e)
-        {
+		{
-            if (stateLabelTextBox.Text.Length != 0)
+			if (stateLabelTextBox.Text.Length != 0)
-            {
+			{
-                Result = stateLabelTextBox.Text;
+				Result = stateLabelTextBox.Text;
-                OK = true;
+				OK = true;
-                Close();
+				Close();
-            }
+			}
-        }
+		}
 
-        private void NameStateForm_Shown(object sender, EventArgs e)
+		private void NameStateForm_Shown(object sender, EventArgs e)
-        {
+		{
-            stateLabelTextBox.Focus();
+			stateLabelTextBox.Focus();
-        }
+		}
-    }
+	}
 }

BizHawk.MultiClient/Program.cs

@@ -15,7 +15,7 @@ using Microsoft.VisualBasic.ApplicationServices;
 using BizHawk.Common;
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	static class Program
 	{

BizHawk.MultiClient/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace BizHawk.MultiClient.Properties {
+namespace BizHawk.Client.EmuHawk.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace BizHawk.MultiClient.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BizHawk.MultiClient.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BizHawk.Client.EmuHawk.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

BizHawk.MultiClient/Properties/Settings.Designer.cs

@@ -1,18 +1,18 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.225
+//     Runtime Version:4.0.30319.18052
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace BizHawk.MultiClient.Properties {
+namespace BizHawk.Client.EmuHawk.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

BizHawk.MultiClient/RenderPanel.cs

@@ -12,9 +12,8 @@ using d3d9font=SlimDX.Direct3D9.Font;
 #endif
 
 using BizHawk.Client.Common;
-using BizHawk.Core;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 #if WINDOWS
 	public class ImageTexture : IDisposable

BizHawk.MultiClient/ScreenSaver.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	// Derived from http://www.codeproject.com/KB/cs/ScreenSaverControl.aspx
 	public static class ScreenSaver

BizHawk.MultiClient/Sound.cs

@@ -8,7 +8,7 @@ using SlimDX.Multimedia;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 #if WINDOWS
 	public static class SoundEnumeration

BizHawk.MultiClient/Throttle.cs

@@ -6,7 +6,7 @@ using BizHawk.Client.Common;
 
 //this throttle is nitsuja's fine-tuned techniques from desmume
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	class Throttle
 	{

BizHawk.MultiClient/Watch.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
     //Data structure for a watch item in the Ram Watch Dialog
     public enum atype { BYTE, WORD, DWORD, SEPARATOR };   //TODO: more custom types too like 12.4 and 24.12 fixed point

BizHawk.MultiClient/config/AutofireConfig.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class AutofireConfig
 	{

BizHawk.MultiClient/config/AutofireConfig.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class AutofireConfig : Form
 	{

BizHawk.MultiClient/config/ControllerConfig.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class ControllerConfig
 	{

BizHawk.MultiClient/config/ControllerConfig.cs

@@ -6,7 +6,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class ControllerConfig : Form
 	{

BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class AnalogBindControl
 	{

BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class AnalogBindControl : UserControl
 	{

BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs

@@ -7,7 +7,7 @@ using System.Drawing;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	class AnalogBindPanel : UserControl
 	{

BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class ControllerConfigPanel
 	{

BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs

@@ -4,10 +4,9 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	// this is a little messy right now because of remnants of the old config system
-
 	public partial class ControllerConfigPanel : UserControl
 	{
 		// the dictionary that results are saved to

BizHawk.MultiClient/config/FirmwaresConfig.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
     partial class FirmwaresConfig
     {

BizHawk.MultiClient/config/FirmwaresConfig.cs

@@ -23,7 +23,7 @@ using BizHawk.Client.Common;
 
 //TODO - display some kind if [!] if you have a user-specified file which is known but defined as incompatible by the firmware DB
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class FirmwaresConfig : Form
 	{
@@ -76,7 +76,7 @@ namespace BizHawk.MultiClient
 			InitializeComponent();
 
 			//prep imagelist for listview with 3 item states for {idUnsure, idMissing, idOk}
-			imageList1.Images.AddRange(new[] { MultiClient.Properties.Resources.RetroQuestion, MultiClient.Properties.Resources.ExclamationRed, MultiClient.Properties.Resources.GreenCheck });
+			imageList1.Images.AddRange(new[] { EmuHawk.Properties.Resources.RetroQuestion, EmuHawk.Properties.Resources.ExclamationRed, EmuHawk.Properties.Resources.GreenCheck });
 
 			listviewSorter = new ListViewSorter(this, -1);
 

BizHawk.MultiClient/config/FirmwaresConfigInfo.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class FirmwaresConfigInfo
 	{

BizHawk.MultiClient/config/FirmwaresConfigInfo.cs

@@ -11,7 +11,7 @@ using System.Windows.Forms;
 //todo - check(mark) the one thats selected
 //todo - turn top info into textboxes i guess, labels suck
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class FirmwaresConfigInfo : Form
 	{

BizHawk.MultiClient/config/GifAnimator.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class GifAnimator
 	{

BizHawk.MultiClient/config/GifAnimator.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class GifAnimator : Form
 	{

BizHawk.MultiClient/config/HotkeyConfig.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class HotkeyConfig
 	{

BizHawk.MultiClient/config/HotkeyConfig.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class HotkeyConfig : Form
 	{

BizHawk.MultiClient/config/InputWidget.cs

@@ -6,7 +6,7 @@ using System.Windows.Forms;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public class InputWidget : TextBox
 	{

BizHawk.MultiClient/config/MessageConfig.Designer.cs

@@ -1,33 +1,33 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
-    partial class MessageConfig
+	partial class MessageConfig
-    {
+	{
-        /// <summary>
+		/// <summary>
-        /// Required designer variable.
+		/// Required designer variable.
-        /// </summary>
+		/// </summary>
-        private System.ComponentModel.IContainer components = null;
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
+		/// <summary>
-        /// Clean up any resources being used.
+		/// Clean up any resources being used.
-        /// </summary>
+		/// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
+		protected override void Dispose(bool disposing)
-        {
+		{
-            if (disposing && (components != null))
+			if (disposing && (components != null))
-            {
+			{
-                components.Dispose();
+				components.Dispose();
-            }
+			}
-            base.Dispose(disposing);
+			base.Dispose(disposing);
-        }
+		}
 
-        #region Windows Form Designer generated code
+		#region Windows Form Designer generated code
 
-        /// <summary>
+		/// <summary>
-        /// Required method for Designer support - do not modify
+		/// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
+		/// the contents of this method with the code editor.
-        /// </summary>
+		/// </summary>
-        private void InitializeComponent()
+		private void InitializeComponent()
-        {
+		{
 			this.OK = new System.Windows.Forms.Button();
 			this.MessageTypeBox = new System.Windows.Forms.GroupBox();
 			this.AutoholdLabel = new System.Windows.Forms.Label();
@@ -687,45 +687,45 @@
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
-        }
+		}
 
-        #endregion
+		#endregion
 
-        private System.Windows.Forms.Button OK;
+		private System.Windows.Forms.Button OK;
-        private System.Windows.Forms.GroupBox MessageTypeBox;
+		private System.Windows.Forms.GroupBox MessageTypeBox;
-        private System.Windows.Forms.RadioButton MessagesRadio;
+		private System.Windows.Forms.RadioButton MessagesRadio;
-        private System.Windows.Forms.RadioButton InputDisplayRadio;
+		private System.Windows.Forms.RadioButton InputDisplayRadio;
-        private System.Windows.Forms.RadioButton LagCounterRadio;
+		private System.Windows.Forms.RadioButton LagCounterRadio;
-        private System.Windows.Forms.RadioButton FrameCounterRadio;
+		private System.Windows.Forms.RadioButton FrameCounterRadio;
-        private System.Windows.Forms.RadioButton FPSRadio;
+		private System.Windows.Forms.RadioButton FPSRadio;
 		private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.ColorDialog MessageColorDialog;
+		private System.Windows.Forms.ColorDialog MessageColorDialog;
-        private System.Windows.Forms.Button Cancel;
+		private System.Windows.Forms.Button Cancel;
-        private System.Windows.Forms.Label MessLabel;
+		private System.Windows.Forms.Label MessLabel;
-        private System.Windows.Forms.Label InpLabel;
+		private System.Windows.Forms.Label InpLabel;
-        private System.Windows.Forms.Label LagLabel;
+		private System.Windows.Forms.Label LagLabel;
-        private System.Windows.Forms.Label FCLabel;
+		private System.Windows.Forms.Label FCLabel;
-        private System.Windows.Forms.Label FpsPosLabel;
+		private System.Windows.Forms.Label FpsPosLabel;
-        private System.Windows.Forms.Button ResetDefaultsButton;
+		private System.Windows.Forms.Button ResetDefaultsButton;
 		private System.Windows.Forms.TextBox ColorText;
-        private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Panel PositionPanel;
+		private System.Windows.Forms.Panel PositionPanel;
-        private System.Windows.Forms.NumericUpDown XNumeric;
+		private System.Windows.Forms.NumericUpDown XNumeric;
-        private System.Windows.Forms.NumericUpDown YNumeric;
+		private System.Windows.Forms.NumericUpDown YNumeric;
-        private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.GroupBox PositionGroupBox;
+		private System.Windows.Forms.GroupBox PositionGroupBox;
-        private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.Label label5;
 		private System.Windows.Forms.TextBox AlertColorText;
-        private System.Windows.Forms.Panel AlertColorPanel;
+		private System.Windows.Forms.Panel AlertColorPanel;
-        private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label7;
+		private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label8;
+		private System.Windows.Forms.Label label8;
 		private System.Windows.Forms.TextBox LInputText;
-        private System.Windows.Forms.Panel LInputColorPanel;
+		private System.Windows.Forms.Panel LInputColorPanel;
-        private System.Windows.Forms.ColorDialog AlertColorDialog;
+		private System.Windows.Forms.ColorDialog AlertColorDialog;
-        private System.Windows.Forms.ColorDialog LInputColorDialog;
+		private System.Windows.Forms.ColorDialog LInputColorDialog;
 		private System.Windows.Forms.RadioButton BR;
 		private System.Windows.Forms.RadioButton BL;
 		private System.Windows.Forms.RadioButton TR;
@@ -743,5 +743,5 @@
 		private System.Windows.Forms.CheckBox StackMessagesCheckbox;
 		private System.Windows.Forms.Label AutoholdLabel;
 		private System.Windows.Forms.RadioButton AutoholdRadio;
-    }
+	}
 }

BizHawk.MultiClient/config/MessageConfig.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class MessageConfig : Form
 	{

BizHawk.MultiClient/config/PathConfig.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class PathConfig
 	{
@@ -28,162 +28,162 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.OK = new System.Windows.Forms.Button();
+			this.OK = new System.Windows.Forms.Button();
-            this.Cancel = new System.Windows.Forms.Button();
+			this.Cancel = new System.Windows.Forms.Button();
-            this.PathTabControl = new System.Windows.Forms.TabControl();
+			this.PathTabControl = new System.Windows.Forms.TabControl();
-            this.SaveBtn = new System.Windows.Forms.Button();
+			this.SaveBtn = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
-            this.RecentForROMs = new System.Windows.Forms.CheckBox();
+			this.RecentForROMs = new System.Windows.Forms.CheckBox();
-            this.BasePathBox = new System.Windows.Forms.TextBox();
+			this.BasePathBox = new System.Windows.Forms.TextBox();
-            this.BrowseBase = new System.Windows.Forms.Button();
+			this.BrowseBase = new System.Windows.Forms.Button();
-            this.BaseDescription = new System.Windows.Forms.Label();
+			this.BaseDescription = new System.Windows.Forms.Label();
-            this.DefaultsBtn = new System.Windows.Forms.Button();
+			this.DefaultsBtn = new System.Windows.Forms.Button();
-            this.SuspendLayout();
+			this.SuspendLayout();
-            // 
+			// 
-            // OK
+			// OK
-            // 
+			// 
-            this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.OK.Location = new System.Drawing.Point(471, 411);
+			this.OK.Location = new System.Drawing.Point(471, 411);
-            this.OK.Name = "OK";
+			this.OK.Name = "OK";
-            this.OK.Size = new System.Drawing.Size(75, 23);
+			this.OK.Size = new System.Drawing.Size(75, 23);
-            this.OK.TabIndex = 0;
+			this.OK.TabIndex = 0;
-            this.OK.Text = "&Ok";
+			this.OK.Text = "&Ok";
-            this.OK.UseVisualStyleBackColor = true;
+			this.OK.UseVisualStyleBackColor = true;
-            this.OK.Click += new System.EventHandler(this.OK_Click);
+			this.OK.Click += new System.EventHandler(this.OK_Click);
-            // 
+			// 
-            // Cancel
+			// Cancel
-            // 
+			// 
-            this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.Cancel.Location = new System.Drawing.Point(552, 411);
+			this.Cancel.Location = new System.Drawing.Point(552, 411);
-            this.Cancel.Name = "Cancel";
+			this.Cancel.Name = "Cancel";
-            this.Cancel.Size = new System.Drawing.Size(75, 23);
+			this.Cancel.Size = new System.Drawing.Size(75, 23);
-            this.Cancel.TabIndex = 1;
+			this.Cancel.TabIndex = 1;
-            this.Cancel.Text = "&Cancel";
+			this.Cancel.Text = "&Cancel";
-            this.Cancel.UseVisualStyleBackColor = true;
+			this.Cancel.UseVisualStyleBackColor = true;
-            this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
+			this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
-            // 
+			// 
-            // PathTabControl
+			// PathTabControl
-            // 
+			// 
-            this.PathTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.PathTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left) 
+			| System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
+			| System.Windows.Forms.AnchorStyles.Right)));
-            this.PathTabControl.Location = new System.Drawing.Point(12, 84);
+			this.PathTabControl.Location = new System.Drawing.Point(12, 84);
-            this.PathTabControl.Multiline = true;
+			this.PathTabControl.Multiline = true;
-            this.PathTabControl.Name = "PathTabControl";
+			this.PathTabControl.Name = "PathTabControl";
-            this.PathTabControl.SelectedIndex = 0;
+			this.PathTabControl.SelectedIndex = 0;
-            this.PathTabControl.Size = new System.Drawing.Size(615, 321);
+			this.PathTabControl.Size = new System.Drawing.Size(615, 321);
-            this.PathTabControl.TabIndex = 2;
+			this.PathTabControl.TabIndex = 2;
-            // 
+			// 
-            // SaveBtn
+			// SaveBtn
-            // 
+			// 
-            this.SaveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.SaveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.SaveBtn.Location = new System.Drawing.Point(12, 411);
+			this.SaveBtn.Location = new System.Drawing.Point(12, 411);
-            this.SaveBtn.Name = "SaveBtn";
+			this.SaveBtn.Name = "SaveBtn";
-            this.SaveBtn.Size = new System.Drawing.Size(75, 23);
+			this.SaveBtn.Size = new System.Drawing.Size(75, 23);
-            this.SaveBtn.TabIndex = 3;
+			this.SaveBtn.TabIndex = 3;
-            this.SaveBtn.Text = "&Save";
+			this.SaveBtn.Text = "&Save";
-            this.SaveBtn.UseVisualStyleBackColor = true;
+			this.SaveBtn.UseVisualStyleBackColor = true;
-            this.SaveBtn.Click += new System.EventHandler(this.SaveBtn_Click);
+			this.SaveBtn.Click += new System.EventHandler(this.SaveBtn_Click);
-            // 
+			// 
-            // label1
+			// label1
-            // 
+			// 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label1.AutoSize = true;
+			this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(527, 52);
+			this.label1.Location = new System.Drawing.Point(527, 52);
-            this.label1.Name = "label1";
+			this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(97, 13);
+			this.label1.Size = new System.Drawing.Size(97, 13);
-            this.label1.TabIndex = 210;
+			this.label1.TabIndex = 210;
-            this.label1.Text = "Special Commands";
+			this.label1.Text = "Special Commands";
-            // 
+			// 
-            // button1
+			// button1
-            // 
+			// 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.Image = global::BizHawk.MultiClient.Properties.Resources.Help;
+			this.button1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help;
-            this.button1.Location = new System.Drawing.Point(496, 47);
+			this.button1.Location = new System.Drawing.Point(496, 47);
-            this.button1.Name = "button1";
+			this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(26, 23);
+			this.button1.Size = new System.Drawing.Size(26, 23);
-            this.button1.TabIndex = 209;
+			this.button1.TabIndex = 209;
-            this.button1.UseVisualStyleBackColor = true;
+			this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
+			this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
+			// 
-            // RecentForROMs
+			// RecentForROMs
-            // 
+			// 
-            this.RecentForROMs.AutoSize = true;
+			this.RecentForROMs.AutoSize = true;
-            this.RecentForROMs.Location = new System.Drawing.Point(12, 51);
+			this.RecentForROMs.Location = new System.Drawing.Point(12, 51);
-            this.RecentForROMs.Name = "RecentForROMs";
+			this.RecentForROMs.Name = "RecentForROMs";
-            this.RecentForROMs.Size = new System.Drawing.Size(184, 17);
+			this.RecentForROMs.Size = new System.Drawing.Size(184, 17);
-            this.RecentForROMs.TabIndex = 207;
+			this.RecentForROMs.TabIndex = 207;
-            this.RecentForROMs.Text = "Always use recent path for ROMs";
+			this.RecentForROMs.Text = "Always use recent path for ROMs";
-            this.RecentForROMs.UseVisualStyleBackColor = true;
+			this.RecentForROMs.UseVisualStyleBackColor = true;
-            this.RecentForROMs.CheckedChanged += new System.EventHandler(this.RecentForROMs_CheckedChanged);
+			this.RecentForROMs.CheckedChanged += new System.EventHandler(this.RecentForROMs_CheckedChanged);
-            // 
+			// 
-            // BasePathBox
+			// BasePathBox
-            // 
+			// 
-            this.BasePathBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			this.BasePathBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
+			| System.Windows.Forms.AnchorStyles.Right)));
-            this.BasePathBox.Location = new System.Drawing.Point(12, 15);
+			this.BasePathBox.Location = new System.Drawing.Point(12, 15);
-            this.BasePathBox.Name = "BasePathBox";
+			this.BasePathBox.Name = "BasePathBox";
-            this.BasePathBox.Size = new System.Drawing.Size(510, 20);
+			this.BasePathBox.Size = new System.Drawing.Size(510, 20);
-            this.BasePathBox.TabIndex = 205;
+			this.BasePathBox.TabIndex = 205;
-            // 
+			// 
-            // BrowseBase
+			// BrowseBase
-            // 
+			// 
-            this.BrowseBase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.BrowseBase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.BrowseBase.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+			this.BrowseBase.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
-            this.BrowseBase.Location = new System.Drawing.Point(530, 14);
+			this.BrowseBase.Location = new System.Drawing.Point(530, 14);
-            this.BrowseBase.Name = "BrowseBase";
+			this.BrowseBase.Name = "BrowseBase";
-            this.BrowseBase.Size = new System.Drawing.Size(26, 23);
+			this.BrowseBase.Size = new System.Drawing.Size(26, 23);
-            this.BrowseBase.TabIndex = 206;
+			this.BrowseBase.TabIndex = 206;
-            this.BrowseBase.UseVisualStyleBackColor = true;
+			this.BrowseBase.UseVisualStyleBackColor = true;
-            this.BrowseBase.Click += new System.EventHandler(this.BrowseBase_Click);
+			this.BrowseBase.Click += new System.EventHandler(this.BrowseBase_Click);
-            // 
+			// 
-            // BaseDescription
+			// BaseDescription
-            // 
+			// 
-            this.BaseDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.BaseDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.BaseDescription.AutoSize = true;
+			this.BaseDescription.AutoSize = true;
-            this.BaseDescription.Location = new System.Drawing.Point(563, 19);
+			this.BaseDescription.Location = new System.Drawing.Point(563, 19);
-            this.BaseDescription.Name = "BaseDescription";
+			this.BaseDescription.Name = "BaseDescription";
-            this.BaseDescription.Size = new System.Drawing.Size(64, 13);
+			this.BaseDescription.Size = new System.Drawing.Size(64, 13);
-            this.BaseDescription.TabIndex = 208;
+			this.BaseDescription.TabIndex = 208;
-            this.BaseDescription.Text = "Global Base";
+			this.BaseDescription.Text = "Global Base";
-            // 
+			// 
-            // DefaultsBtn
+			// DefaultsBtn
-            // 
+			// 
-            this.DefaultsBtn.Location = new System.Drawing.Point(93, 411);
+			this.DefaultsBtn.Location = new System.Drawing.Point(93, 411);
-            this.DefaultsBtn.Name = "DefaultsBtn";
+			this.DefaultsBtn.Name = "DefaultsBtn";
-            this.DefaultsBtn.Size = new System.Drawing.Size(75, 23);
+			this.DefaultsBtn.Size = new System.Drawing.Size(75, 23);
-            this.DefaultsBtn.TabIndex = 211;
+			this.DefaultsBtn.TabIndex = 211;
-            this.DefaultsBtn.Text = "&Defaults";
+			this.DefaultsBtn.Text = "&Defaults";
-            this.DefaultsBtn.UseVisualStyleBackColor = true;
+			this.DefaultsBtn.UseVisualStyleBackColor = true;
-            this.DefaultsBtn.Click += new System.EventHandler(this.DefaultsBtn_Click);
+			this.DefaultsBtn.Click += new System.EventHandler(this.DefaultsBtn_Click);
-            // 
+			// 
-            // NewPathConfig
+			// NewPathConfig
-            // 
+			// 
-            this.AcceptButton = this.OK;
+			this.AcceptButton = this.OK;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.Cancel;
+			this.CancelButton = this.Cancel;
-            this.ClientSize = new System.Drawing.Size(639, 446);
+			this.ClientSize = new System.Drawing.Size(639, 446);
-            this.Controls.Add(this.DefaultsBtn);
+			this.Controls.Add(this.DefaultsBtn);
-            this.Controls.Add(this.label1);
+			this.Controls.Add(this.label1);
-            this.Controls.Add(this.button1);
+			this.Controls.Add(this.button1);
-            this.Controls.Add(this.RecentForROMs);
+			this.Controls.Add(this.RecentForROMs);
-            this.Controls.Add(this.BasePathBox);
+			this.Controls.Add(this.BasePathBox);
-            this.Controls.Add(this.BrowseBase);
+			this.Controls.Add(this.BrowseBase);
-            this.Controls.Add(this.BaseDescription);
+			this.Controls.Add(this.BaseDescription);
-            this.Controls.Add(this.SaveBtn);
+			this.Controls.Add(this.SaveBtn);
-            this.Controls.Add(this.PathTabControl);
+			this.Controls.Add(this.PathTabControl);
-            this.Controls.Add(this.Cancel);
+			this.Controls.Add(this.Cancel);
-            this.Controls.Add(this.OK);
+			this.Controls.Add(this.OK);
-            this.MinimumSize = new System.Drawing.Size(360, 250);
+			this.MinimumSize = new System.Drawing.Size(360, 250);
-            this.Name = "NewPathConfig";
+			this.Name = "NewPathConfig";
-            this.ShowIcon = false;
+			this.ShowIcon = false;
-            this.Text = "Path Configuration";
+			this.Text = "Path Configuration";
-            this.Load += new System.EventHandler(this.NewPathConfig_Load);
+			this.Load += new System.EventHandler(this.NewPathConfig_Load);
-            this.ResumeLayout(false);
+			this.ResumeLayout(false);
-            this.PerformLayout();
+			this.PerformLayout();
 
 		}
 

BizHawk.MultiClient/config/PathConfig.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class PathConfig : Form
 	{
@@ -149,8 +149,8 @@ namespace BizHawk.MultiClient
 
 					Button btn = new Button()
 					{
-						Text = "",
+						Text = String.Empty,
-						Image = BizHawk.MultiClient.Properties.Resources.OpenFile,
+						Image = BizHawk.Client.EmuHawk.Properties.Resources.OpenFile,
 						Location = new Point(widget_offset, _y - 1),
 						Width = button_width,
 						Name = path.Type,

BizHawk.MultiClient/config/PathInfo.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class PathInfo
 	{

BizHawk.MultiClient/config/PathInfo.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class PathInfo : Form
 	{

BizHawk.MultiClient/config/RewindConfig.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class RewindConfig
 	{

BizHawk.MultiClient/config/RewindConfig.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class RewindConfig : Form
 	{

BizHawk.MultiClient/config/SoundConfig.Designer.cs

@@ -1,33 +1,33 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
-    partial class SoundConfig
+	partial class SoundConfig
-    {
+	{
-        /// <summary>
+		/// <summary>
-        /// Required designer variable.
+		/// Required designer variable.
-        /// </summary>
+		/// </summary>
-        private System.ComponentModel.IContainer components = null;
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
+		/// <summary>
-        /// Clean up any resources being used.
+		/// Clean up any resources being used.
-        /// </summary>
+		/// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
+		protected override void Dispose(bool disposing)
-        {
+		{
-            if (disposing && (components != null))
+			if (disposing && (components != null))
-            {
+			{
-                components.Dispose();
+				components.Dispose();
-            }
+			}
-            base.Dispose(disposing);
+			base.Dispose(disposing);
-        }
+		}
 
-        #region Windows Form Designer generated code
+		#region Windows Form Designer generated code
 
-        /// <summary>
+		/// <summary>
-        /// Required method for Designer support - do not modify
+		/// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
+		/// the contents of this method with the code editor.
-        /// </summary>
+		/// </summary>
-        private void InitializeComponent()
+		private void InitializeComponent()
-        {
+		{
 			this.Cancel = new System.Windows.Forms.Button();
 			this.OK = new System.Windows.Forms.Button();
 			this.SoundOnCheckBox = new System.Windows.Forms.CheckBox();
@@ -131,9 +131,9 @@
 			// 
 			// listBoxSoundDevices
 			// 
-			this.listBoxSoundDevices.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.listBoxSoundDevices.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left) 
+			| System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
+			| System.Windows.Forms.AnchorStyles.Right)));
 			this.listBoxSoundDevices.FormattingEnabled = true;
 			this.listBoxSoundDevices.Location = new System.Drawing.Point(108, 108);
 			this.listBoxSoundDevices.Name = "listBoxSoundDevices";
@@ -176,19 +176,19 @@
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
-        }
+		}
 
-        #endregion
+		#endregion
 
-        private System.Windows.Forms.Button Cancel;
+		private System.Windows.Forms.Button Cancel;
-        private System.Windows.Forms.Button OK;
+		private System.Windows.Forms.Button OK;
-        private System.Windows.Forms.CheckBox SoundOnCheckBox;
+		private System.Windows.Forms.CheckBox SoundOnCheckBox;
-        private System.Windows.Forms.CheckBox MuteFrameAdvance;
+		private System.Windows.Forms.CheckBox MuteFrameAdvance;
-        private System.Windows.Forms.GroupBox SoundVolGroup;
+		private System.Windows.Forms.GroupBox SoundVolGroup;
-        private System.Windows.Forms.NumericUpDown SoundVolNumeric;
+		private System.Windows.Forms.NumericUpDown SoundVolNumeric;
-        private System.Windows.Forms.TrackBar SoundVolBar;
+		private System.Windows.Forms.TrackBar SoundVolBar;
 		private System.Windows.Forms.CheckBox ThrottlecheckBox;
 		private System.Windows.Forms.ListBox listBoxSoundDevices;
 		private System.Windows.Forms.Label label1;
-    }
+	}
 }

BizHawk.MultiClient/config/SoundConfig.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class SoundConfig : Form
 	{

BizHawk.MultiClient/movie/EditCommentsForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class EditCommentsForm
 	{

BizHawk.MultiClient/movie/EditCommentsForm.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class EditCommentsForm : Form
 	{

BizHawk.MultiClient/movie/EditSubtitlesForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	partial class EditSubtitlesForm
 	{

BizHawk.MultiClient/movie/EditSubtitlesForm.cs

@@ -5,7 +5,7 @@ using System.Globalization;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class EditSubtitlesForm : Form
 	{

BizHawk.MultiClient/movie/PlayMovie.Designer.cs

@@ -1,33 +1,33 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
-    partial class PlayMovie
+	partial class PlayMovie
-    {
+	{
-        /// <summary>
+		/// <summary>
-        /// Required designer variable.
+		/// Required designer variable.
-        /// </summary>
+		/// </summary>
-        private System.ComponentModel.IContainer components = null;
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
+		/// <summary>
-        /// Clean up any resources being used.
+		/// Clean up any resources being used.
-        /// </summary>
+		/// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
+		protected override void Dispose(bool disposing)
-        {
+		{
-            if (disposing && (components != null))
+			if (disposing && (components != null))
-            {
+			{
-                components.Dispose();
+				components.Dispose();
-            }
+			}
-            base.Dispose(disposing);
+			base.Dispose(disposing);
-        }
+		}
 
-        #region Windows Form Designer generated code
+		#region Windows Form Designer generated code
 
-        /// <summary>
+		/// <summary>
-        /// Required method for Designer support - do not modify
+		/// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
+		/// the contents of this method with the code editor.
-        /// </summary>
+		/// </summary>
-        private void InitializeComponent()
+		private void InitializeComponent()
-        {
+		{
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PlayMovie));
 			this.Cancel = new System.Windows.Forms.Button();
@@ -46,7 +46,7 @@
 			this.Scan = new System.Windows.Forms.Button();
 			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
 			this.MatchGameNameCheckBox = new System.Windows.Forms.CheckBox();
-			this.MovieView = new BizHawk.VirtualListView();
+			this.MovieView = new VirtualListView();
 			this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -81,7 +81,7 @@
 			// BrowseMovies
 			// 
 			this.BrowseMovies.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.BrowseMovies.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+			this.BrowseMovies.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
 			this.BrowseMovies.Location = new System.Drawing.Point(12, 337);
 			this.BrowseMovies.Name = "BrowseMovies";
 			this.BrowseMovies.Size = new System.Drawing.Size(31, 23);
@@ -92,9 +92,9 @@
 			// 
 			// DetailsView
 			// 
-			this.DetailsView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.DetailsView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left) 
+			| System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
+			| System.Windows.Forms.AnchorStyles.Right)));
 			this.DetailsView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader5,
             this.columnHeader6});
@@ -121,8 +121,8 @@
 			// 
 			// groupBox1
 			// 
-			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Right)));
+			| System.Windows.Forms.AnchorStyles.Right)));
 			this.groupBox1.Controls.Add(this.button2);
 			this.groupBox1.Controls.Add(this.button1);
 			this.groupBox1.Controls.Add(this.DetailsView);
@@ -206,7 +206,7 @@
 			// Scan
 			// 
 			this.Scan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.Scan.Image = global::BizHawk.MultiClient.Properties.Resources.Scan;
+			this.Scan.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Scan;
 			this.Scan.Location = new System.Drawing.Point(49, 337);
 			this.Scan.Name = "Scan";
 			this.Scan.Size = new System.Drawing.Size(27, 23);
@@ -230,9 +230,9 @@
 			// MovieView
 			// 
 			this.MovieView.AllowDrop = true;
-			this.MovieView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.MovieView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left) 
+			| System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
+			| System.Windows.Forms.AnchorStyles.Right)));
 			this.MovieView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader1,
             this.columnHeader2,
@@ -306,30 +306,30 @@
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
-        }
+		}
 
-        #endregion
+		#endregion
 
-        private System.Windows.Forms.Button Cancel;
+		private System.Windows.Forms.Button Cancel;
-        private System.Windows.Forms.Button OK;
+		private System.Windows.Forms.Button OK;
-        private System.Windows.Forms.Button BrowseMovies;
+		private System.Windows.Forms.Button BrowseMovies;
-        private VirtualListView MovieView;
+		private VirtualListView MovieView;
-        private System.Windows.Forms.ColumnHeader columnHeader1;
+		private System.Windows.Forms.ColumnHeader columnHeader1;
-        private System.Windows.Forms.ColumnHeader columnHeader2;
+		private System.Windows.Forms.ColumnHeader columnHeader2;
-        private System.Windows.Forms.ColumnHeader columnHeader3;
+		private System.Windows.Forms.ColumnHeader columnHeader3;
-        private System.Windows.Forms.ColumnHeader columnHeader4;
+		private System.Windows.Forms.ColumnHeader columnHeader4;
-        private System.Windows.Forms.ListView DetailsView;
+		private System.Windows.Forms.ListView DetailsView;
-        private System.Windows.Forms.ColumnHeader columnHeader5;
+		private System.Windows.Forms.ColumnHeader columnHeader5;
-        private System.Windows.Forms.ColumnHeader columnHeader6;
+		private System.Windows.Forms.ColumnHeader columnHeader6;
-        private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Label MovieCount;
+		private System.Windows.Forms.Label MovieCount;
-        private System.Windows.Forms.CheckBox ReadOnlyCheckBox;
+		private System.Windows.Forms.CheckBox ReadOnlyCheckBox;
 		private System.Windows.Forms.CheckBox IncludeSubDirectories;
 		private System.Windows.Forms.CheckBox ShowStateFiles;
 		private System.Windows.Forms.Button Scan;
 		private System.Windows.Forms.ToolTip toolTip1;
 		private System.Windows.Forms.CheckBox MatchGameNameCheckBox;
-    }
+	}
 }

BizHawk.MultiClient/movie/PlayMovie.cs

@@ -9,7 +9,7 @@ using System.IO;
 using BizHawk.Common;
 using BizHawk.Client.Common;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class PlayMovie : Form
 	{

BizHawk.MultiClient/movie/RecordMovie.Designer.cs

@@ -1,33 +1,33 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
-    partial class RecordMovie
+	partial class RecordMovie
-    {
+	{
-        /// <summary>
+		/// <summary>
-        /// Required designer variable.
+		/// Required designer variable.
-        /// </summary>
+		/// </summary>
-        private System.ComponentModel.IContainer components = null;
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
+		/// <summary>
-        /// Clean up any resources being used.
+		/// Clean up any resources being used.
-        /// </summary>
+		/// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
+		protected override void Dispose(bool disposing)
-        {
+		{
-            if (disposing && (components != null))
+			if (disposing && (components != null))
-            {
+			{
-                components.Dispose();
+				components.Dispose();
-            }
+			}
-            base.Dispose(disposing);
+			base.Dispose(disposing);
-        }
+		}
 
-        #region Windows Form Designer generated code
+		#region Windows Form Designer generated code
 
-        /// <summary>
+		/// <summary>
-        /// Required method for Designer support - do not modify
+		/// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
+		/// the contents of this method with the code editor.
-        /// </summary>
+		/// </summary>
-        private void InitializeComponent()
+		private void InitializeComponent()
-        {
+		{
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RecordMovie));
 			this.Cancel = new System.Windows.Forms.Button();
 			this.OK = new System.Windows.Forms.Button();
@@ -69,7 +69,7 @@
 			// Browse
 			// 
 			this.Browse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.Browse.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+			this.Browse.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
 			this.Browse.Location = new System.Drawing.Point(423, 13);
 			this.Browse.Name = "Browse";
 			this.Browse.Size = new System.Drawing.Size(25, 23);
@@ -189,14 +189,14 @@
 			this.groupBox1.PerformLayout();
 			this.ResumeLayout(false);
 
-        }
+		}
 
-        #endregion
+		#endregion
 
-        private System.Windows.Forms.Button Cancel;
+		private System.Windows.Forms.Button Cancel;
-        private System.Windows.Forms.Button OK;
+		private System.Windows.Forms.Button OK;
-        private System.Windows.Forms.Button Browse;
+		private System.Windows.Forms.Button Browse;
-        private System.Windows.Forms.TextBox RecordBox;
+		private System.Windows.Forms.TextBox RecordBox;
 		private System.Windows.Forms.ComboBox StartFromCombo;
 		private System.Windows.Forms.GroupBox groupBox1;
 		private System.Windows.Forms.Label label3;
@@ -204,5 +204,5 @@
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.TextBox AuthorBox;
 		private System.Windows.Forms.CheckBox DefaultAuthorCheckBox;
-    }
+	}
 }

BizHawk.MultiClient/movie/RecordMovie.cs

@@ -10,7 +10,7 @@ using BizHawk.Emulation.Consoles.Nintendo;
 using BizHawk.Emulation.Consoles.Coleco;
 using BizHawk.Emulation.Consoles.Nintendo.N64;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class RecordMovie : Form
 	{