diff --git a/source/WindowsFormsApplication1/AlternateDesktop.Designer.cs b/source/WindowsFormsApplication1/AlternateDesktop.Designer.cs
deleted file mode 100644
index c26006e..0000000
--- a/source/WindowsFormsApplication1/AlternateDesktop.Designer.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-namespace ShiftOS
-{
-    partial class AlternateDesktop
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.pnlcontext = new System.Windows.Forms.Panel();
-            this.pnlapplauncher = new System.Windows.Forms.Panel();
-            this.pnlsidebar = new System.Windows.Forms.FlowLayoutPanel();
-            this.lbclock = new System.Windows.Forms.Label();
-            this.ClockTick = new System.Windows.Forms.Timer(this.components);
-            this.lblapplabel = new System.Windows.Forms.Label();
-            this.apptick = new System.Windows.Forms.Timer(this.components);
-            this.pnlcontext.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pnlcontext
-            // 
-            this.pnlcontext.BackColor = System.Drawing.Color.Gray;
-            this.pnlcontext.Controls.Add(this.lbclock);
-            this.pnlcontext.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pnlcontext.Location = new System.Drawing.Point(0, 0);
-            this.pnlcontext.Name = "pnlcontext";
-            this.pnlcontext.Size = new System.Drawing.Size(936, 28);
-            this.pnlcontext.TabIndex = 0;
-            // 
-            // pnlapplauncher
-            // 
-            this.pnlapplauncher.BackColor = System.Drawing.Color.Gray;
-            this.pnlapplauncher.Location = new System.Drawing.Point(71, 47);
-            this.pnlapplauncher.Name = "pnlapplauncher";
-            this.pnlapplauncher.Size = new System.Drawing.Size(664, 353);
-            this.pnlapplauncher.TabIndex = 1;
-            this.pnlapplauncher.Visible = false;
-            // 
-            // pnlsidebar
-            // 
-            this.pnlsidebar.BackColor = System.Drawing.Color.Gray;
-            this.pnlsidebar.Dock = System.Windows.Forms.DockStyle.Left;
-            this.pnlsidebar.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.pnlsidebar.Location = new System.Drawing.Point(0, 28);
-            this.pnlsidebar.Name = "pnlsidebar";
-            this.pnlsidebar.Size = new System.Drawing.Size(52, 509);
-            this.pnlsidebar.TabIndex = 2;
-            // 
-            // lbclock
-            // 
-            this.lbclock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.lbclock.Location = new System.Drawing.Point(820, 0);
-            this.lbclock.Name = "lbclock";
-            this.lbclock.Size = new System.Drawing.Size(113, 28);
-            this.lbclock.TabIndex = 0;
-            this.lbclock.Text = "500023";
-            this.lbclock.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // ClockTick
-            // 
-            this.ClockTick.Enabled = true;
-            this.ClockTick.Tick += new System.EventHandler(this.ClockTick_Tick);
-            // 
-            // lblapplabel
-            // 
-            this.lblapplabel.AutoSize = true;
-            this.lblapplabel.Location = new System.Drawing.Point(823, 313);
-            this.lblapplabel.Name = "lblapplabel";
-            this.lblapplabel.Size = new System.Drawing.Size(35, 13);
-            this.lblapplabel.TabIndex = 3;
-            this.lblapplabel.Text = "label1";
-            this.lblapplabel.Visible = false;
-            // 
-            // apptick
-            // 
-            this.apptick.Enabled = true;
-            this.apptick.Interval = 2000;
-            this.apptick.Tick += new System.EventHandler(this.apptick_Tick);
-            // 
-            // AlternateDesktop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(936, 537);
-            this.Controls.Add(this.lblapplabel);
-            this.Controls.Add(this.pnlsidebar);
-            this.Controls.Add(this.pnlapplauncher);
-            this.Controls.Add(this.pnlcontext);
-            this.ForeColor = System.Drawing.Color.White;
-            this.Name = "AlternateDesktop";
-            this.Text = "AlternateDesktop";
-            this.Load += new System.EventHandler(this.AlternateDesktop_Load);
-            this.pnlcontext.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel pnlcontext;
-        private System.Windows.Forms.Label lbclock;
-        private System.Windows.Forms.Panel pnlapplauncher;
-        private System.Windows.Forms.FlowLayoutPanel pnlsidebar;
-        private System.Windows.Forms.Timer ClockTick;
-        private System.Windows.Forms.Label lblapplabel;
-        private System.Windows.Forms.Timer apptick;
-    }
-}
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/AlternateDesktop.cs b/source/WindowsFormsApplication1/AlternateDesktop.cs
deleted file mode 100644
index 690977f..0000000
--- a/source/WindowsFormsApplication1/AlternateDesktop.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ShiftOS
-{
-    public partial class AlternateDesktop : Form
-    {
-        public AlternateDesktop()
-        {
-            InitializeComponent();
-        }
-
-        private void ClockTick_Tick(object sender, EventArgs e)
-        {
-            lbclock.Text = API.GetTime();
-            
-        }
-
-        public void GetApps()
-        {
-            pnlsidebar.Controls.Clear();
-            API.GetAppLauncherItems();
-            Panel appbtn = new Panel();
-            appbtn.BackColor = Color.Black;
-            appbtn.Size = new Size(32, 32);
-            appbtn.Visible = true;
-            appbtn.Name = "ashow";
-            appbtn.Click += new EventHandler(this.SidebarButton_Click);
-
-            pnlsidebar.Controls.Add(appbtn);
-            foreach(ApplauncherItem itm in API.AppLauncherItems)
-            {
-                if(itm.Display == true)
-                {
-                    Panel btn = new Panel();
-                    btn.BackColor = Color.Gray;
-                    btn.BackgroundImage = itm.Icon;
-                    btn.BackgroundImageLayout = ImageLayout.Stretch;
-                    btn.Size = new Size(32, 32);
-                    btn.Name = $"al_{new Random().Next(1000, 9999)}";
-                    btn.Tag = itm;
-                    btn.MouseMove += new MouseEventHandler(this.SidebarButton_Hover);
-                    btn.MouseLeave += new EventHandler(this.SidebarButton_Leave);
-                    btn.Click += new EventHandler(this.SidebarButton_Click);
-                    pnlsidebar.Controls.Add(btn);
-                    btn.Show();
-                }
-            }
-            foreach(PanelButton pbtn in API.PanelButtons)
-            {
-                Panel btn = new Panel();
-                btn.Tag = pbtn;
-                btn.Name = $"pnl_{new Random().Next(1000, 9999)}";
-                btn.BackgroundImage = pbtn.Icon;
-                btn.BackgroundImageLayout = ImageLayout.Stretch;
-                btn.BackColor = Color.Black;
-                btn.Size = new Size(32, 32);
-                btn.MouseMove += new MouseEventHandler(this.SidebarButton_Hover);
-                btn.MouseLeave += new EventHandler(this.SidebarButton_Leave);
-                btn.Click += new EventHandler(this.SidebarButton_Click);
-                pnlsidebar.Controls.Add(btn);
-                btn.Show();
-            }
-        }
-
-        public void SidebarButton_Hover(object sender, MouseEventArgs e)
-        {
-            Panel s = (Panel)sender;
-            int labelLoc = pnlcontext.Height + (s.Bottom - (s.Height / 2));
-            lblapplabel.Location = new Point(pnlsidebar.Width + 5, labelLoc);
-            if(s.Name.Contains("al"))
-            {
-                var itm = (ApplauncherItem)s.Tag;
-                lblapplabel.Text = itm.Name;
-            }
-            else
-            {
-                var itm = (PanelButton)s.Tag;
-                lblapplabel.Text = itm.Name;
-            }
-            lblapplabel.Visible = true;
-        }
-
-        public void SidebarButton_Click(object sender, EventArgs e)
-        {
-            var s = (Panel)sender;
-            if (s.Name.Contains("al"))
-            {
-                var itm = (ApplauncherItem)s.Tag;
-                var li = new LuaInterpreter();
-                li.mod(itm.Lua);
-                li = null;
-            }
-            else if(s.Name.Contains("ashow"))
-            {
-                pnlapplauncher.Show();
-                foreach(Control ctrl in this.Controls)
-                {
-                    ctrl.MouseDown += (object se, MouseEventArgs a) =>
-                    {
-                        pnlapplauncher.Hide();
-                    };
-                }
-            }
-            else
-            {
-                try
-                {
-                    PanelButton pbtn = (PanelButton)s.Tag;
-                    API.ToggleMinimized(pbtn.FormToManage);
-                }
-                catch 
-                {
-
-                }
-            }
-        }
-
-        public void SidebarButton_Leave(object sender, EventArgs e)
-        {
-            lblapplabel.Hide();
-        }
-
-        private void AlternateDesktop_Load(object sender, EventArgs e)
-        {
-            this.ShowInTaskbar = false;
-            this.FormBorderStyle = FormBorderStyle.None;
-            this.WindowState = FormWindowState.Maximized;
-            GetApps();
-        }
-
-        private void apptick_Tick(object sender, EventArgs e)
-        {
-            //GetApps();
-        }
-
-        private bool unity = false;
-
-        public void ToggleUnityMode()
-        {
-            if (unity == false)
-            {
-                unity = true;
-                this.BackColor = Skinning.Utilities.globaltransparencycolour;
-                this.BackgroundImage = null;
-                this.TransparencyKey = Skinning.Utilities.globaltransparencycolour;
-            }
-            else
-            {
-                unity = false;
-                this.BackColor = API.CurrentSkin.desktopbackgroundcolour;
-                this.BackgroundImage = API.CurrentSkinImages.desktopbackground;
-                this.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.desktopbackgroundlayout;
-                this.TransparencyKey = Skinning.Utilities.globaltransparencycolour;
-            }
-        }
-    }
-}
diff --git a/source/WindowsFormsApplication1/AlternateDesktop.resx b/source/WindowsFormsApplication1/AlternateDesktop.resx
deleted file mode 100644
index 2d0907d..0000000
--- a/source/WindowsFormsApplication1/AlternateDesktop.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ClockTick.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="apptick.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>120, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Appscape.Designer.cs b/source/WindowsFormsApplication1/Apps/Appscape.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Appscape.Designer.cs
rename to source/WindowsFormsApplication1/Apps/Appscape.Designer.cs
diff --git a/source/WindowsFormsApplication1/Appscape.cs b/source/WindowsFormsApplication1/Apps/Appscape.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Appscape.cs
rename to source/WindowsFormsApplication1/Apps/Appscape.cs
diff --git a/source/WindowsFormsApplication1/Appscape.resx b/source/WindowsFormsApplication1/Apps/Appscape.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Appscape.resx
rename to source/WindowsFormsApplication1/Apps/Appscape.resx
diff --git a/source/WindowsFormsApplication1/AppscapeUploader.Designer.cs b/source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/AppscapeUploader.Designer.cs
rename to source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs
diff --git a/source/WindowsFormsApplication1/AppscapeUploader.cs b/source/WindowsFormsApplication1/Apps/AppscapeUploader.cs
similarity index 100%
rename from source/WindowsFormsApplication1/AppscapeUploader.cs
rename to source/WindowsFormsApplication1/Apps/AppscapeUploader.cs
diff --git a/source/WindowsFormsApplication1/AppscapeUploader.resx b/source/WindowsFormsApplication1/Apps/AppscapeUploader.resx
similarity index 100%
rename from source/WindowsFormsApplication1/AppscapeUploader.resx
rename to source/WindowsFormsApplication1/Apps/AppscapeUploader.resx
diff --git a/source/WindowsFormsApplication1/Artpad.Designer.cs b/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Artpad.Designer.cs
rename to source/WindowsFormsApplication1/Apps/Artpad.Designer.cs
diff --git a/source/WindowsFormsApplication1/Artpad.cs b/source/WindowsFormsApplication1/Apps/Artpad.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Artpad.cs
rename to source/WindowsFormsApplication1/Apps/Artpad.cs
diff --git a/source/WindowsFormsApplication1/Artpad.resx b/source/WindowsFormsApplication1/Apps/Artpad.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Artpad.resx
rename to source/WindowsFormsApplication1/Apps/Artpad.resx
diff --git a/source/WindowsFormsApplication1/BitnoteConverter.Designer.cs b/source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/BitnoteConverter.Designer.cs
rename to source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs
diff --git a/source/WindowsFormsApplication1/BitnoteConverter.cs b/source/WindowsFormsApplication1/Apps/BitnoteConverter.cs
similarity index 100%
rename from source/WindowsFormsApplication1/BitnoteConverter.cs
rename to source/WindowsFormsApplication1/Apps/BitnoteConverter.cs
diff --git a/source/WindowsFormsApplication1/BitnoteConverter.resx b/source/WindowsFormsApplication1/Apps/BitnoteConverter.resx
similarity index 100%
rename from source/WindowsFormsApplication1/BitnoteConverter.resx
rename to source/WindowsFormsApplication1/Apps/BitnoteConverter.resx
diff --git a/source/WindowsFormsApplication1/BitnoteDigger.Designer.cs b/source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/BitnoteDigger.Designer.cs
rename to source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs
diff --git a/source/WindowsFormsApplication1/BitnoteDigger.cs b/source/WindowsFormsApplication1/Apps/BitnoteDigger.cs
similarity index 100%
rename from source/WindowsFormsApplication1/BitnoteDigger.cs
rename to source/WindowsFormsApplication1/Apps/BitnoteDigger.cs
diff --git a/source/WindowsFormsApplication1/BitnoteDigger.resx b/source/WindowsFormsApplication1/Apps/BitnoteDigger.resx
similarity index 100%
rename from source/WindowsFormsApplication1/BitnoteDigger.resx
rename to source/WindowsFormsApplication1/Apps/BitnoteDigger.resx
diff --git a/source/WindowsFormsApplication1/BitnoteWallet.Designer.cs b/source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/BitnoteWallet.Designer.cs
rename to source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs
diff --git a/source/WindowsFormsApplication1/BitnoteWallet.cs b/source/WindowsFormsApplication1/Apps/BitnoteWallet.cs
similarity index 100%
rename from source/WindowsFormsApplication1/BitnoteWallet.cs
rename to source/WindowsFormsApplication1/Apps/BitnoteWallet.cs
diff --git a/source/WindowsFormsApplication1/BitnoteWallet.resx b/source/WindowsFormsApplication1/Apps/BitnoteWallet.resx
similarity index 100%
rename from source/WindowsFormsApplication1/BitnoteWallet.resx
rename to source/WindowsFormsApplication1/Apps/BitnoteWallet.resx
diff --git a/source/WindowsFormsApplication1/Dodge.Designer.cs b/source/WindowsFormsApplication1/Apps/Dodge.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Dodge.Designer.cs
rename to source/WindowsFormsApplication1/Apps/Dodge.Designer.cs
diff --git a/source/WindowsFormsApplication1/Dodge.cs b/source/WindowsFormsApplication1/Apps/Dodge.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Dodge.cs
rename to source/WindowsFormsApplication1/Apps/Dodge.cs
diff --git a/source/WindowsFormsApplication1/Dodge.resx b/source/WindowsFormsApplication1/Apps/Dodge.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Dodge.resx
rename to source/WindowsFormsApplication1/Apps/Dodge.resx
diff --git a/source/WindowsFormsApplication1/File Skimmer.Designer.cs b/source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/File Skimmer.Designer.cs
rename to source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs
diff --git a/source/WindowsFormsApplication1/File Skimmer.cs b/source/WindowsFormsApplication1/Apps/File Skimmer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/File Skimmer.cs
rename to source/WindowsFormsApplication1/Apps/File Skimmer.cs
diff --git a/source/WindowsFormsApplication1/File Skimmer.resx b/source/WindowsFormsApplication1/Apps/File Skimmer.resx
similarity index 100%
rename from source/WindowsFormsApplication1/File Skimmer.resx
rename to source/WindowsFormsApplication1/Apps/File Skimmer.resx
diff --git a/source/WindowsFormsApplication1/HoloChat.Designer.cs b/source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/HoloChat.Designer.cs
rename to source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs
diff --git a/source/WindowsFormsApplication1/HoloChat.cs b/source/WindowsFormsApplication1/Apps/HoloChat.cs
similarity index 100%
rename from source/WindowsFormsApplication1/HoloChat.cs
rename to source/WindowsFormsApplication1/Apps/HoloChat.cs
diff --git a/source/WindowsFormsApplication1/HoloChat.resx b/source/WindowsFormsApplication1/Apps/HoloChat.resx
similarity index 100%
rename from source/WindowsFormsApplication1/HoloChat.resx
rename to source/WindowsFormsApplication1/Apps/HoloChat.resx
diff --git a/source/WindowsFormsApplication1/IconManager.Designer.cs b/source/WindowsFormsApplication1/Apps/IconManager.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/IconManager.Designer.cs
rename to source/WindowsFormsApplication1/Apps/IconManager.Designer.cs
diff --git a/source/WindowsFormsApplication1/IconManager.cs b/source/WindowsFormsApplication1/Apps/IconManager.cs
similarity index 100%
rename from source/WindowsFormsApplication1/IconManager.cs
rename to source/WindowsFormsApplication1/Apps/IconManager.cs
diff --git a/source/WindowsFormsApplication1/IconManager.resx b/source/WindowsFormsApplication1/Apps/IconManager.resx
similarity index 100%
rename from source/WindowsFormsApplication1/IconManager.resx
rename to source/WindowsFormsApplication1/Apps/IconManager.resx
diff --git a/source/WindowsFormsApplication1/KnowledgeInput.Designer.cs b/source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/KnowledgeInput.Designer.cs
rename to source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs
diff --git a/source/WindowsFormsApplication1/KnowledgeInput.cs b/source/WindowsFormsApplication1/Apps/KnowledgeInput.cs
similarity index 100%
rename from source/WindowsFormsApplication1/KnowledgeInput.cs
rename to source/WindowsFormsApplication1/Apps/KnowledgeInput.cs
diff --git a/source/WindowsFormsApplication1/KnowledgeInput.resx b/source/WindowsFormsApplication1/Apps/KnowledgeInput.resx
similarity index 100%
rename from source/WindowsFormsApplication1/KnowledgeInput.resx
rename to source/WindowsFormsApplication1/Apps/KnowledgeInput.resx
diff --git a/source/WindowsFormsApplication1/Labyrinth.Designer.cs b/source/WindowsFormsApplication1/Apps/Labyrinth.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Labyrinth.Designer.cs
rename to source/WindowsFormsApplication1/Apps/Labyrinth.Designer.cs
diff --git a/source/WindowsFormsApplication1/Labyrinth.cs b/source/WindowsFormsApplication1/Apps/Labyrinth.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Labyrinth.cs
rename to source/WindowsFormsApplication1/Apps/Labyrinth.cs
diff --git a/source/WindowsFormsApplication1/NameChanger.Designer.cs b/source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/NameChanger.Designer.cs
rename to source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs
diff --git a/source/WindowsFormsApplication1/NameChanger.cs b/source/WindowsFormsApplication1/Apps/NameChanger.cs
similarity index 100%
rename from source/WindowsFormsApplication1/NameChanger.cs
rename to source/WindowsFormsApplication1/Apps/NameChanger.cs
diff --git a/source/WindowsFormsApplication1/NameChanger.resx b/source/WindowsFormsApplication1/Apps/NameChanger.resx
similarity index 100%
rename from source/WindowsFormsApplication1/NameChanger.resx
rename to source/WindowsFormsApplication1/Apps/NameChanger.resx
diff --git a/source/WindowsFormsApplication1/NetGen.Designer.cs b/source/WindowsFormsApplication1/Apps/NetGen.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/NetGen.Designer.cs
rename to source/WindowsFormsApplication1/Apps/NetGen.Designer.cs
diff --git a/source/WindowsFormsApplication1/NetGen.cs b/source/WindowsFormsApplication1/Apps/NetGen.cs
similarity index 100%
rename from source/WindowsFormsApplication1/NetGen.cs
rename to source/WindowsFormsApplication1/Apps/NetGen.cs
diff --git a/source/WindowsFormsApplication1/NetGen.resx b/source/WindowsFormsApplication1/Apps/NetGen.resx
similarity index 100%
rename from source/WindowsFormsApplication1/NetGen.resx
rename to source/WindowsFormsApplication1/Apps/NetGen.resx
diff --git a/source/WindowsFormsApplication1/NetworkBrowser.Designer.cs b/source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/NetworkBrowser.Designer.cs
rename to source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs
diff --git a/source/WindowsFormsApplication1/NetworkBrowser.cs b/source/WindowsFormsApplication1/Apps/NetworkBrowser.cs
similarity index 100%
rename from source/WindowsFormsApplication1/NetworkBrowser.cs
rename to source/WindowsFormsApplication1/Apps/NetworkBrowser.cs
diff --git a/source/WindowsFormsApplication1/NetworkBrowser.resx b/source/WindowsFormsApplication1/Apps/NetworkBrowser.resx
similarity index 100%
rename from source/WindowsFormsApplication1/NetworkBrowser.resx
rename to source/WindowsFormsApplication1/Apps/NetworkBrowser.resx
diff --git a/source/WindowsFormsApplication1/PanelManager.Designer.cs b/source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/PanelManager.Designer.cs
rename to source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs
diff --git a/source/WindowsFormsApplication1/PanelManager.cs b/source/WindowsFormsApplication1/Apps/PanelManager.cs
similarity index 100%
rename from source/WindowsFormsApplication1/PanelManager.cs
rename to source/WindowsFormsApplication1/Apps/PanelManager.cs
diff --git a/source/WindowsFormsApplication1/PanelManager.resx b/source/WindowsFormsApplication1/Apps/PanelManager.resx
similarity index 100%
rename from source/WindowsFormsApplication1/PanelManager.resx
rename to source/WindowsFormsApplication1/Apps/PanelManager.resx
diff --git a/source/WindowsFormsApplication1/Pong.Designer.cs b/source/WindowsFormsApplication1/Apps/Pong.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Pong.Designer.cs
rename to source/WindowsFormsApplication1/Apps/Pong.Designer.cs
diff --git a/source/WindowsFormsApplication1/Pong.cs b/source/WindowsFormsApplication1/Apps/Pong.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Pong.cs
rename to source/WindowsFormsApplication1/Apps/Pong.cs
diff --git a/source/WindowsFormsApplication1/Pong.resx b/source/WindowsFormsApplication1/Apps/Pong.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Pong.resx
rename to source/WindowsFormsApplication1/Apps/Pong.resx
diff --git a/source/WindowsFormsApplication1/Shifter.Designer.cs b/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Shifter.Designer.cs
rename to source/WindowsFormsApplication1/Apps/Shifter.Designer.cs
diff --git a/source/WindowsFormsApplication1/Shifter.cs b/source/WindowsFormsApplication1/Apps/Shifter.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Shifter.cs
rename to source/WindowsFormsApplication1/Apps/Shifter.cs
diff --git a/source/WindowsFormsApplication1/Shifter.resx b/source/WindowsFormsApplication1/Apps/Shifter.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Shifter.resx
rename to source/WindowsFormsApplication1/Apps/Shifter.resx
diff --git a/source/WindowsFormsApplication1/Shiftnet.Designer.cs b/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Shiftnet.Designer.cs
rename to source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs
diff --git a/source/WindowsFormsApplication1/Shiftnet.cs b/source/WindowsFormsApplication1/Apps/Shiftnet.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Shiftnet.cs
rename to source/WindowsFormsApplication1/Apps/Shiftnet.cs
diff --git a/source/WindowsFormsApplication1/Shiftnet.resx b/source/WindowsFormsApplication1/Apps/Shiftnet.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Shiftnet.resx
rename to source/WindowsFormsApplication1/Apps/Shiftnet.resx
diff --git a/source/WindowsFormsApplication1/ShiftnetDecryptor.Designer.cs b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShiftnetDecryptor.Designer.cs
rename to source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs
diff --git a/source/WindowsFormsApplication1/ShiftnetDecryptor.cs b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShiftnetDecryptor.cs
rename to source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.cs
diff --git a/source/WindowsFormsApplication1/ShiftnetDecryptor.resx b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.resx
similarity index 100%
rename from source/WindowsFormsApplication1/ShiftnetDecryptor.resx
rename to source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.resx
diff --git a/source/WindowsFormsApplication1/Shiftorium.Designer.cs b/source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Shiftorium.Designer.cs
rename to source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs
diff --git a/source/WindowsFormsApplication1/Shiftorium.cs b/source/WindowsFormsApplication1/Apps/Shiftorium.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Shiftorium.cs
rename to source/WindowsFormsApplication1/Apps/Shiftorium.cs
diff --git a/source/WindowsFormsApplication1/Shiftorium.resx b/source/WindowsFormsApplication1/Apps/Shiftorium.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Shiftorium.resx
rename to source/WindowsFormsApplication1/Apps/Shiftorium.resx
diff --git a/source/WindowsFormsApplication1/SkinLoader.Designer.cs b/source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/SkinLoader.Designer.cs
rename to source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs
diff --git a/source/WindowsFormsApplication1/SkinLoader.cs b/source/WindowsFormsApplication1/Apps/SkinLoader.cs
similarity index 100%
rename from source/WindowsFormsApplication1/SkinLoader.cs
rename to source/WindowsFormsApplication1/Apps/SkinLoader.cs
diff --git a/source/WindowsFormsApplication1/SkinLoader.resx b/source/WindowsFormsApplication1/Apps/SkinLoader.resx
similarity index 100%
rename from source/WindowsFormsApplication1/SkinLoader.resx
rename to source/WindowsFormsApplication1/Apps/SkinLoader.resx
diff --git a/source/WindowsFormsApplication1/Terminal.Designer.cs b/source/WindowsFormsApplication1/Apps/Terminal.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Terminal.Designer.cs
rename to source/WindowsFormsApplication1/Apps/Terminal.Designer.cs
diff --git a/source/WindowsFormsApplication1/Terminal.cs b/source/WindowsFormsApplication1/Apps/Terminal.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Terminal.cs
rename to source/WindowsFormsApplication1/Apps/Terminal.cs
diff --git a/source/WindowsFormsApplication1/Terminal.resx b/source/WindowsFormsApplication1/Apps/Terminal.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Terminal.resx
rename to source/WindowsFormsApplication1/Apps/Terminal.resx
diff --git a/source/WindowsFormsApplication1/TextPad.Designer.cs b/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/TextPad.Designer.cs
rename to source/WindowsFormsApplication1/Apps/TextPad.Designer.cs
diff --git a/source/WindowsFormsApplication1/TextPad.cs b/source/WindowsFormsApplication1/Apps/TextPad.cs
similarity index 100%
rename from source/WindowsFormsApplication1/TextPad.cs
rename to source/WindowsFormsApplication1/Apps/TextPad.cs
diff --git a/source/WindowsFormsApplication1/TextPad.resx b/source/WindowsFormsApplication1/Apps/TextPad.resx
similarity index 100%
rename from source/WindowsFormsApplication1/TextPad.resx
rename to source/WindowsFormsApplication1/Apps/TextPad.resx
diff --git a/source/WindowsFormsApplication1/WidgetManager.Designer.cs b/source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/WidgetManager.Designer.cs
rename to source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs
diff --git a/source/WindowsFormsApplication1/WidgetManager.cs b/source/WindowsFormsApplication1/Apps/WidgetManager.cs
similarity index 100%
rename from source/WindowsFormsApplication1/WidgetManager.cs
rename to source/WindowsFormsApplication1/Apps/WidgetManager.cs
diff --git a/source/WindowsFormsApplication1/WidgetManager.resx b/source/WindowsFormsApplication1/Apps/WidgetManager.resx
similarity index 100%
rename from source/WindowsFormsApplication1/WidgetManager.resx
rename to source/WindowsFormsApplication1/Apps/WidgetManager.resx
diff --git a/source/WindowsFormsApplication1/Computer.Designer.cs b/source/WindowsFormsApplication1/Controls/Computer.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Computer.Designer.cs
rename to source/WindowsFormsApplication1/Controls/Computer.Designer.cs
diff --git a/source/WindowsFormsApplication1/Computer.cs b/source/WindowsFormsApplication1/Controls/Computer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Computer.cs
rename to source/WindowsFormsApplication1/Controls/Computer.cs
diff --git a/source/WindowsFormsApplication1/Computer.resx b/source/WindowsFormsApplication1/Controls/Computer.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Computer.resx
rename to source/WindowsFormsApplication1/Controls/Computer.resx
diff --git a/source/WindowsFormsApplication1/Connection.Designer.cs b/source/WindowsFormsApplication1/Controls/Connection.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Connection.Designer.cs
rename to source/WindowsFormsApplication1/Controls/Connection.Designer.cs
diff --git a/source/WindowsFormsApplication1/Connection.cs b/source/WindowsFormsApplication1/Controls/Connection.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Connection.cs
rename to source/WindowsFormsApplication1/Controls/Connection.cs
diff --git a/source/WindowsFormsApplication1/Connection.resx b/source/WindowsFormsApplication1/Controls/Connection.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Connection.resx
rename to source/WindowsFormsApplication1/Controls/Connection.resx
diff --git a/source/WindowsFormsApplication1/DesktopIcon.Designer.cs b/source/WindowsFormsApplication1/Controls/DesktopIcon.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/DesktopIcon.Designer.cs
rename to source/WindowsFormsApplication1/Controls/DesktopIcon.Designer.cs
diff --git a/source/WindowsFormsApplication1/DesktopIcon.cs b/source/WindowsFormsApplication1/Controls/DesktopIcon.cs
similarity index 100%
rename from source/WindowsFormsApplication1/DesktopIcon.cs
rename to source/WindowsFormsApplication1/Controls/DesktopIcon.cs
diff --git a/source/WindowsFormsApplication1/DesktopIcon.resx b/source/WindowsFormsApplication1/Controls/DesktopIcon.resx
similarity index 100%
rename from source/WindowsFormsApplication1/DesktopIcon.resx
rename to source/WindowsFormsApplication1/Controls/DesktopIcon.resx
diff --git a/source/WindowsFormsApplication1/IconControl.Designer.cs b/source/WindowsFormsApplication1/Controls/IconControl.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/IconControl.Designer.cs
rename to source/WindowsFormsApplication1/Controls/IconControl.Designer.cs
diff --git a/source/WindowsFormsApplication1/IconControl.cs b/source/WindowsFormsApplication1/Controls/IconControl.cs
similarity index 100%
rename from source/WindowsFormsApplication1/IconControl.cs
rename to source/WindowsFormsApplication1/Controls/IconControl.cs
diff --git a/source/WindowsFormsApplication1/IconControl.resx b/source/WindowsFormsApplication1/Controls/IconControl.resx
similarity index 100%
rename from source/WindowsFormsApplication1/IconControl.resx
rename to source/WindowsFormsApplication1/Controls/IconControl.resx
diff --git a/source/WindowsFormsApplication1/ImageSelector.Designer.cs b/source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ImageSelector.Designer.cs
rename to source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs
diff --git a/source/WindowsFormsApplication1/ImageSelector.cs b/source/WindowsFormsApplication1/Controls/ImageSelector.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ImageSelector.cs
rename to source/WindowsFormsApplication1/Controls/ImageSelector.cs
diff --git a/source/WindowsFormsApplication1/ImageSelector.resx b/source/WindowsFormsApplication1/Controls/ImageSelector.resx
similarity index 100%
rename from source/WindowsFormsApplication1/ImageSelector.resx
rename to source/WindowsFormsApplication1/Controls/ImageSelector.resx
diff --git a/source/WindowsFormsApplication1/NetModuleStatus.Designer.cs b/source/WindowsFormsApplication1/Controls/NetModuleStatus.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/NetModuleStatus.Designer.cs
rename to source/WindowsFormsApplication1/Controls/NetModuleStatus.Designer.cs
diff --git a/source/WindowsFormsApplication1/NetModuleStatus.cs b/source/WindowsFormsApplication1/Controls/NetModuleStatus.cs
similarity index 100%
rename from source/WindowsFormsApplication1/NetModuleStatus.cs
rename to source/WindowsFormsApplication1/Controls/NetModuleStatus.cs
diff --git a/source/WindowsFormsApplication1/NetModuleStatus.resx b/source/WindowsFormsApplication1/Controls/NetModuleStatus.resx
similarity index 100%
rename from source/WindowsFormsApplication1/NetModuleStatus.resx
rename to source/WindowsFormsApplication1/Controls/NetModuleStatus.resx
diff --git a/source/WindowsFormsApplication1/Notification.Designer.cs b/source/WindowsFormsApplication1/Controls/Notification.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Notification.Designer.cs
rename to source/WindowsFormsApplication1/Controls/Notification.Designer.cs
diff --git a/source/WindowsFormsApplication1/Notification.cs b/source/WindowsFormsApplication1/Controls/Notification.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Notification.cs
rename to source/WindowsFormsApplication1/Controls/Notification.cs
diff --git a/source/WindowsFormsApplication1/Notification.resx b/source/WindowsFormsApplication1/Controls/Notification.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Notification.resx
rename to source/WindowsFormsApplication1/Controls/Notification.resx
diff --git a/source/WindowsFormsApplication1/ProgressBarEX.Designer.cs b/source/WindowsFormsApplication1/Controls/ProgressBarEX.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ProgressBarEX.Designer.cs
rename to source/WindowsFormsApplication1/Controls/ProgressBarEX.Designer.cs
diff --git a/source/WindowsFormsApplication1/ProgressBarEX.cs b/source/WindowsFormsApplication1/Controls/ProgressBarEX.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ProgressBarEX.cs
rename to source/WindowsFormsApplication1/Controls/ProgressBarEX.cs
diff --git a/source/WindowsFormsApplication1/ProgressBarEX.resx b/source/WindowsFormsApplication1/Controls/ProgressBarEX.resx
similarity index 100%
rename from source/WindowsFormsApplication1/ProgressBarEX.resx
rename to source/WindowsFormsApplication1/Controls/ProgressBarEX.resx
diff --git a/source/WindowsFormsApplication1/ShifterColorInput.Designer.cs b/source/WindowsFormsApplication1/Controls/ShifterColorInput.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterColorInput.Designer.cs
rename to source/WindowsFormsApplication1/Controls/ShifterColorInput.Designer.cs
diff --git a/source/WindowsFormsApplication1/ShifterColorInput.cs b/source/WindowsFormsApplication1/Controls/ShifterColorInput.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterColorInput.cs
rename to source/WindowsFormsApplication1/Controls/ShifterColorInput.cs
diff --git a/source/WindowsFormsApplication1/ShifterColorInput.resx b/source/WindowsFormsApplication1/Controls/ShifterColorInput.resx
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterColorInput.resx
rename to source/WindowsFormsApplication1/Controls/ShifterColorInput.resx
diff --git a/source/WindowsFormsApplication1/ShifterGraphicInput.Designer.cs b/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterGraphicInput.Designer.cs
rename to source/WindowsFormsApplication1/Controls/ShifterGraphicInput.Designer.cs
diff --git a/source/WindowsFormsApplication1/ShifterGraphicInput.cs b/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterGraphicInput.cs
rename to source/WindowsFormsApplication1/Controls/ShifterGraphicInput.cs
diff --git a/source/WindowsFormsApplication1/ShifterGraphicInput.resx b/source/WindowsFormsApplication1/Controls/ShifterGraphicInput.resx
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterGraphicInput.resx
rename to source/WindowsFormsApplication1/Controls/ShifterGraphicInput.resx
diff --git a/source/WindowsFormsApplication1/ShifterIntInput.Designer.cs b/source/WindowsFormsApplication1/Controls/ShifterIntInput.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterIntInput.Designer.cs
rename to source/WindowsFormsApplication1/Controls/ShifterIntInput.Designer.cs
diff --git a/source/WindowsFormsApplication1/ShifterIntInput.cs b/source/WindowsFormsApplication1/Controls/ShifterIntInput.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterIntInput.cs
rename to source/WindowsFormsApplication1/Controls/ShifterIntInput.cs
diff --git a/source/WindowsFormsApplication1/ShifterIntInput.resx b/source/WindowsFormsApplication1/Controls/ShifterIntInput.resx
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterIntInput.resx
rename to source/WindowsFormsApplication1/Controls/ShifterIntInput.resx
diff --git a/source/WindowsFormsApplication1/ShifterTextInput.Designer.cs b/source/WindowsFormsApplication1/Controls/ShifterTextInput.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterTextInput.Designer.cs
rename to source/WindowsFormsApplication1/Controls/ShifterTextInput.Designer.cs
diff --git a/source/WindowsFormsApplication1/ShifterTextInput.cs b/source/WindowsFormsApplication1/Controls/ShifterTextInput.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterTextInput.cs
rename to source/WindowsFormsApplication1/Controls/ShifterTextInput.cs
diff --git a/source/WindowsFormsApplication1/ShifterTextInput.resx b/source/WindowsFormsApplication1/Controls/ShifterTextInput.resx
similarity index 100%
rename from source/WindowsFormsApplication1/ShifterTextInput.resx
rename to source/WindowsFormsApplication1/Controls/ShifterTextInput.resx
diff --git a/source/WindowsFormsApplication1/WindowBorder.Designer.cs b/source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/WindowBorder.Designer.cs
rename to source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs
diff --git a/source/WindowsFormsApplication1/WindowBorder.cs b/source/WindowsFormsApplication1/Controls/WindowBorder.cs
similarity index 100%
rename from source/WindowsFormsApplication1/WindowBorder.cs
rename to source/WindowsFormsApplication1/Controls/WindowBorder.cs
diff --git a/source/WindowsFormsApplication1/WindowBorder.resx b/source/WindowsFormsApplication1/Controls/WindowBorder.resx
similarity index 100%
rename from source/WindowsFormsApplication1/WindowBorder.resx
rename to source/WindowsFormsApplication1/Controls/WindowBorder.resx
diff --git a/source/WindowsFormsApplication1/infobox.Designer.cs b/source/WindowsFormsApplication1/Controls/infobox.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/infobox.Designer.cs
rename to source/WindowsFormsApplication1/Controls/infobox.Designer.cs
diff --git a/source/WindowsFormsApplication1/infobox.cs b/source/WindowsFormsApplication1/Controls/infobox.cs
similarity index 100%
rename from source/WindowsFormsApplication1/infobox.cs
rename to source/WindowsFormsApplication1/Controls/infobox.cs
diff --git a/source/WindowsFormsApplication1/infobox.resx b/source/WindowsFormsApplication1/Controls/infobox.resx
similarity index 100%
rename from source/WindowsFormsApplication1/infobox.resx
rename to source/WindowsFormsApplication1/Controls/infobox.resx
diff --git a/source/WindowsFormsApplication1/ShiftOSDesktop.Designer.cs b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShiftOSDesktop.Designer.cs
rename to source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs
diff --git a/source/WindowsFormsApplication1/ShiftOSDesktop.cs b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShiftOSDesktop.cs
rename to source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
diff --git a/source/WindowsFormsApplication1/ShiftOSDesktop.resx b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx
similarity index 100%
rename from source/WindowsFormsApplication1/ShiftOSDesktop.resx
rename to source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx
diff --git a/source/WindowsFormsApplication1/Color_Picker.Designer.cs b/source/WindowsFormsApplication1/Dialogs/Color_Picker.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Color_Picker.Designer.cs
rename to source/WindowsFormsApplication1/Dialogs/Color_Picker.Designer.cs
diff --git a/source/WindowsFormsApplication1/Color_Picker.cs b/source/WindowsFormsApplication1/Dialogs/Color_Picker.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Color_Picker.cs
rename to source/WindowsFormsApplication1/Dialogs/Color_Picker.cs
diff --git a/source/WindowsFormsApplication1/Color_Picker.resx b/source/WindowsFormsApplication1/Dialogs/Color_Picker.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Color_Picker.resx
rename to source/WindowsFormsApplication1/Dialogs/Color_Picker.resx
diff --git a/source/WindowsFormsApplication1/Graphic_Picker.Designer.cs b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Graphic_Picker.Designer.cs
rename to source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs
diff --git a/source/WindowsFormsApplication1/Graphic_Picker.cs b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Graphic_Picker.cs
rename to source/WindowsFormsApplication1/Dialogs/Graphic_Picker.cs
diff --git a/source/WindowsFormsApplication1/Graphic_Picker.resx b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.resx
similarity index 100%
rename from source/WindowsFormsApplication1/Graphic_Picker.resx
rename to source/WindowsFormsApplication1/Dialogs/Graphic_Picker.resx
diff --git a/source/WindowsFormsApplication1/AudioResourceClient.cs b/source/WindowsFormsApplication1/Engine/AudioResourceClient.cs
similarity index 100%
rename from source/WindowsFormsApplication1/AudioResourceClient.cs
rename to source/WindowsFormsApplication1/Engine/AudioResourceClient.cs
diff --git a/source/WindowsFormsApplication1/Lua_Interp.cs b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Lua_Interp.cs
rename to source/WindowsFormsApplication1/Engine/Lua_Interp.cs
diff --git a/source/WindowsFormsApplication1/SaveSystem.cs b/source/WindowsFormsApplication1/Engine/SaveSystem.cs
similarity index 100%
rename from source/WindowsFormsApplication1/SaveSystem.cs
rename to source/WindowsFormsApplication1/Engine/SaveSystem.cs
diff --git a/source/WindowsFormsApplication1/Viruses.cs b/source/WindowsFormsApplication1/Engine/Viruses.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Viruses.cs
rename to source/WindowsFormsApplication1/Engine/Viruses.cs
diff --git a/source/WindowsFormsApplication1/undo.cs b/source/WindowsFormsApplication1/Engine/undo.cs
similarity index 100%
rename from source/WindowsFormsApplication1/undo.cs
rename to source/WindowsFormsApplication1/Engine/undo.cs
diff --git a/source/WindowsFormsApplication1/HackUI.Designer.cs b/source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/HackUI.Designer.cs
rename to source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs
diff --git a/source/WindowsFormsApplication1/HackUI.cs b/source/WindowsFormsApplication1/Gameplay/HackUI.cs
similarity index 100%
rename from source/WindowsFormsApplication1/HackUI.cs
rename to source/WindowsFormsApplication1/Gameplay/HackUI.cs
diff --git a/source/WindowsFormsApplication1/HackUI.resx b/source/WindowsFormsApplication1/Gameplay/HackUI.resx
similarity index 100%
rename from source/WindowsFormsApplication1/HackUI.resx
rename to source/WindowsFormsApplication1/Gameplay/HackUI.resx
diff --git a/source/WindowsFormsApplication1/Hacking.cs b/source/WindowsFormsApplication1/Gameplay/Hacking.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Hacking.cs
rename to source/WindowsFormsApplication1/Gameplay/Hacking.cs
diff --git a/source/WindowsFormsApplication1/HijackScreen.Designer.cs b/source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/HijackScreen.Designer.cs
rename to source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs
diff --git a/source/WindowsFormsApplication1/HijackScreen.cs b/source/WindowsFormsApplication1/Gameplay/HijackScreen.cs
similarity index 100%
rename from source/WindowsFormsApplication1/HijackScreen.cs
rename to source/WindowsFormsApplication1/Gameplay/HijackScreen.cs
diff --git a/source/WindowsFormsApplication1/HijackScreen.resx b/source/WindowsFormsApplication1/Gameplay/HijackScreen.resx
similarity index 100%
rename from source/WindowsFormsApplication1/HijackScreen.resx
rename to source/WindowsFormsApplication1/Gameplay/HijackScreen.resx
diff --git a/source/WindowsFormsApplication1/Hacking_Enemy.Designer.cs b/source/WindowsFormsApplication1/Hacking_Enemy.Designer.cs
deleted file mode 100644
index 5d83abd..0000000
--- a/source/WindowsFormsApplication1/Hacking_Enemy.Designer.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-namespace ShiftOS
-{
-    partial class Hacking_Enemy
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.lbcompromised = new System.Windows.Forms.Label();
-            this.lbstats = new System.Windows.Forms.Label();
-            this.tmrhealthdetect = new System.Windows.Forms.Timer(this.components);
-            this.panel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.Black;
-            this.panel1.Controls.Add(this.lbcompromised);
-            this.panel1.Controls.Add(this.lbstats);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Font = new System.Drawing.Font("Lucida Console", 8.25F);
-            this.panel1.ForeColor = System.Drawing.Color.White;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(872, 458);
-            this.panel1.TabIndex = 1;
-            // 
-            // lbcompromised
-            // 
-            this.lbcompromised.AutoSize = true;
-            this.lbcompromised.Location = new System.Drawing.Point(242, 174);
-            this.lbcompromised.Name = "lbcompromised";
-            this.lbcompromised.Size = new System.Drawing.Size(47, 11);
-            this.lbcompromised.TabIndex = 1;
-            this.lbcompromised.Text = "label1";
-            this.lbcompromised.Visible = false;
-            // 
-            // lbstats
-            // 
-            this.lbstats.AutoSize = true;
-            this.lbstats.Location = new System.Drawing.Point(13, 13);
-            this.lbstats.Name = "lbstats";
-            this.lbstats.Size = new System.Drawing.Size(131, 11);
-            this.lbstats.TabIndex = 0;
-            this.lbstats.Text = "Enemy Health: 100%";
-            // 
-            // tmrhealthdetect
-            // 
-            this.tmrhealthdetect.Tick += new System.EventHandler(this.tmrhealthdetect_Tick);
-            // 
-            // Hacking_Enemy
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(872, 458);
-            this.Controls.Add(this.panel1);
-            this.Name = "Hacking_Enemy";
-            this.Text = "Hacking_Enemy";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.this_Closing);
-            this.Load += new System.EventHandler(this.Hacking_Enemy_Load);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbstats;
-        private System.Windows.Forms.Timer tmrhealthdetect;
-        private System.Windows.Forms.Label lbcompromised;
-    }
-}
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Hacking_Enemy.cs b/source/WindowsFormsApplication1/Hacking_Enemy.cs
deleted file mode 100644
index 3f6ab63..0000000
--- a/source/WindowsFormsApplication1/Hacking_Enemy.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ShiftOS
-{
-    public partial class Hacking_Enemy : Form
-    {
-        public Hacking_Enemy(Hacking_YourHealth enemy, EnemyHacker thisHacker)
-        {
-            ThisHacker = thisHacker;
-            Enemy = enemy;
-            InitializeComponent();
-        }
-
-        private EnemyHacker ThisHacker { get; set; }
-        public Hacking_YourHealth Enemy { get; set; }
-        public List<Computer> AllComputers = null;
-        public Computer ThisPC { get; set; }
-        private void Hacking_Enemy_Load(object sender, EventArgs e)
-        {
-            AllComputers = new List<Computer>();
-            VisualizeNetwork();
-            tmrhealthdetect.Start();
-            ThisPC.Enemy = true;
-        }
-
-        private void VisualizeNetwork()
-        {
-            var rnd = new Random();
-            foreach (Module m in ThisHacker.Network)
-            {
-                var c = m.Deploy();
-                if (c.Type == SystemType.Core)
-                {
-                    ThisPC = c;
-                    ThisPC.EnemyComputer = Enemy.ThisPC;
-                    Enemy.ThisPC.EnemyComputer = ThisPC;
-                }
-                c.Location = new Point(rnd.Next(100, 350), rnd.Next(100, 350));
-                AddModule(c);
-            }
-        }
-
-        public void System_Attacking(object s, EventArgs a)
-        {
-            int i = new Random().Next(Enemy.AllComputers.Count);
-            var pc = Enemy.AllComputers[i];
-            var se = (Computer)s;
-            pc.LaunchAttack(se.GetProperType());
-        }
-
-        public Computer SelectedComputer = null;
-
-        public void AddModule(Computer newModule)
-        {
-            var rnd = new Random();
-            panel1.Controls.Add(newModule);
-            foreach(var pc in AllComputers)
-            {
-                while (newModule.Bounds.IntersectsWith(pc.Bounds))
-                {
-                    newModule.Location = new Point(rnd.Next(100, 350), rnd.Next(100, 350));
-                }
-            }
-            AllComputers.Add(newModule);
-            int hp = newModule.HP;
-            TotalHP += (decimal)newModule.HP;
-            newModule.Show();
-            newModule.OnDestruction += (object s, EventArgs a) =>
-            {
-                if(this.SelectedComputer == newModule)
-                {
-                    SelectedComputer = null;
-                }
-                AllComputers.Remove(newModule);
-                newModule.Dispose();
-            };
-            newModule.Select += (object s, EventArgs a) =>
-            {
-                bool c = true;
-                foreach(var pc in Enemy.SelectedComputer.Enemies)
-                {
-                    if(pc.Hostname == newModule.Hostname)
-                    {
-                        c = false;
-                    }
-                }
-                if (c == true)
-                {
-                    Enemy.SelectedComputer.Enemies.Add(newModule);
-                    Enemy.ShowPCInfo(Enemy.SelectedComputer.Hostname);
-                    if(Enemy.IsTutorial)
-                    {
-                        if(Enemy.TutorialProgress == 9)
-                        {
-                            Enemy.SetupTutorialUI(10);
-                        }
-                    }
-                }
-            };
-            newModule.HP_Decreased += new EventHandler(System_Damaged);
-            newModule.OnRepair += new EventHandler(System_Repaired);
-            if (newModule.Type == SystemType.Antivirus)
-            {
-                var b = newModule.GetAreaOfEffect();
-                newModule.AntivirusRepair += (object s, EventArgs a) =>
-                {
-                    foreach (Computer pc in AllComputers)
-                    {
-                        if (pc != newModule && pc.Bounds.IntersectsWith(b))
-                        {
-                            if (newModule.Type == SystemType.RepairModule)
-                            {
-                                if (pc.HP < newModule.HP)
-                                {
-                                    if (pc.HP < pc.GetTotal())
-                                    {
-                                        pc.Repair(1);
-                                    }
-                                }
-
-                            }
-                            else {
-                                if (pc.HP < 10)
-                                {
-                                    pc.Repair(1);
-                                }
-                            }
-                        }
-                    }
-                };
-            }
-            if (newModule.Type == SystemType.Firewall)
-            {
-                panel1.Refresh();
-                Firewall_Deflect(newModule);
-            }
-            if (newModule.Type == SystemType.ServerStack)
-            {
-                newModule.MassDDoS += (object s, EventArgs a) =>
-                {
-                    Enemy.Worm();
-                };
-            }
-        }
-
-        public void Firewall_Deflect(Computer fwall)
-        {
-            //Safegaurd...
-            if (fwall.Type == SystemType.Firewall)
-            {
-                var r = fwall.GetAreaOfEffect();
-                foreach (var pc in AllComputers)
-                {
-                    if (pc != fwall)
-                    {
-                        if (pc.Bounds.IntersectsWith(r))
-                        {
-                            pc.DamageDefector = fwall.Grade;
-                        }
-                    }
-                }
-            }
-        }
-
-        public void Firewall_Destroy(Computer fwall)
-        {
-            //Safegaurd...
-            if (fwall.Type == SystemType.Firewall)
-            {
-                var r = fwall.GetAreaOfEffect();
-                foreach (var pc in AllComputers)
-                {
-                    if (pc.Bounds.IntersectsWith(r))
-                    {
-                        pc.DamageDefector = 1;
-                        UpdateFirewalls();
-                    }
-                }
-            }
-        }
-
-        public void UpdateFirewalls()
-        {
-            foreach (var pc in AllComputers)
-            {
-                if (pc.Type == SystemType.Firewall)
-                {
-                    Firewall_Deflect(pc);
-                }
-            }
-        }
-
-
-        private void System_Repaired(object s, EventArgs e)
-        {
-            var c = (Computer)s;
-            lbcompromised.Text = "System regenerating...";
-            int location = c.Left - (lbcompromised.Width / 4);
-            int y = c.Top - 25;
-            lbcompromised.Location = new Point(location, y);
-            lbcompromised.Show();
-            c.Flash(lbcompromised);
-
-        }
-
-
-        private void System_Damaged(object s, EventArgs e)
-        {
-            var c = (Computer)s;
-            lbcompromised.Text = "System damaged!";
-            int location = c.Left - (lbcompromised.Width / 4);
-            int y = c.Top - 25;
-            lbcompromised.Location = new Point(location, y);
-            lbcompromised.Show();
-            c.Flash(lbcompromised);
-        }
-
-        private decimal TotalHP = 0;
-
-        private void tmrhealthdetect_Tick(object sender, EventArgs e)
-        {
-            decimal health = 0;
-
-            var rnd = new Random();
-            int chance = 0;
-            foreach (var pc in AllComputers)
-            {
-                if (pc.Disabled == false)
-                {
-                    foreach (var enemy in Enemy.AllComputers)
-                    {
-                        chance = rnd.Next(1, 20);
-                        if (chance == 10)
-                        {
-                            if (Enemy.IsTutorial)
-                            {
-                                if (Enemy.TutorialProgress == 9)
-                                {
-                                    Enemy.ThisPC.LaunchAttack(pc.GetProperType(), pc.GetDamageRate());
-                                }
-                                else if (Enemy.TutorialProgress == 32)
-                                {
-                                    enemy.LaunchAttack(pc.GetProperType(), pc.GetDamageRate());
-                                }
-                                else
-                                {
-                                    enemy.Enemies.Clear();
-                                }
-                            }
-                            else {
-                                enemy.LaunchAttack(pc.GetProperType(), pc.GetDamageRate());
-                            }
-                        }
-                    }
-                }
-            }
-
-            foreach (var pc in AllComputers)
-            {
-                health += (decimal)pc.HP;
-            }
-            try {
-                decimal percent = (health / TotalHP) * 100;
-                lbstats.Text = $"Enemy Health: {percent}%";
-                if (ThisPC.HP <= 0)
-                {
-                    if (Enemy.IsTutorial)
-                    {
-                        Enemy.SetupTutorialUI(33);
-                    }
-                    else {
-                        API.CreateInfoboxSession("You won.", "You have successfully overthrown the enemy network.", infobox.InfoboxMode.Info);
-                        UserRequestedClose = false;
-                        Enemy.UserRequestedClose = false;
-                        Enemy.Close();
-                        this.Close();
-                    }
-                }
-            }
-            catch
-            {
-
-            }
-        }
-
-        public void Worm()
-        {
-            var rnd = new Random();
-            int r = rnd.Next(0, 10);
-
-            foreach (Computer c in AllComputers)
-            {
-                if(r == 5)
-                {
-                    c.Disable();
-                }
-            }
-        }
-
-        public bool UserRequestedClose = true;
-
-        private void this_Closing(object sender, FormClosingEventArgs e)
-        {
-            if(UserRequestedClose == false)
-            {
-                tmrhealthdetect.Stop();
-                foreach(var pc in AllComputers)
-                {
-                    pc.HP = 0;
-                }
-            }
-        }
-    }
-}
diff --git a/source/WindowsFormsApplication1/Hacking_Enemy.resx b/source/WindowsFormsApplication1/Hacking_Enemy.resx
deleted file mode 100644
index 760f267..0000000
--- a/source/WindowsFormsApplication1/Hacking_Enemy.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="tmrhealthdetect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Hacking_YourHealth.Designer.cs b/source/WindowsFormsApplication1/Hacking_YourHealth.Designer.cs
deleted file mode 100644
index e8fce43..0000000
--- a/source/WindowsFormsApplication1/Hacking_YourHealth.Designer.cs
+++ /dev/null
@@ -1,479 +0,0 @@
-namespace ShiftOS
-{
-    partial class Hacking_YourHealth
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Hacking_YourHealth));
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlpcinfo = new System.Windows.Forms.Panel();
-            this.lbtargets = new System.Windows.Forms.Label();
-            this.btnpoweroff = new System.Windows.Forms.Button();
-            this.btnupgrade = new System.Windows.Forms.Button();
-            this.lbpcinfo = new System.Windows.Forms.Label();
-            this.lbmoduletitle = new System.Windows.Forms.Label();
-            this.btncloseinfo = new System.Windows.Forms.Button();
-            this.pnldefensemanager = new System.Windows.Forms.Panel();
-            this.btnbuy = new System.Windows.Forms.Button();
-            this.label3 = new System.Windows.Forms.Label();
-            this.cmbmodules = new System.Windows.Forms.ComboBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.pnlbuy = new System.Windows.Forms.Panel();
-            this.txthostname = new System.Windows.Forms.TextBox();
-            this.lbhostname = new System.Windows.Forms.Label();
-            this.txtgrade = new System.Windows.Forms.TextBox();
-            this.lbgrade = new System.Windows.Forms.Label();
-            this.lbmoduleinfo = new System.Windows.Forms.Label();
-            this.cmbbuyable = new System.Windows.Forms.ComboBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.btndonebuying = new System.Windows.Forms.Button();
-            this.flcontrols = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnaddmodule = new System.Windows.Forms.Button();
-            this.lbcompromised = new System.Windows.Forms.Label();
-            this.lbstats = new System.Windows.Forms.Label();
-            this.tmrhealthdetect = new System.Windows.Forms.Timer(this.components);
-            this.tmrredraw = new System.Windows.Forms.Timer(this.components);
-            this.lbtutorial = new System.Windows.Forms.Label();
-            this.btnnext = new System.Windows.Forms.Button();
-            this.panel1.SuspendLayout();
-            this.pnlpcinfo.SuspendLayout();
-            this.pnldefensemanager.SuspendLayout();
-            this.pnlbuy.SuspendLayout();
-            this.flcontrols.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.Black;
-            this.panel1.Controls.Add(this.pnlbuy);
-            this.panel1.Controls.Add(this.pnldefensemanager);
-            this.panel1.Controls.Add(this.btnnext);
-            this.panel1.Controls.Add(this.lbtutorial);
-            this.panel1.Controls.Add(this.pnlpcinfo);
-            this.panel1.Controls.Add(this.flcontrols);
-            this.panel1.Controls.Add(this.lbcompromised);
-            this.panel1.Controls.Add(this.lbstats);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Font = new System.Drawing.Font("Lucida Console", 8.25F);
-            this.panel1.ForeColor = System.Drawing.Color.White;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(793, 461);
-            this.panel1.TabIndex = 0;
-            this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.boundpaint);
-            this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.playfield_MouseDown);
-            // 
-            // pnlpcinfo
-            // 
-            this.pnlpcinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlpcinfo.Controls.Add(this.lbtargets);
-            this.pnlpcinfo.Controls.Add(this.btnpoweroff);
-            this.pnlpcinfo.Controls.Add(this.btnupgrade);
-            this.pnlpcinfo.Controls.Add(this.lbpcinfo);
-            this.pnlpcinfo.Controls.Add(this.lbmoduletitle);
-            this.pnlpcinfo.Controls.Add(this.btncloseinfo);
-            this.pnlpcinfo.Location = new System.Drawing.Point(399, 144);
-            this.pnlpcinfo.Name = "pnlpcinfo";
-            this.pnlpcinfo.Size = new System.Drawing.Size(382, 280);
-            this.pnlpcinfo.TabIndex = 7;
-            this.pnlpcinfo.Visible = false;
-            // 
-            // lbtargets
-            // 
-            this.lbtargets.Location = new System.Drawing.Point(12, 165);
-            this.lbtargets.Name = "lbtargets";
-            this.lbtargets.Size = new System.Drawing.Size(367, 86);
-            this.lbtargets.TabIndex = 9;
-            this.lbtargets.Text = "Targets";
-            // 
-            // btnpoweroff
-            // 
-            this.btnpoweroff.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnpoweroff.AutoSize = true;
-            this.btnpoweroff.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnpoweroff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnpoweroff.Location = new System.Drawing.Point(85, 254);
-            this.btnpoweroff.Name = "btnpoweroff";
-            this.btnpoweroff.Size = new System.Drawing.Size(80, 23);
-            this.btnpoweroff.TabIndex = 8;
-            this.btnpoweroff.Text = "Power Off";
-            this.btnpoweroff.UseVisualStyleBackColor = true;
-            this.btnpoweroff.Click += new System.EventHandler(this.btnpoweroff_Click);
-            // 
-            // btnupgrade
-            // 
-            this.btnupgrade.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnupgrade.AutoSize = true;
-            this.btnupgrade.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnupgrade.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnupgrade.Location = new System.Drawing.Point(171, 254);
-            this.btnupgrade.Name = "btnupgrade";
-            this.btnupgrade.Size = new System.Drawing.Size(150, 23);
-            this.btnupgrade.TabIndex = 7;
-            this.btnupgrade.Text = "Upgrade This Module";
-            this.btnupgrade.UseVisualStyleBackColor = true;
-            this.btnupgrade.Click += new System.EventHandler(this.btnupgrade_Click);
-            // 
-            // lbpcinfo
-            // 
-            this.lbpcinfo.Location = new System.Drawing.Point(12, 41);
-            this.lbpcinfo.Name = "lbpcinfo";
-            this.lbpcinfo.Size = new System.Drawing.Size(367, 86);
-            this.lbpcinfo.TabIndex = 6;
-            this.lbpcinfo.Text = resources.GetString("lbpcinfo.Text");
-            // 
-            // lbmoduletitle
-            // 
-            this.lbmoduletitle.AutoSize = true;
-            this.lbmoduletitle.Location = new System.Drawing.Point(10, 12);
-            this.lbmoduletitle.Name = "lbmoduletitle";
-            this.lbmoduletitle.Size = new System.Drawing.Size(75, 11);
-            this.lbmoduletitle.TabIndex = 2;
-            this.lbmoduletitle.Text = "Add Module";
-            // 
-            // btncloseinfo
-            // 
-            this.btncloseinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btncloseinfo.AutoSize = true;
-            this.btncloseinfo.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btncloseinfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btncloseinfo.Location = new System.Drawing.Point(327, 254);
-            this.btncloseinfo.Name = "btncloseinfo";
-            this.btncloseinfo.Size = new System.Drawing.Size(52, 23);
-            this.btncloseinfo.TabIndex = 1;
-            this.btncloseinfo.Text = "Done.";
-            this.btncloseinfo.UseVisualStyleBackColor = true;
-            this.btncloseinfo.Click += new System.EventHandler(this.btncloseinfo_Click);
-            // 
-            // pnldefensemanager
-            // 
-            this.pnldefensemanager.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.pnldefensemanager.Controls.Add(this.btnbuy);
-            this.pnldefensemanager.Controls.Add(this.label3);
-            this.pnldefensemanager.Controls.Add(this.cmbmodules);
-            this.pnldefensemanager.Controls.Add(this.label1);
-            this.pnldefensemanager.Controls.Add(this.button1);
-            this.pnldefensemanager.Location = new System.Drawing.Point(3, 147);
-            this.pnldefensemanager.Name = "pnldefensemanager";
-            this.pnldefensemanager.Size = new System.Drawing.Size(382, 280);
-            this.pnldefensemanager.TabIndex = 5;
-            this.pnldefensemanager.Visible = false;
-            // 
-            // btnbuy
-            // 
-            this.btnbuy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnbuy.AutoSize = true;
-            this.btnbuy.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnbuy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnbuy.Location = new System.Drawing.Point(199, 254);
-            this.btnbuy.Name = "btnbuy";
-            this.btnbuy.Size = new System.Drawing.Size(122, 23);
-            this.btnbuy.TabIndex = 7;
-            this.btnbuy.Text = "Buy new module.";
-            this.btnbuy.UseVisualStyleBackColor = true;
-            this.btnbuy.Click += new System.EventHandler(this.btnbuy_Click);
-            // 
-            // label3
-            // 
-            this.label3.Location = new System.Drawing.Point(12, 95);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(367, 156);
-            this.label3.TabIndex = 6;
-            this.label3.Text = resources.GetString("label3.Text");
-            // 
-            // cmbmodules
-            // 
-            this.cmbmodules.BackColor = System.Drawing.Color.Black;
-            this.cmbmodules.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbmodules.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.cmbmodules.ForeColor = System.Drawing.Color.White;
-            this.cmbmodules.FormattingEnabled = true;
-            this.cmbmodules.Location = new System.Drawing.Point(12, 38);
-            this.cmbmodules.Name = "cmbmodules";
-            this.cmbmodules.Size = new System.Drawing.Size(360, 19);
-            this.cmbmodules.TabIndex = 3;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(10, 12);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(75, 11);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Add Module";
-            // 
-            // button1
-            // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.AutoSize = true;
-            this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button1.Location = new System.Drawing.Point(327, 254);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(52, 23);
-            this.button1.TabIndex = 1;
-            this.button1.Text = "Done.";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click_1);
-            // 
-            // pnlbuy
-            // 
-            this.pnlbuy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.pnlbuy.Controls.Add(this.txthostname);
-            this.pnlbuy.Controls.Add(this.lbhostname);
-            this.pnlbuy.Controls.Add(this.txtgrade);
-            this.pnlbuy.Controls.Add(this.lbgrade);
-            this.pnlbuy.Controls.Add(this.lbmoduleinfo);
-            this.pnlbuy.Controls.Add(this.cmbbuyable);
-            this.pnlbuy.Controls.Add(this.label4);
-            this.pnlbuy.Controls.Add(this.btndonebuying);
-            this.pnlbuy.Location = new System.Drawing.Point(3, 128);
-            this.pnlbuy.Name = "pnlbuy";
-            this.pnlbuy.Size = new System.Drawing.Size(382, 299);
-            this.pnlbuy.TabIndex = 6;
-            this.pnlbuy.Visible = false;
-            // 
-            // txthostname
-            // 
-            this.txthostname.BackColor = System.Drawing.Color.Black;
-            this.txthostname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.txthostname.ForeColor = System.Drawing.Color.White;
-            this.txthostname.Location = new System.Drawing.Point(186, 236);
-            this.txthostname.Name = "txthostname";
-            this.txthostname.Size = new System.Drawing.Size(186, 18);
-            this.txthostname.TabIndex = 10;
-            // 
-            // lbhostname
-            // 
-            this.lbhostname.AutoSize = true;
-            this.lbhostname.Location = new System.Drawing.Point(112, 240);
-            this.lbhostname.Name = "lbhostname";
-            this.lbhostname.Size = new System.Drawing.Size(68, 11);
-            this.lbhostname.TabIndex = 9;
-            this.lbhostname.Text = "Hostname:";
-            // 
-            // txtgrade
-            // 
-            this.txtgrade.BackColor = System.Drawing.Color.Black;
-            this.txtgrade.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.txtgrade.ForeColor = System.Drawing.Color.White;
-            this.txtgrade.Location = new System.Drawing.Point(65, 236);
-            this.txtgrade.Name = "txtgrade";
-            this.txtgrade.Size = new System.Drawing.Size(40, 18);
-            this.txtgrade.TabIndex = 8;
-            this.txtgrade.TextChanged += new System.EventHandler(this.txtgrade_TextChanged);
-            // 
-            // lbgrade
-            // 
-            this.lbgrade.AutoSize = true;
-            this.lbgrade.Location = new System.Drawing.Point(12, 240);
-            this.lbgrade.Name = "lbgrade";
-            this.lbgrade.Size = new System.Drawing.Size(47, 11);
-            this.lbgrade.TabIndex = 7;
-            this.lbgrade.Text = "Grade:";
-            // 
-            // lbmoduleinfo
-            // 
-            this.lbmoduleinfo.Location = new System.Drawing.Point(10, 63);
-            this.lbmoduleinfo.Name = "lbmoduleinfo";
-            this.lbmoduleinfo.Size = new System.Drawing.Size(367, 156);
-            this.lbmoduleinfo.TabIndex = 6;
-            this.lbmoduleinfo.Text = resources.GetString("lbmoduleinfo.Text");
-            // 
-            // cmbbuyable
-            // 
-            this.cmbbuyable.BackColor = System.Drawing.Color.Black;
-            this.cmbbuyable.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbbuyable.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.cmbbuyable.ForeColor = System.Drawing.Color.White;
-            this.cmbbuyable.FormattingEnabled = true;
-            this.cmbbuyable.Location = new System.Drawing.Point(12, 38);
-            this.cmbbuyable.Name = "cmbbuyable";
-            this.cmbbuyable.Size = new System.Drawing.Size(360, 19);
-            this.cmbbuyable.TabIndex = 3;
-            this.cmbbuyable.SelectedIndexChanged += new System.EventHandler(this.cmbbuyable_SelectedIndexChanged);
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(10, 12);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(75, 11);
-            this.label4.TabIndex = 2;
-            this.label4.Text = "Buy Module";
-            // 
-            // btndonebuying
-            // 
-            this.btndonebuying.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btndonebuying.AutoSize = true;
-            this.btndonebuying.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btndonebuying.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btndonebuying.Location = new System.Drawing.Point(341, 273);
-            this.btndonebuying.Name = "btndonebuying";
-            this.btndonebuying.Size = new System.Drawing.Size(38, 23);
-            this.btndonebuying.TabIndex = 1;
-            this.btndonebuying.Text = "Buy";
-            this.btndonebuying.UseVisualStyleBackColor = true;
-            this.btndonebuying.Click += new System.EventHandler(this.btndonebuying_Click);
-            // 
-            // flcontrols
-            // 
-            this.flcontrols.Controls.Add(this.btnaddmodule);
-            this.flcontrols.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.flcontrols.Location = new System.Drawing.Point(0, 430);
-            this.flcontrols.Name = "flcontrols";
-            this.flcontrols.Size = new System.Drawing.Size(793, 31);
-            this.flcontrols.TabIndex = 4;
-            // 
-            // btnaddmodule
-            // 
-            this.btnaddmodule.AutoSize = true;
-            this.btnaddmodule.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnaddmodule.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnaddmodule.Location = new System.Drawing.Point(3, 3);
-            this.btnaddmodule.Name = "btnaddmodule";
-            this.btnaddmodule.Size = new System.Drawing.Size(87, 23);
-            this.btnaddmodule.TabIndex = 0;
-            this.btnaddmodule.Text = "Add Module";
-            this.btnaddmodule.UseVisualStyleBackColor = true;
-            this.btnaddmodule.Click += new System.EventHandler(this.btnaddmodule_Click);
-            // 
-            // lbcompromised
-            // 
-            this.lbcompromised.AutoSize = true;
-            this.lbcompromised.Location = new System.Drawing.Point(251, 85);
-            this.lbcompromised.Name = "lbcompromised";
-            this.lbcompromised.Size = new System.Drawing.Size(103, 11);
-            this.lbcompromised.TabIndex = 3;
-            this.lbcompromised.Text = "SYSTEM DAMAGED";
-            this.lbcompromised.Visible = false;
-            // 
-            // lbstats
-            // 
-            this.lbstats.AutoSize = true;
-            this.lbstats.Location = new System.Drawing.Point(13, 13);
-            this.lbstats.Name = "lbstats";
-            this.lbstats.Size = new System.Drawing.Size(138, 11);
-            this.lbstats.TabIndex = 0;
-            this.lbstats.Text = "System Health: 100%";
-            // 
-            // tmrhealthdetect
-            // 
-            this.tmrhealthdetect.Tick += new System.EventHandler(this.tmrhealthdetect_Tick);
-            // 
-            // tmrredraw
-            // 
-            this.tmrredraw.Interval = 5000;
-            this.tmrredraw.Tick += new System.EventHandler(this.tmrredraw_Tick);
-            // 
-            // lbtutorial
-            // 
-            this.lbtutorial.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.lbtutorial.Location = new System.Drawing.Point(411, 13);
-            this.lbtutorial.Name = "lbtutorial";
-            this.lbtutorial.Size = new System.Drawing.Size(367, 86);
-            this.lbtutorial.TabIndex = 8;
-            this.lbtutorial.Text = resources.GetString("lbtutorial.Text");
-            this.lbtutorial.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            this.lbtutorial.Visible = false;
-            // 
-            // btnnext
-            // 
-            this.btnnext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnnext.AutoSize = true;
-            this.btnnext.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnnext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnnext.Location = new System.Drawing.Point(712, 102);
-            this.btnnext.Name = "btnnext";
-            this.btnnext.Size = new System.Drawing.Size(66, 23);
-            this.btnnext.TabIndex = 9;
-            this.btnnext.Text = "Next >>";
-            this.btnnext.UseVisualStyleBackColor = true;
-            this.btnnext.Visible = false;
-            this.btnnext.Click += new System.EventHandler(this.btnnext_Click);
-            // 
-            // Hacking_YourHealth
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(793, 461);
-            this.Controls.Add(this.panel1);
-            this.Name = "Hacking_YourHealth";
-            this.Text = "Hacking_YourHealth";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.this_Closing);
-            this.Load += new System.EventHandler(this.Hacking_YourHealth_Load);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.pnlpcinfo.ResumeLayout(false);
-            this.pnlpcinfo.PerformLayout();
-            this.pnldefensemanager.ResumeLayout(false);
-            this.pnldefensemanager.PerformLayout();
-            this.pnlbuy.ResumeLayout(false);
-            this.pnlbuy.PerformLayout();
-            this.flcontrols.ResumeLayout(false);
-            this.flcontrols.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbstats;
-        private System.Windows.Forms.Timer tmrhealthdetect;
-        private System.Windows.Forms.Label lbcompromised;
-        private System.Windows.Forms.FlowLayoutPanel flcontrols;
-        private System.Windows.Forms.Button btnaddmodule;
-        private System.Windows.Forms.Panel pnldefensemanager;
-        private System.Windows.Forms.ComboBox cmbmodules;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Button btnbuy;
-        private System.Windows.Forms.Timer tmrredraw;
-        private System.Windows.Forms.Panel pnlbuy;
-        private System.Windows.Forms.TextBox txtgrade;
-        private System.Windows.Forms.Label lbgrade;
-        private System.Windows.Forms.Label lbmoduleinfo;
-        private System.Windows.Forms.ComboBox cmbbuyable;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Button btndonebuying;
-        private System.Windows.Forms.TextBox txthostname;
-        private System.Windows.Forms.Label lbhostname;
-        private System.Windows.Forms.Panel pnlpcinfo;
-        private System.Windows.Forms.Button btnpoweroff;
-        private System.Windows.Forms.Button btnupgrade;
-        private System.Windows.Forms.Label lbpcinfo;
-        private System.Windows.Forms.Label lbmoduletitle;
-        private System.Windows.Forms.Button btncloseinfo;
-        private System.Windows.Forms.Label lbtargets;
-        private System.Windows.Forms.Button btnnext;
-        private System.Windows.Forms.Label lbtutorial;
-    }
-}
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Hacking_YourHealth.cs b/source/WindowsFormsApplication1/Hacking_YourHealth.cs
deleted file mode 100644
index b6689fc..0000000
--- a/source/WindowsFormsApplication1/Hacking_YourHealth.cs
+++ /dev/null
@@ -1,950 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ShiftOS
-{
-    public partial class Hacking_YourHealth : Form
-    {
-        public Hacking_YourHealth()
-        {
-            InitializeComponent();
-        }
-
-        public Hacking_YourHealth(EnemyHacker enemy)
-        {
-            EnemyNet = enemy;
-            InitializeComponent();
-        }
-
-        public Computer ThisPC = null;
-        public Hacking_Enemy EnemyScreen = null;
-        public EnemyHacker EnemyNet = null;
-        private decimal TotalHP = 0;
-
-        private List<Module> MyNetwork = new List<Module>();
-
-        private void Hacking_YourHealth_Load(object sender, EventArgs e)
-        {
-            AntiVirusBounds = new List<Rectangle>();
-            TutorialNetwork.Add(new Module(SystemType.Core, 1, "localhost"));
-            foreach(var m in GetMyNet())
-            {
-                if(m.Type == SystemType.Core)
-                {
-                    MyNetwork.Add(m);
-                }
-            }
-            VisualizeNetwork();
-            if (EnemyNet != null)
-            {
-                var h = new Hacking_Enemy(this, EnemyNet);
-                tmrhealthdetect.Start();
-                EnemyScreen = h;
-                API.CreateForm(h, "Enemy Hacker", Properties.Resources.iconTerminal);
-
-            }
-            else
-            {
-                var h = new Hacking_Enemy(this, Hacking.EnemyHackers[new Random().Next(0, Hacking.EnemyHackers.Count - 1)]);
-                tmrhealthdetect.Start();
-                EnemyScreen = h;
-                API.CreateForm(h, "Enemy Hacker", Properties.Resources.iconTerminal);
-            }
-            ThisPC.EnemyComputer = EnemyScreen.ThisPC;
-            if(IsTutorial)
-            {
-                SetupTutorialUI(0);
-            }
-        }
-
-        private void VisualizeNetwork()
-        {
-            AllComputers = new List<Computer>();
-            foreach(Module m in MyNetwork)
-            {
-                if (AllComputers.Count <= 10)
-                {
-                    var c = m.Deploy();
-                    if (c.Type == SystemType.Core)
-                    {
-                        ThisPC = c;
-                    }
-                    AddModule(c);
-                }
-            }
-        }
-
-        
-
-        private void btnvirus_Click(object sender, EventArgs e)
-        {
-            ThisPC.EnemyComputer.LaunchAttack(AttackType.Virus);
-        }
-
-        public List<Computer> AllComputers = null;
-
-        private void tmrhealthdetect_Tick(object sender, EventArgs e)
-        {
-            var rnd = new Random();
-            int chance = 0;
-            foreach(var pc in AllComputers)
-            {
-                if (pc.Disabled == false)
-                {
-                    if (pc.Enemies != null)
-                    {
-                        foreach (var enemy in pc.Enemies)
-                        {
-                            if (EnemyScreen.AllComputers.Contains(enemy))
-                            {
-                                chance = rnd.Next(1, 15);
-                                if (chance == 7)
-                                {
-                                    if (IsTutorial)
-                                    {
-                                        if (TutorialProgress == 32 || TutorialProgress == 9)
-                                        {
-                                            enemy.LaunchAttack(pc.GetProperType(), pc.GetDamageRate());
-                                        }
-                                    }
-                                    else {
-                                        enemy.LaunchAttack(pc.GetProperType(), pc.GetDamageRate());
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            decimal health = 0;
-            EnemyScreen.Enemy = this;
-            foreach (var pc in AllComputers)
-            {
-                health += (decimal)pc.HP;
-            }
-            if(health > TotalHP)
-            {
-                TotalHP = health;
-            }
-            decimal percent = (health / TotalHP) * 100;
-            lbstats.Text = $"System Health: {percent}%";
-            if(ThisPC.HP <= 0)
-            {
-                API.CreateInfoboxSession("System compromised.", "The enemy hacker has overthrown your defenses and compromised your system. You will need to wait an hour before you can start another hack battle.", infobox.InfoboxMode.Info);
-                Hacking.Failure = true;
-                Hacking.FailDate = DateTime.Now;
-                UserRequestedClose = false;
-                this.Close();
-                EnemyScreen.UserRequestedClose = false;
-                EnemyScreen.Close();
-                this.Close();
-            }
-        }
-
-        public bool UserRequestedClose = true;
-
-        private void this_Closing(object sender, FormClosingEventArgs e)
-        {
-            if (UserRequestedClose == false)
-            {
-                tmrhealthdetect.Stop();
-                foreach (var pc in AllComputers)
-                {
-                    pc.HP = 0;
-                }
-            }
-        }
-
-        public Computer SelectedComputer = null;
-
-        public void AddModule(Computer newModule) {
-            panel1.Controls.Add(newModule);
-            int hp = newModule.HP;
-
-            TotalHP += newModule.HP;
-            AllComputers.Add(newModule);
-            newModule.Show();
-            newModule.OnDestruction += (object s, EventArgs a) =>
-            {
-                if (this.SelectedComputer == newModule)
-                {
-                    SelectedComputer = null;
-                }
-                if(newModule.Type == SystemType.Firewall)
-                {
-                    Firewall_Destroy(newModule);
-                }
-                AllComputers.Remove(newModule);
-                newModule.Dispose();
-            };
-            newModule.Select += (object s, EventArgs e) =>
-            {
-                SelectedComputer = newModule;
-                ShowPCInfo(newModule.Hostname);
-                if(IsTutorial)
-                {
-                    if(TutorialProgress == 6)
-                    {
-                        if(newModule == ThisPC)
-                        {
-                            SetupTutorialUI(7);
-                        }
-                    }
-                }
-            };
-            newModule.HP_Decreased += new EventHandler(System_Damaged);
-            newModule.OnRepair += new EventHandler(System_Repaired);
-            if (newModule.Type == SystemType.Antivirus || newModule.Type == SystemType.RepairModule)
-            {
-                var b = newModule.GetAreaOfEffect();
-                AntiVirusBounds.Add(b);
-                panel1.Refresh();
-                newModule.AntivirusRepair += (object s, EventArgs a) =>
-                {
-                    foreach (Computer pc in AllComputers)
-                    {
-                        if (pc != newModule && pc.Bounds.IntersectsWith(b))
-                        {
-                            if (newModule.Type == SystemType.RepairModule)
-                            {
-                                if (pc.HP < newModule.HP)
-                                {
-                                    if (pc.HP < pc.GetTotal())
-                                    {
-                                        pc.Repair(1);
-                                    }
-                                }
-
-                            }
-                            else {
-                                if (pc.HP < 10)
-                                {
-                                    pc.Repair(1);
-                                }
-                            }
-                        }
-                    }
-                };
-
-            }
-            if(newModule.Type == SystemType.Firewall)
-            {
-                var b = newModule.GetAreaOfEffect();
-                AntiVirusBounds.Add(b);
-                panel1.Refresh();
-                Firewall_Deflect(newModule);
-            }
-            if(newModule.Type == SystemType.ServerStack)
-            {
-                newModule.MassDDoS += (object s, EventArgs a) =>
-                {
-                    EnemyScreen.Worm();
-                };
-            }
-        }
-
-        public void Worm()
-        {
-            var rnd = new Random();
-            int r = rnd.Next(0, 10);
-
-            foreach (Computer c in AllComputers)
-            {
-                if (r == 5)
-                {
-                    c.Disable();
-                }
-            }
-        }
-
-        public void ShowPCInfo(string hostname)
-        {
-            Module mod = null;
-            foreach(var m in GetMyNet())
-            {
-                if(m.Hostname == hostname)
-                {
-                    mod = m;
-                }
-            }
-            if(mod != null)
-            {
-                pnlpcinfo.Show();
-                lbmoduletitle.Text = "Module Info - " + hostname;
-                lbpcinfo.Text = $"Hostname: {hostname}{Environment.NewLine}Type: {mod.Type.ToString()}";
-                if (mod.Type == SystemType.Core)
-                {
-                    lbpcinfo.Text += Environment.NewLine + "This represents your main system. If this module is destroyed, you will automatically lose the battle. Protect it at all costs.";
-                    btnupgrade.Hide();
-                    btnpoweroff.Hide();
-                }
-                else {
-                    lbpcinfo.Text += $"{Environment.NewLine}Grade: {mod.Grade}";
-                    if (mod.Grade < 4)
-                    {
-                        btnupgrade.Show();
-                    }
-                    else
-                    {
-                        btnupgrade.Hide();
-                    }
-                    btnpoweroff.Show();
-                }
-            }
-            Computer c = null;
-            foreach(var pc in AllComputers)
-            {
-                if(pc.Hostname == hostname)
-                {
-                    c = pc;
-                }
-            }
-            if(c != null)
-            {
-                lbtargets.Text = "Targets: ";
-                if (c.Enemies != null)
-                {
-                    if(c.Enemies.Count > 0)
-                    {
-                        foreach(var pc in c.Enemies)
-                        {
-                            lbtargets.Text += " " + pc.Hostname + ",";
-                        }
-                    }
-                    else
-                    {
-                        lbtargets.Text += " - Click on an enemy module to target it.";
-                    }
-                }
-                else
-                {
-                    lbtargets.Text += " - Click on an enemy module to target it.";
-                }
-                lbtargets.Text += Environment.NewLine + "Some modules will not fire at their targets.";
-            }
-        }
-
-        public void Firewall_Deflect(Computer fwall)
-        {
-            //Safegaurd...
-            if(fwall.Type == SystemType.Firewall)
-            {
-                var r = fwall.GetAreaOfEffect();
-                foreach(var pc in AllComputers)
-                {
-                    if (pc != fwall)
-                    {
-                        if (pc.Bounds.IntersectsWith(r))
-                        {
-                            pc.DamageDefector = fwall.Grade;
-                        }
-                    }
-                }
-            }
-        }
-
-        public void Firewall_Destroy(Computer fwall)
-        {
-            //Safegaurd...
-            if (fwall.Type == SystemType.Firewall)
-            {
-                var r = fwall.GetAreaOfEffect();
-                foreach (var pc in AllComputers)
-                {
-                    if (pc.Bounds.IntersectsWith(r))
-                    {
-                        pc.DamageDefector = 1;
-                        UpdateFirewalls();
-                    }
-                }
-            }
-        }
-
-        public void UpdateFirewalls()
-        {
-            foreach(var pc in AllComputers)
-            {
-                if(pc.Type == SystemType.Firewall)
-                {
-                    Firewall_Deflect(pc);
-                }
-            }
-        }
-
-
-        private void System_Repaired(object s, EventArgs e)
-        {
-            var c = (Computer)s;
-            lbcompromised.Text = "System regenerating...";
-            int location = c.Left - (lbcompromised.Width / 4);
-            int y = c.Top - 25;
-            lbcompromised.Location = new Point(location, y);
-            lbcompromised.Show();
-            c.Flash(lbcompromised);
-            
-        }
-
-
-        private void System_Damaged(object s, EventArgs e)
-        {
-            var c = (Computer)s;
-            lbcompromised.Text = "System damaged!";
-            int location = c.Left - (lbcompromised.Width / 4);
-            int y = c.Top - 25;
-            lbcompromised.Location = new Point(location, y);
-            lbcompromised.Show();
-            c.Flash(lbcompromised);
-        }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            EnemyScreen.Worm();
-        }
-
-        private void btnaddmodule_Click(object sender, EventArgs e)
-        {
-            SetupModuleList();
-            pnldefensemanager.Visible = !pnldefensemanager.Visible;
-            if(IsTutorial)
-            {
-                if(TutorialProgress == 12)
-                {
-                    SetupTutorialUI(13);
-                }
-            }
-        }
-
-        private Dictionary<string, SystemType> FutureModules = null;
-        public List<Module> TutorialNetwork = new List<Module>();
-
-        public void SetupModuleList()
-        {
-            FutureModules = new Dictionary<string, SystemType>();
-            cmbmodules.Items.Clear();
-            List<Module> net = null;
-            if(IsTutorial)
-            {
-                net = TutorialNetwork;
-            }
-            else
-            {
-                net = Hacking.MyNetwork;
-            }
-            foreach (var item in net)
-            {
-                Computer m = null;
-                foreach(var mod in AllComputers)
-                {
-                    if(mod.Hostname == item.Hostname)
-                    {
-                        m = mod;
-                    }
-                }
-                if (m == null)
-                {
-                    cmbmodules.Items.Add(item.Hostname);
-                    FutureModules.Add(item.Hostname, item.Type);
-                }
-            }
-            
-        }
-
-        bool PlacingNewModule = false;
-        
-
-        private void button1_Click_1(object sender, EventArgs e)
-        {
-            if (cmbmodules.Text != "")
-            {
-                PlacingNewModule = true;
-                pnldefensemanager.Hide();
-                if (IsTutorial)
-                {
-                    if (TutorialProgress == 20)
-                    {
-                        SetupTutorialUI(21);
-                    }
-                }
-            }
-        }
-
-        private void playfield_MouseDown(object sender, MouseEventArgs e)
-        {
-            if (PlacingNewModule == true)
-            {
-                if (e.Button == MouseButtons.Left)
-                {
-                    if (AllComputers.Count < 10)
-                    {
-                        bool cont = true;
-                        try
-                        {
-                            SystemType type = FutureModules[cmbmodules.Text];
-                        }
-                        catch 
-                        {
-                            cont = false;
-                            API.CreateInfoboxSession("Error", "Please select a module type.", infobox.InfoboxMode.Info);
-                        }
-                        if (cont == true)
-                        {
-                            var coordinates = panel1.PointToClient(Cursor.Position);
-                            int x = coordinates.X;
-                            int y = coordinates.Y;
-
-                            var m = new Module(FutureModules[cmbmodules.Text], 1, cmbmodules.Text);
-                            foreach (var mod in GetMyNet())
-                            {
-                                if (mod.Hostname == cmbmodules.Text)
-                                {
-                                    m = mod;
-                                }
-                            }
-                            m.X = x;
-                            m.Y = y;
-                            var c = m.Deploy();
-                            AddModule(c);
-                            API.RemoveCodepoints(10);
-                            pnldefensemanager.Hide();
-                            if(IsTutorial)
-                            {
-                                if(TutorialProgress == 21)
-                                {
-                                    SetupTutorialUI(22);
-                                }
-                                else if(TutorialProgress == 25)
-                                {
-                                    SetupTutorialUI(26);
-                                }
-                            }
-                        }
-                        PlacingNewModule = false;
-                    }
-                    else
-                    {
-                        API.CreateInfoboxSession("Too much deployed modules", "You can have a maximum of 10 modules deployed on your network, including your main system. You will have to wait for one to be destroyed.", infobox.InfoboxMode.Info);
-                        PlacingNewModule = false;
-                    }
-                }
-                else
-                {
-                    PlacingNewModule = false;
-                }
-            }
-        }
-
-        public List<FutureModule> BuyableModules = null;
-
-        public void SetupBuyable()
-        {
-            if(!IsTutorial)
-            {
-                BuyableModules = Hacking.GetFutureModules();
-            }
-            cmbbuyable.Items.Clear();
-            foreach(var m in BuyableModules)
-            {
-                cmbbuyable.Items.Add(m.Name);
-            }
-            lbmoduleinfo.Text = "";
-            txtgrade.Text = "1";
-        }
-
-        private void btnbuy_Click(object sender, EventArgs e)
-        {
-            if(IsTutorial)
-            {
-                if(TutorialProgress == 14)
-                {
-                    SetupTutorialUI(15);
-                }
-            }
-            SetupBuyable();
-            pnlbuy.Show();
-            pnldefensemanager.Hide();
-        }
-
-        public List<Rectangle> AntiVirusBounds = null;
-        public List<Rectangle> IndicatorsToDestroy = new List<Rectangle>();
-        private void boundpaint(object sender, PaintEventArgs e)
-        {
-            foreach(Rectangle r in IndicatorsToDestroy)
-            {
-                AntiVirusBounds.Remove(r);
-                var sb = new SolidBrush(Color.Black);
-                var p = new Pen(sb);
-                p.DashStyle = System.Drawing.Drawing2D.DashStyle.Solid;
-                p.Width = 2;
-                e.Graphics.DrawRectangle(p, r);
-
-            }
-            IndicatorsToDestroy.Clear();
-            foreach (Rectangle r in AntiVirusBounds)
-            {
-                IndicatorsToDestroy.Add(r);
-                tmrredraw.Start();
-                var sb = new SolidBrush(Color.White);
-                var p = new Pen(sb);
-                p.DashStyle = System.Drawing.Drawing2D.DashStyle.Dot;
-                p.Width = 2;
-                e.Graphics.DrawRectangle(p, r);
-            }
-        }
-
-        private void tmrredraw_Tick(object sender, EventArgs e)
-        {
-            panel1.Refresh();
-            tmrredraw.Stop();
-        }
-
-        private void SetupModuleInfo()
-        {
-            bool cont = false;
-            FutureModule m = null;
-            foreach(var mod in BuyableModules)
-            {
-                if(mod.Name == cmbbuyable.Text)
-                {
-                    m = mod;
-                    cont = true;
-                }
-            }
-            if(cont == true)
-            {
-                lbmoduleinfo.Text = m.Name;
-                lbmoduleinfo.Text += Environment.NewLine + $"Cost: {m.Cost * Convert.ToInt32(txtgrade.Text)} CP";
-                lbmoduleinfo.Text += Environment.NewLine + $"Description: {Environment.NewLine}{m.Description}";
-            }
-        }
-
-        private void cmbbuyable_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetupModuleInfo();
-            if(IsTutorial)
-            {
-                if(TutorialProgress == 17)
-                {
-                    if(cmbbuyable.Text == "Antivirus")
-                    {
-                        SetupTutorialUI(18);
-                    }
-                }
-            }
-        }
-
-        private void txtgrade_TextChanged(object sender, EventArgs e)
-        {
-            try
-            {
-                int g = Convert.ToInt32(txtgrade.Text);
-                if(g < 1)
-                {
-                    txtgrade.Text = "1";
-                }
-                else if(g > 4)
-                {
-                    txtgrade.Text = "4";
-                }
-                SetupModuleInfo();
-            }
-            catch
-            {
-                txtgrade.Text = "1";
-                SetupModuleInfo();
-            }
-        }
-
-        public List<Module> GetMyNet()
-        {
-            if(IsTutorial)
-            {
-                return TutorialNetwork;
-            }
-            else
-            {
-                return Hacking.MyNetwork;
-            }
-        }
-
-        private void btndonebuying_Click(object sender, EventArgs e)
-        {
-            var mod = new FutureModule("", 0, "", SystemType.Core);
-            bool cont = false;
-            foreach(var m in BuyableModules)
-            {
-                if(m.Name == cmbbuyable.Text)
-                {
-                    mod = m;
-                    cont = true;
-                }
-            }
-            if(cont == true)
-            {
-                if(API.Codepoints >= mod.Cost)
-                {
-                    if (txthostname.Text != "")
-                    {
-                        bool cont2 = true;
-                        string hname = txthostname.Text.Replace(" ", "_");
-                        foreach (var pc in GetMyNet())
-                        {
-                            if (pc.Hostname == hname)
-                            {
-                                cont2 = false;
-                            }
-                        }
-                        if (cont2 == true)
-                        {
-                            GetMyNet().Add(new Module(mod.Type, Convert.ToInt32(txtgrade.Text), hname));
-                            API.RemoveCodepoints(mod.Cost);
-                            API.CreateInfoboxSession("Module added.", "To deploy the module to the network, select 'Add Module' and choose the hostname from the menu.", infobox.InfoboxMode.Info);
-                            pnlbuy.Hide();
-                            if(IsTutorial)
-                            {
-                                if(TutorialProgress == 19)
-                                {
-                                    SetupTutorialUI(20);
-                                }
-                                else if(TutorialProgress == 24)
-                                {
-                                    SetupTutorialUI(25);
-                                }
-                            }
-                        }
-                        else
-                        {
-                            API.CreateInfoboxSession("Please enter a unique hostname.", "No two computers can share the same hostname. Please choose another.", infobox.InfoboxMode.Info);
-                        }
-                    }
-                    else
-                    {
-                        API.CreateInfoboxSession("Please enter a hostname.", "It is best to enter a hostname for your new computer so you know which one it is.", infobox.InfoboxMode.Info);
-                    }
-
-                }
-                else
-                {
-                    API.CreateInfoboxSession("Insufficient Codepoints", "You do not have enough Codepoints to buy this module.", infobox.InfoboxMode.Info);
-                }
-            }
-        }
-
-        private void btncloseinfo_Click(object sender, EventArgs e)
-        {
-            SelectedComputer = null;
-            pnlpcinfo.Hide();
-            Hacking.SaveCharacters();
-        }
-
-        private void btnpoweroff_Click(object sender, EventArgs e)
-        {
-            //Remove the computer from the game.
-            panel1.Controls.Remove(SelectedComputer);
-            AllComputers.Remove(SelectedComputer);
-            btnpoweroff.Hide();
-        }
-
-        private void btnupgrade_Click(object sender, EventArgs e)
-        {
-            int price = 20 * SelectedComputer.Grade;
-            if(API.Codepoints >= price)
-            {
-                foreach(var m in GetMyNet())
-                {
-                    if(m.Hostname == SelectedComputer.Hostname)
-                    {
-                        SelectedComputer.Grade += 1;
-                        m.Grade += 1;
-                        Hacking.SaveCharacters();
-                        API.CreateInfoboxSession("Upgrade successful.", "Your module has been upgraded.", infobox.InfoboxMode.Info);
-                    }
-                }
-            }
-            else
-            {
-                API.CreateInfoboxSession("Insufficient funds", $"You need at least {price} CP to upgrade this module.", infobox.InfoboxMode.Info);
-            }
-            ShowPCInfo(SelectedComputer.Hostname);
-        }
-
-        public int TutorialProgress = 0;
-        public bool IsTutorial = false;
-        
-        public void SetupTutorialUI(int p)
-        {
-            TutorialProgress = p;
-            lbtutorial.Show();
-            switch(p)
-            {
-                case 0:
-                    lbtutorial.Text = "Welcome to the Hacker Battle tutorial. This guide will teach you the fundamentals and basics of taking part in a Hacker Battle. When you're done here, you'll have all you need for a very basic network.";
-                    btnaddmodule.Hide();
-                    btnnext.Show();
-                    break;
-                case 1:
-                    lbtutorial.Text = "When a battle commenses, you will see two windows. The one on the left, is your network. You can view information about all computers on the network, buy new systems, upgrade them and deploy them.";
-                    break;
-                case 2:
-                    lbtutorial.Text = "On the right is the enemy's network. This window will show you the strength (HP) of all enemy systems, and will allow you to target specific systems to take down.";
-                    break;
-                case 3:
-                    lbtutorial.Text = "On the top-left corner of both windows is the network health indicator. It will display a percentage of the entire network health.";
-                    break;
-                case 4:
-                    lbtutorial.Text = "If the enemy's total network health hits 0%, or his core's strength hits 0%, you win.";
-                    break;
-                case 5:
-                    lbtutorial.Text = "However, if the same happens to you, you will lose the battle.";
-                    break;
-                case 6:
-                    lbtutorial.Text = "You can click on your Core to view information about it.";
-                    btnnext.Hide();
-                    break;
-                case 7:
-                    lbtutorial.Text = "When you click on a module, you can see information about it, such as it's grade level, HP, and type. This module is a Core, so it has no grade level. It currently has 100 HP.";
-                    btnnext.Show();
-                    break;
-                case 8:
-                    lbtutorial.Text = "When a module is selected you can left-click an enemy module to target it. This will make the selected module attempt to fire at the target. Cores are very weak, but are capable of bringing a target down by 1 HP.";
-                    break;
-                case 9:
-                    lbtutorial.Text = "The enemy Core is attacking your Core now. Looks like it's time to fight back. Select your core, and target the enemy's Core to fight back.";
-                    btnnext.Hide();
-                    break;
-                case 10:
-                    lbtutorial.Text = "Phew! He couldn't do much damage before we fought back. In a real battle, modules won't just stop fighting randomly, but for the purpose of this tutorial, your Core will stop attacking the enemy Core.";
-                    btnnext.Show();
-                    ThisPC.Enemies.Clear();
-                    break;
-                case 11:
-                    lbtutorial.Text = "Should your Core fall to a fatal state in the future, you can deploy some defenses to slow the enemy down. Any hacker knows it's best to disable defenses before attacking the main target.";
-                    ThisPC.HP = 5;
-                    break;
-                case 12:
-                    lbtutorial.Text = "We will look at ways of healing damaged modules now. You can add new modules to the network by clicking the [Add Module] button in the lower-left corner.";
-                    btnaddmodule.Show();
-                    btnnext.Hide();
-                    break;
-                case 13:
-                    lbtutorial.Text = "You can select a module from the list of hostnames. Only modules that are not powered on will display in the menu.";
-                    btnnext.Show();
-                    BuyableModules = new List<FutureModule>();
-                    BuyableModules.Add(new FutureModule("Antivirus", 0, "This module will heal any other module within it's area of effect to 10 HP. Higher grades can improve it's area of effect.", SystemType.Antivirus));
-                    break;
-                case 14:
-                    lbtutorial.Text = "In this demonstration, you have no other modules to deploy. You will need to buy some modules to get started. Click [Buy New Module] to continue.";
-                    btnnext.Hide();
-                    break;
-                case 15:
-                    lbtutorial.Text = "Let's go over the user interface, shall we? At the top is a list of all possible module types.";
-                    btnnext.Show();
-                    btndonebuying.Hide();
-                    lbgrade.Hide();
-                    txtgrade.Hide();
-                    txthostname.Hide();
-                    lbhostname.Hide();
-                    lbmoduleinfo.Hide();
-                    break;
-                case 16:
-                    lbtutorial.Text = "Below that, is the cost and description of the selected module type. It's invisible right now, but when you select a new module, it will populate.";
-                    lbmoduleinfo.Show();
-                    break;
-                case 17:
-                    lbtutorial.Text = "We need an Antivirus module, so go ahead and select it from the menu.";
-                    btnnext.Hide();
-                    break;
-                case 18:
-                    lbtutorial.Text = "Normally, an Antivirus would cost us 15 Codepoints, however since this is a tutorial, it is free.";
-                    btnnext.Show();
-                    break;
-                case 19:
-                    lbtutorial.Text = "Below the description is the Hostname box. A Hostname is used to identify the new module. Pick something you'll remember as this new Antivirus, then click [Buy] to purchase it.";
-                    btnnext.Hide();
-                    lbhostname.Show();
-                    txthostname.Show();
-                    btndonebuying.Show();
-                    break;
-                case 20:
-                    btnnext.Hide();
-                    lbtutorial.Text = "Now that we have an antivirus module, go ahead and deploy it by selecting [Add Module], choosing the hostname you entered, and clicking [Done].";
-                    break;
-                case 21:
-                    btnnext.Hide();
-                    lbtutorial.Text = "Alrighty. Now you get to choose where you place your module. Simply left-click in a blank area where you'd like to place the module. Right-click to cancel. Oh, be sure to place close to our Core!";
-                    break;
-                case 22:
-                    lbtutorial.Text = "The Antivirus has been placed. You may've noticed that white dotted box around it when you placed it. If the Core is even slightly within the box, the Antivirus will heal it back to 10 HP.";
-                    btnnext.Show();
-                    break;
-                case 23:
-                    lbtutorial.Text = "The higher the Antivirus' grade, the bigger this area of effect becomes. However, it will always only be able to heal modules to 10 HP.";
-                    break;
-                case 24:
-                    lbtutorial.Text = "A Turret has been added to the list of buyable modules. Go pick one up!";
-                    btnnext.Hide();
-                    BuyableModules.Clear();
-                    BuyableModules.Add(new FutureModule("Turret", 0, "It's not super-effective, but the Turret will blast through any Grade 1 defenses pretty quickly. The higher the grade, the higher the strength.", SystemType.Turret));
-                    break;
-                case 25:
-                    lbtutorial.Text = "Turrets can fire damaging viruses at their targets. Go ahead and place your Turret somewhere within the Antivirus's Area of Effect.";
-                    break;
-                case 26:
-                    lbtutorial.Text = "Notice how the Turret only has 10 HP, just like the Antivirus?";
-                    btnnext.Show();
-                    break;
-                case 27:
-                    lbtutorial.Text = "This is because both the Antivirus and Turret are at Grade 1. There are four grades of modules you can get, and you can easily upgrade by selecting a module and choosing [Upgrade This Module].";
-                    break;
-                case 28:
-                    lbtutorial.Text = "Upgrading a module will increase it's max HP. Grade 1 is 10 HP, Grade 2 is 20 HP, Grade 3 is 40 HP, and Grade 4 is 80 HP.";
-                    break;
-                case 29:
-                    lbtutorial.Text = "Some modules will have a higher attack rate based on their grade. Others may throw more damaging attacks, and any module's Area of Effect (if it has one) will grow.";
-                    break;
-                case 30:
-                    lbtutorial.Text = "Another tip: Multiple modules can target the same module, and a module can have multiple targets. This means that you can have your Core and your Turret both attack the enemy Core.";
-                    break;
-                case 31:
-                    lbtutorial.Text = "Some modules do not work on a target-based system. Some may work using an area-of-effect system (like an Antivirus), and some may target the entire enemy network.";
-                    break;
-                case 32:
-                    lbtutorial.Text = "We have reset both your Cores' health. Go ahead and finish off the enemy Core using your newfound skills.";
-                    ThisPC.HP = 100;
-                    EnemyScreen.ThisPC.HP = 100;
-                    btnnext.Hide();
-                    BuyableModules = new List<FutureModule>();
-                    BuyableModules.Add(new FutureModule("Antivirus", 0, "This module will heal any other module within it's area of effect to 10 HP. Higher grades can improve it's area of effect.", SystemType.Antivirus));
-                    BuyableModules.Add(new FutureModule("Turret", 0, "It's not super-effective, but the Turret will blast through any Grade 1 defenses pretty quickly. The higher the grade, the higher the strength.", SystemType.Turret));
-                    break;
-                default:
-                    lbtutorial.Text = "This concludes the Hacker Battle tutorial. Happy hunting, soldier. Just kidding. Stay safe.";
-                    btnnext.Text = "Close";
-                    break;
-            }
-        }
-
-        private void btnnext_Click(object sender, EventArgs e)
-        {
-            if(btnnext.Text == "Close")
-            {
-                UserRequestedClose = false;
-                this.Close();
-                EnemyScreen.UserRequestedClose = false;
-                EnemyScreen.Close();
-            }
-            SetupTutorialUI(TutorialProgress + 1);
-        }
-    }
-
-    public enum ConnectionDirection
-    {
-        Left, Right, Top, Bottom, NoBridge
-    }
-}
diff --git a/source/WindowsFormsApplication1/Hacking_YourHealth.resx b/source/WindowsFormsApplication1/Hacking_YourHealth.resx
deleted file mode 100644
index 1ba310a..0000000
--- a/source/WindowsFormsApplication1/Hacking_YourHealth.resx
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="lbtutorial.Text" xml:space="preserve">
-    <value>When you press 'Done', simply click where you'd like to place the new module. You can right-click the playing field to cancel the deployment.
-
-Some modules have a range of effect. For example, an Antivirus will only heal modules within it's area of effect and only if their HP is below 10. This can be upgraded.
-
-To upgrade a module, simply right-click it on the playing field and choose 'Upgrade this module'.
-
-If you would like to buy a new module, click 'Buy new module'.</value>
-  </data>
-  <data name="lbpcinfo.Text" xml:space="preserve">
-    <value>When you press 'Done', simply click where you'd like to place the new module. You can right-click the playing field to cancel the deployment.
-
-Some modules have a range of effect. For example, an Antivirus will only heal modules within it's area of effect and only if their HP is below 10. This can be upgraded.
-
-To upgrade a module, simply right-click it on the playing field and choose 'Upgrade this module'.
-
-If you would like to buy a new module, click 'Buy new module'.</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>When you press 'Done', simply click where you'd like to place the new module. You can right-click the playing field to cancel the deployment.
-
-Some modules have a range of effect. For example, an Antivirus will only heal modules within it's area of effect and only if their HP is below 10. This can be upgraded.
-
-To upgrade a module, simply right-click it on the playing field and choose 'Upgrade this module'.
-
-If you would like to buy a new module, click 'Buy new module'.</value>
-  </data>
-  <data name="lbmoduleinfo.Text" xml:space="preserve">
-    <value>When you press 'Done', simply click where you'd like to place the new module. You can right-click the playing field to cancel the deployment.
-
-Some modules have a range of effect. For example, an Antivirus will only heal modules within it's area of effect and only if their HP is below 10. This can be upgraded.
-
-To upgrade a module, simply right-click it on the playing field and choose 'Upgrade this module'.
-
-If you would like to buy a new module, click 'Buy new module'.</value>
-  </data>
-  <metadata name="tmrhealthdetect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="tmrredraw.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>156, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/MountMgr.cs b/source/WindowsFormsApplication1/HostLayer/MountMgr.cs
similarity index 100%
rename from source/WindowsFormsApplication1/MountMgr.cs
rename to source/WindowsFormsApplication1/HostLayer/MountMgr.cs
diff --git a/source/WindowsFormsApplication1/OSInfo.cs b/source/WindowsFormsApplication1/HostLayer/OSInfo.cs
similarity index 100%
rename from source/WindowsFormsApplication1/OSInfo.cs
rename to source/WindowsFormsApplication1/HostLayer/OSInfo.cs
diff --git a/source/WindowsFormsApplication1/Paths.cs b/source/WindowsFormsApplication1/HostLayer/Paths.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Paths.cs
rename to source/WindowsFormsApplication1/HostLayer/Paths.cs
diff --git a/source/WindowsFormsApplication1/Jumper.Designer.cs b/source/WindowsFormsApplication1/Jumper.Designer.cs
deleted file mode 100644
index 096dc47..0000000
--- a/source/WindowsFormsApplication1/Jumper.Designer.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-namespace ShiftOS
-{
-    partial class Jumper
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.pnlstatus = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnplay = new System.Windows.Forms.Button();
-            this.lbstatus = new System.Windows.Forms.Label();
-            this.lbstatus2 = new System.Windows.Forms.Label();
-            this.ground = new System.Windows.Forms.Panel();
-            this.tmrscreenupdate = new System.Windows.Forms.Timer(this.components);
-            this.player = new System.Windows.Forms.PictureBox();
-            this.pnlstatus.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.player)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // pnlstatus
-            // 
-            this.pnlstatus.Controls.Add(this.btnplay);
-            this.pnlstatus.Controls.Add(this.lbstatus);
-            this.pnlstatus.Controls.Add(this.lbstatus2);
-            this.pnlstatus.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pnlstatus.Location = new System.Drawing.Point(0, 408);
-            this.pnlstatus.Name = "pnlstatus";
-            this.pnlstatus.Size = new System.Drawing.Size(800, 30);
-            this.pnlstatus.TabIndex = 0;
-            // 
-            // btnplay
-            // 
-            this.btnplay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnplay.Location = new System.Drawing.Point(3, 3);
-            this.btnplay.Name = "btnplay";
-            this.btnplay.Size = new System.Drawing.Size(75, 23);
-            this.btnplay.TabIndex = 0;
-            this.btnplay.Text = "Play";
-            this.btnplay.UseVisualStyleBackColor = true;
-            this.btnplay.Click += new System.EventHandler(this.btnplay_Click);
-            // 
-            // lbstatus
-            // 
-            this.lbstatus.Location = new System.Drawing.Point(84, 0);
-            this.lbstatus.Name = "lbstatus";
-            this.lbstatus.Size = new System.Drawing.Size(137, 23);
-            this.lbstatus.TabIndex = 1;
-            this.lbstatus.Text = "Codepoints: 0";
-            this.lbstatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lbstatus2
-            // 
-            this.lbstatus2.Location = new System.Drawing.Point(227, 0);
-            this.lbstatus2.Name = "lbstatus2";
-            this.lbstatus2.Size = new System.Drawing.Size(137, 23);
-            this.lbstatus2.TabIndex = 2;
-            this.lbstatus2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // ground
-            // 
-            this.ground.Location = new System.Drawing.Point(87, 262);
-            this.ground.Name = "ground";
-            this.ground.Size = new System.Drawing.Size(200, 35);
-            this.ground.TabIndex = 1;
-            // 
-            // tmrscreenupdate
-            // 
-            this.tmrscreenupdate.Interval = 500;
-            this.tmrscreenupdate.Tick += new System.EventHandler(this.tmrscreenupdate_Tick);
-            // 
-            // player
-            // 
-            this.player.Image = global::ShiftOS.Properties.Resources.jumperplayer;
-            this.player.Location = new System.Drawing.Point(219, 96);
-            this.player.Name = "player";
-            this.player.Size = new System.Drawing.Size(32, 32);
-            this.player.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.player.TabIndex = 2;
-            this.player.TabStop = false;
-            // 
-            // Jumper
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 438);
-            this.Controls.Add(this.player);
-            this.Controls.Add(this.ground);
-            this.Controls.Add(this.pnlstatus);
-            this.Name = "Jumper";
-            this.Text = "Jumper";
-            this.pnlstatus.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.player)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.FlowLayoutPanel pnlstatus;
-        private System.Windows.Forms.Button btnplay;
-        private System.Windows.Forms.Label lbstatus;
-        private System.Windows.Forms.Panel ground;
-        private System.Windows.Forms.Timer tmrscreenupdate;
-        private System.Windows.Forms.PictureBox player;
-        private System.Windows.Forms.Label lbstatus2;
-    }
-}
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Jumper.cs b/source/WindowsFormsApplication1/Jumper.cs
deleted file mode 100644
index 766c929..0000000
--- a/source/WindowsFormsApplication1/Jumper.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ShiftOS
-{
-    public partial class Jumper : Form
-    {
-        public Jumper()
-        {
-            InitializeComponent();
-        }
-
-        enum GameStatus
-        {
-            Idle,
-            GameOver,
-            Playing
-        }
-
-        private GameStatus status = GameStatus.Idle;
-        private int JumpingStage = 0; //not jumping
-
-        int gamespeed = 1;
-        int codepointsearned = 0;
-
-        Random rand = new Random();
-
-        private void tmrscreenupdate_Tick(object sender, EventArgs e)
-        {
-            ground.Location = new Point(0, 260);
-            ground.Size = new Size(this.ClientRectangle.Width, 2);
-            ground.BackColor = Color.Black;
-            switch(JumpingStage)
-            {
-                case 0:
-                    player.Location = new Point(100, 228);
-                    break;
-                case 1:
-                    if(player.Location.Y != 200)
-                    {
-                        player.Location = new Point(player.Location.X, player.Location.Y - 5);
-                    } else
-                    {
-                        JumpingStage = 2;
-                    }
-                    break;
-                case 2:
-                    if (player.Location.Y != 228)
-                    {
-                        player.Location = new Point(player.Location.X, player.Location.Y + 5);
-                    }
-                    else
-                    {
-                        JumpingStage = 0;
-                        lbstatus.Text = "Landed";
-                    }
-                    break;
-                    
-            }
-            int randres = rand.Next(0, 9);
-            switch(randres)
-            {
-                case 5:
-                    Panel enemy = new Panel();
-                    this.Controls.Add(enemy);
-                    enemy.Location = new Point(this.ClientRectangle.Width, 227);
-                    enemy.BackColor = Color.Black;
-                    enemy.Size = new Size(32, 27);
-                    enemy.Tag = "enemy";
-                    enemy.Show();
-                    break;
-            }
-
-            foreach (Control ctrl in this.Controls)
-            {
-                string enemytag = "enemy";
-                if (enemytag == (string)ctrl.Tag)
-                {
-                    if (ctrl.Location.X < 0 - ctrl.Width)
-                    {
-                        ctrl.Hide();
-                    }
-                    else
-                    {
-                        ctrl.Location = new Point(ctrl.Location.X - (2 * gamespeed), ctrl.Location.Y);
-                    }
-                    if (ctrl.Left >= player.Left && ctrl.Left <= player.Right)
-                    {
-                        if(ctrl.Top >= player.Top && ctrl.Bottom <= player.Bottom)
-                        {
-                            status = GameStatus.GameOver;
-                        }
-                    }
-                }
-            }
-
-            switch(status)
-            {
-                case GameStatus.Playing:
-                    codepointsearned += gamespeed;
-                    btnplay.Hide();
-                    lbstatus.Text = "Codepoints: " + codepointsearned.ToString();
-                    break;
-                case GameStatus.GameOver:
-                    tmrscreenupdate.Stop();
-                    API.CreateInfoboxSession("You hit an obstacle.", "You have run into an obstacle. You have earned " + codepointsearned.ToString() + " Codepoints.", infobox.InfoboxMode.Info);
-                    API.AddCodepoints(codepointsearned);
-                    codepointsearned = 0;
-                    if(API.Upgrades["multitasking"] == true)
-                    {
-                        this.Close(); //Close if multitasking is true.
-                    }
-                    break;
-            }
-        }
-
-        private void btnplay_Click(object sender, EventArgs e)
-        {
-            if(this.status == GameStatus.Idle)
-            {
-                this.status = GameStatus.Playing;
-                this.Focus();
-                this.KeyDown += (object s, KeyEventArgs a) =>
-                {
-                    if (a.KeyCode == Keys.Space)
-                    {
-                        if (JumpingStage == 0)
-                        {
-                            JumpingStage = 1;
-                            lbstatus2.Text = "Jumping...";
-                        }
-                        a.SuppressKeyPress = true;
-                    }
-                };
-                tmrscreenupdate.Start();
-            }
-        }
-    }
-}
diff --git a/source/WindowsFormsApplication1/Jumper.resx b/source/WindowsFormsApplication1/Jumper.resx
deleted file mode 100644
index f724b8c..0000000
--- a/source/WindowsFormsApplication1/Jumper.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="tmrscreenupdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/ListViewEx.Designer.cs b/source/WindowsFormsApplication1/ListViewEx.Designer.cs
deleted file mode 100644
index 1596c8f..0000000
--- a/source/WindowsFormsApplication1/ListViewEx.Designer.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-namespace ShiftOS
-{
-    partial class ListViewEx
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.tblist = new System.Windows.Forms.TableLayoutPanel();
-            this.SuspendLayout();
-            // 
-            // tblist
-            // 
-            this.tblist.AutoSize = true;
-            this.tblist.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tblist.ColumnCount = 2;
-            this.tblist.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tblist.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tblist.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tblist.Location = new System.Drawing.Point(0, 0);
-            this.tblist.Name = "tblist";
-            this.tblist.RowCount = 2;
-            this.tblist.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tblist.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tblist.Size = new System.Drawing.Size(521, 343);
-            this.tblist.TabIndex = 0;
-            // 
-            // ListViewEx
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.tblist);
-            this.Name = "ListViewEx";
-            this.Size = new System.Drawing.Size(521, 343);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TableLayoutPanel tblist;
-    }
-}
diff --git a/source/WindowsFormsApplication1/ListViewEx.cs b/source/WindowsFormsApplication1/ListViewEx.cs
deleted file mode 100644
index 075c3df..0000000
--- a/source/WindowsFormsApplication1/ListViewEx.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ShiftOS
-{
-    public partial class ListViewEx : UserControl
-    {
-        private List<Item> items = null;
-        private List<Column> columns = null;
-
-        public ListViewEx()
-        {
-            InitializeComponent();
-            items = new List<Item>();
-            columns = new List<Column>();
-        }
-
-        private Color _item_color = Color.Gray;
-
-        public Color ItemSelectedColor
-        {
-            get { return _item_color; }
-            set
-            {
-                _item_color = value;
-            }
-        }
-
-        private void setup_ui()
-        {
-            
-        }
-    }
-
-    public class Item
-    {
-        public Item(string text)
-        {
-            Text = text;
-            SubItems = new List<Item>();
-        }
-
-        public string Text { get; set; }
-        public List<Item> SubItems { get; set; }
-        public object Tag { get; set; }
-    }
-
-    public class Column
-    {
-        public Column(string text)
-        {
-            Text = text;
-        }
-
-        public string Text { get; set; }
-    }
-
-}
diff --git a/source/WindowsFormsApplication1/ListViewEx.resx b/source/WindowsFormsApplication1/ListViewEx.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/source/WindowsFormsApplication1/ListViewEx.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/ConnectionManager.Designer.cs b/source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ConnectionManager.Designer.cs
rename to source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs
diff --git a/source/WindowsFormsApplication1/ConnectionManager.cs b/source/WindowsFormsApplication1/Online/ConnectionManager.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ConnectionManager.cs
rename to source/WindowsFormsApplication1/Online/ConnectionManager.cs
diff --git a/source/WindowsFormsApplication1/ConnectionManager.resx b/source/WindowsFormsApplication1/Online/ConnectionManager.resx
similarity index 100%
rename from source/WindowsFormsApplication1/ConnectionManager.resx
rename to source/WindowsFormsApplication1/Online/ConnectionManager.resx
diff --git a/source/WindowsFormsApplication1/Package_Grabber.cs b/source/WindowsFormsApplication1/Online/Package_Grabber.cs
similarity index 100%
rename from source/WindowsFormsApplication1/Package_Grabber.cs
rename to source/WindowsFormsApplication1/Online/Package_Grabber.cs
diff --git a/source/WindowsFormsApplication1/QuickChat.Designer.cs b/source/WindowsFormsApplication1/QuickChat.Designer.cs
deleted file mode 100644
index 9399496..0000000
--- a/source/WindowsFormsApplication1/QuickChat.Designer.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-namespace ShiftOS
-{
-    partial class QuickChat
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlsetnick = new System.Windows.Forms.Panel();
-            this.label2 = new System.Windows.Forms.Label();
-            this.btnconnect = new System.Windows.Forms.Button();
-            this.txtsetnick = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.txtmessages = new System.Windows.Forms.RichTextBox();
-            this.pnlcontrols = new System.Windows.Forms.Panel();
-            this.txtmessage = new System.Windows.Forms.TextBox();
-            this.btnsend = new System.Windows.Forms.Button();
-            this.lbnick = new System.Windows.Forms.Label();
-            this.tmrimfuckinglucky = new System.Windows.Forms.Timer(this.components);
-            this.panel1.SuspendLayout();
-            this.pnlsetnick.SuspendLayout();
-            this.pnlcontrols.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.pnlsetnick);
-            this.panel1.Controls.Add(this.txtmessages);
-            this.panel1.Controls.Add(this.pnlcontrols);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(701, 414);
-            this.panel1.TabIndex = 0;
-            // 
-            // pnlsetnick
-            // 
-            this.pnlsetnick.Controls.Add(this.label2);
-            this.pnlsetnick.Controls.Add(this.btnconnect);
-            this.pnlsetnick.Controls.Add(this.txtsetnick);
-            this.pnlsetnick.Controls.Add(this.label1);
-            this.pnlsetnick.Location = new System.Drawing.Point(198, 88);
-            this.pnlsetnick.Name = "pnlsetnick";
-            this.pnlsetnick.Size = new System.Drawing.Size(289, 184);
-            this.pnlsetnick.TabIndex = 2;
-            this.pnlsetnick.Visible = false;
-            // 
-            // label2
-            // 
-            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.25F);
-            this.label2.Location = new System.Drawing.Point(4, 38);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(282, 80);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "QuickChat is the finest chat application for ShiftOS! All you have to do is enter" +
-    " your nickname in the field below and hit \"Connect!\"";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // btnconnect
-            // 
-            this.btnconnect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnconnect.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnconnect.Font = new System.Drawing.Font("Times New Roman", 10F);
-            this.btnconnect.Location = new System.Drawing.Point(196, 152);
-            this.btnconnect.Name = "btnconnect";
-            this.btnconnect.Size = new System.Drawing.Size(90, 29);
-            this.btnconnect.TabIndex = 2;
-            this.btnconnect.Text = "Connect!";
-            this.btnconnect.UseVisualStyleBackColor = true;
-            this.btnconnect.Click += new System.EventHandler(this.btnconnect_Click);
-            // 
-            // txtsetnick
-            // 
-            this.txtsetnick.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtsetnick.BackColor = System.Drawing.Color.Gray;
-            this.txtsetnick.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtsetnick.ForeColor = System.Drawing.Color.White;
-            this.txtsetnick.Location = new System.Drawing.Point(24, 121);
-            this.txtsetnick.Name = "txtsetnick";
-            this.txtsetnick.Size = new System.Drawing.Size(239, 13);
-            this.txtsetnick.TabIndex = 1;
-            this.txtsetnick.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtsetnick_KeyDown);
-            // 
-            // label1
-            // 
-            this.label1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
-            this.label1.Location = new System.Drawing.Point(0, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(289, 34);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Welcome to QuickChat!";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // txtmessages
-            // 
-            this.txtmessages.BackColor = System.Drawing.Color.White;
-            this.txtmessages.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtmessages.DetectUrls = false;
-            this.txtmessages.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.txtmessages.Font = new System.Drawing.Font("Lucida Console", 8.25F);
-            this.txtmessages.ForeColor = System.Drawing.Color.Black;
-            this.txtmessages.Location = new System.Drawing.Point(0, 0);
-            this.txtmessages.Name = "txtmessages";
-            this.txtmessages.ReadOnly = true;
-            this.txtmessages.Size = new System.Drawing.Size(701, 380);
-            this.txtmessages.TabIndex = 1;
-            this.txtmessages.Text = "";
-            this.txtmessages.TextChanged += new System.EventHandler(this.txtmessages_TextChanged);
-            // 
-            // pnlcontrols
-            // 
-            this.pnlcontrols.BackColor = System.Drawing.Color.Gray;
-            this.pnlcontrols.Controls.Add(this.txtmessage);
-            this.pnlcontrols.Controls.Add(this.btnsend);
-            this.pnlcontrols.Controls.Add(this.lbnick);
-            this.pnlcontrols.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pnlcontrols.ForeColor = System.Drawing.Color.White;
-            this.pnlcontrols.Location = new System.Drawing.Point(0, 380);
-            this.pnlcontrols.Name = "pnlcontrols";
-            this.pnlcontrols.Size = new System.Drawing.Size(701, 34);
-            this.pnlcontrols.TabIndex = 0;
-            // 
-            // txtmessage
-            // 
-            this.txtmessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtmessage.BackColor = System.Drawing.Color.White;
-            this.txtmessage.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtmessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
-            this.txtmessage.ForeColor = System.Drawing.Color.Black;
-            this.txtmessage.Location = new System.Drawing.Point(70, 6);
-            this.txtmessage.Name = "txtmessage";
-            this.txtmessage.Size = new System.Drawing.Size(547, 19);
-            this.txtmessage.TabIndex = 2;
-            // 
-            // btnsend
-            // 
-            this.btnsend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnsend.Enabled = false;
-            this.btnsend.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnsend.Location = new System.Drawing.Point(623, 3);
-            this.btnsend.Name = "btnsend";
-            this.btnsend.Size = new System.Drawing.Size(75, 28);
-            this.btnsend.TabIndex = 1;
-            this.btnsend.Text = "Send";
-            this.btnsend.UseVisualStyleBackColor = true;
-            this.btnsend.Click += new System.EventHandler(this.btnsend_Click);
-            // 
-            // lbnick
-            // 
-            this.lbnick.Dock = System.Windows.Forms.DockStyle.Left;
-            this.lbnick.Location = new System.Drawing.Point(0, 0);
-            this.lbnick.Name = "lbnick";
-            this.lbnick.Size = new System.Drawing.Size(100, 34);
-            this.lbnick.TabIndex = 0;
-            this.lbnick.Text = "Nickname";
-            this.lbnick.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // tmrimfuckinglucky
-            // 
-            this.tmrimfuckinglucky.Enabled = true;
-            this.tmrimfuckinglucky.Tick += new System.EventHandler(this.tmrimfuckinglucky_Tick);
-            // 
-            // QuickChat
-            // 
-            this.AcceptButton = this.btnsend;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(701, 414);
-            this.Controls.Add(this.panel1);
-            this.Name = "QuickChat";
-            this.Text = "QuickChat";
-            this.Load += new System.EventHandler(this.QuickChat_Load);
-            this.panel1.ResumeLayout(false);
-            this.pnlsetnick.ResumeLayout(false);
-            this.pnlsetnick.PerformLayout();
-            this.pnlcontrols.ResumeLayout(false);
-            this.pnlcontrols.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.RichTextBox txtmessages;
-        private System.Windows.Forms.Panel pnlcontrols;
-        private System.Windows.Forms.Timer tmrimfuckinglucky;
-        private System.Windows.Forms.Label lbnick;
-        private System.Windows.Forms.TextBox txtmessage;
-        private System.Windows.Forms.Button btnsend;
-        private System.Windows.Forms.Panel pnlsetnick;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Button btnconnect;
-        private System.Windows.Forms.TextBox txtsetnick;
-        private System.Windows.Forms.Label label1;
-    }
-}
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/QuickChat.cs b/source/WindowsFormsApplication1/QuickChat.cs
deleted file mode 100644
index 9cac42e..0000000
--- a/source/WindowsFormsApplication1/QuickChat.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using IrcDotNet;
-
-namespace ShiftOS
-{
-    public partial class QuickChat : Form
-    {
-        public QuickChat()
-        {
-            InitializeComponent();
-        }
-
-        ShiftOSIrcClient ConnectedClient = null;
-        
-        private void QuickChat_Load(object sender, EventArgs e)
-        {
-            pnlsetnick.Show();
-            pnlcontrols.Hide();
-        }
-
-        
-        private void txtmessages_TextChanged(object sender, EventArgs e)
-        {
-        }
-
-        //I'm fucking lucky I was able to get this working first try.
-        private void tmrimfuckinglucky_Tick(object sender, EventArgs e)
-        {
-            try {
-                if (ConnectedClient.CanReceiveMessages == true)
-                {
-                    if (ConnectedClient.Messages.Count > 20)
-                    {
-                        ConnectedClient.Messages.Remove(ConnectedClient.Messages[20]);
-                    }
-                    txtmessages.Lines = ConnectedClient.Messages.ToArray();
-                    lbnick.Text = ConnectedClient.LocalUser.NickName;
-                    btnsend.Enabled = true;
-                }
-                if(ConnectedClient.ErrorMessages.Count > 0)
-                {
-                    API.CreateInfoboxSession("QuickChat error", ConnectedClient.ErrorMessages[0], infobox.InfoboxMode.Info);
-                    ConnectedClient.Dispose();
-                    this.Close();
-                }
-            }
-            catch
-            {
-
-            }
-        }
-
-        private void btnsend_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                if (ConnectedClient.CanReceiveMessages == true)
-                {
-                    if (txtmessage.Text.Length > 0)
-                    {
-                        ConnectedClient.Messages.Add($"<{ConnectedClient.LocalUser.NickName}> {txtmessage.Text}");
-                        ConnectedClient.SendMessage($"{txtmessage.Text}");
-                        txtmessage.Text = "";
-                    }
-                }
-            }
-            catch
-            {
-
-            }
-        }
-
-        private void btnconnect_Click(object sender, EventArgs e)
-        {
-            var res = txtsetnick.Text;
-            if (res != "")
-            {
-                ConnectedClient = new ShiftOSIrcClient(res);
-                pnlsetnick.Hide();
-                pnlcontrols.Show();
-            }
-            else
-            {
-                API.CreateInfoboxSession("QuickChat - Nickname not valid.", "That nickname is not valid. Your name will be automatically generated.", infobox.InfoboxMode.Info);
-                ConnectedClient = new ShiftOSIrcClient();
-                pnlsetnick.Hide();
-                pnlcontrols.Show();
-            }
-        }
-
-        private void txtsetnick_KeyDown(object sender, KeyEventArgs e)
-        {
-            if(e.KeyCode == Keys.Enter)
-            {
-                btnconnect_Click(sender, (EventArgs)e);
-            }
-        }
-    }
-
-    public class ShiftOSIrcClient : IrcClient
-    {
-        public ShiftOSIrcClient()
-        {
-            var rnd = new Random();
-            var nick_id = rnd.Next(10000, 99999);
-            this.Connected += (object sender, EventArgs a) =>
-            {
-                this.MotdReceived += new EventHandler<System.EventArgs>(this.motd_received); 
-            };
-            this.ConnectFailed += (object s, IrcErrorEventArgs a) =>
-            {
-                ErrorMessages.Add("Could not connect to the QuickChat chatroom. " + a.Error.Message);
-            };
-            this.RawMessageReceived += (object s, IrcRawMessageEventArgs a) =>
-            {
-
-            };
-            this.Connect("irc.playshiftos.ml", 6667, false, new IrcUserRegistrationInfo { NickName = $"shifter_{nick_id}", RealName = $"QuickChat: {API.CurrentSave.username}", UserName = $"shifter_{nick_id}" });
-
-        }
-        private List<string> errmsg = new List<string>();
-
-        public List<string> ErrorMessages
-        {
-            get
-            {
-                return errmsg;
-            }
-        }
-        private bool running = false;
-
-        public bool CanReceiveMessages
-        {
-            get
-            {
-                return running;
-            }
-        }
-
-        private List<string> msgs = new List<string>();
-
-        public void SendMessage(string msg)
-        {
-            if(running == true)
-            {
-                SendRawMessage($"PRIVMSG #shiftos :{msg}");
-            }
-        }
-
-        public List<string> Messages
-        {
-            get
-            {
-                return msgs;
-            }
-        }
-
-        public void motd_received(object sender, EventArgs a)
-        {
-            LocalUser.JoinedChannel += (object s, IrcChannelEventArgs e) =>
-            {
-                running = true;
-                msgs.Add("<QuickChat> Welcome to QuickChat!");
-                e.Channel.MessageReceived += (object se, IrcMessageEventArgs ea) =>
-                {
-                    if (!msgs.Contains($"<{ea.Source.Name}> {ea.GetText()}"))
-                    {
-                        msgs.Add($"<{ea.Source.Name}> {ea.GetText()}");
-                    }
-                };
-            };
-            Channels.Join("#shiftos");
-        }
-
-        public ShiftOSIrcClient(string nick)
-        {
-            this.Connected += (object sender, EventArgs a) =>
-            {
-                this.MotdReceived += new EventHandler<System.EventArgs>(this.motd_received);
-            };
-            this.ConnectFailed += (object s, IrcErrorEventArgs a) =>
-            {
-                ErrorMessages.Add("Could not connect to the QuickChat chatroom. " + a.Error.Message);
-            };
-            this.RawMessageReceived += (object s, IrcRawMessageEventArgs a) =>
-            {
-                if(a.RawContent.Contains("already in use"))
-                {
-                    ErrorMessages.Add("That nickname is already in use! Please restart QuickChat and try again.");
-                }
-            };
-            this.Connect("irc.playshiftos.ml", 6667, false, new IrcUserRegistrationInfo { NickName = nick, RealName = $"QuickChat: {nick}", UserName = nick });
-
-        }
-    }
-}
diff --git a/source/WindowsFormsApplication1/QuickChat.resx b/source/WindowsFormsApplication1/QuickChat.resx
deleted file mode 100644
index d17d41c..0000000
--- a/source/WindowsFormsApplication1/QuickChat.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="tmrimfuckinglucky.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/RemoteCoherence.cs b/source/WindowsFormsApplication1/RemoteCoherence.cs
deleted file mode 100644
index bdad885..0000000
--- a/source/WindowsFormsApplication1/RemoteCoherence.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ShiftOS
-{
-    class RemoteCoherence
-    {
-    }
-}
diff --git a/source/WindowsFormsApplication1/ShiftOS.csproj b/source/WindowsFormsApplication1/ShiftOS.csproj
index 7572db9..3380ad8 100644
--- a/source/WindowsFormsApplication1/ShiftOS.csproj
+++ b/source/WindowsFormsApplication1/ShiftOS.csproj
@@ -626,8 +626,6 @@
     <None Include="Resources\MusicData.txt" />
     <None Include="bin\Debug\Newtonsoft.Json.dll" />
     <None Include="bin\Debug\NetSockets.dll" />
-    <Content Include="Labyrinth.designer.vb" />
-    <Content Include="Labyrinth.vb" />
     <Compile Include="Paths.cs" />
     <None Include="Resources\3beepvirus.wav" />
     <None Include="Resources\anycolourshade.png" />
diff --git a/source/WindowsFormsApplication1/ShiftOSColorTable.cs b/source/WindowsFormsApplication1/SkinEngine/ShiftOSColorTable.cs
similarity index 100%
rename from source/WindowsFormsApplication1/ShiftOSColorTable.cs
rename to source/WindowsFormsApplication1/SkinEngine/ShiftOSColorTable.cs
diff --git a/source/WindowsFormsApplication1/WindowComposition.cs b/source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
similarity index 100%
rename from source/WindowsFormsApplication1/WindowComposition.cs
rename to source/WindowsFormsApplication1/SkinEngine/WindowComposition.cs
diff --git a/source/WindowsFormsApplication1/skins.cs b/source/WindowsFormsApplication1/SkinEngine/skins.cs
similarity index 100%
rename from source/WindowsFormsApplication1/skins.cs
rename to source/WindowsFormsApplication1/SkinEngine/skins.cs
diff --git a/source/WindowsFormsApplication1/SpeechListener.cs b/source/WindowsFormsApplication1/SpeechListener.cs
deleted file mode 100644
index b871fd4..0000000
--- a/source/WindowsFormsApplication1/SpeechListener.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Speech.Recognition;
-
-namespace ShiftOS
-{
-    public class SpeechListener
-    {
-        private SpeechRecognitionEngine _recognizer = null;
-        public SpeechRecognitionEngine Engine
-        {
-            get
-            {
-                return _recognizer;
-            }
-        }
-
-        public SpeechListener()
-        {
-            _recognizer = new SpeechRecognitionEngine();
-            var g = new DictationGrammar();
-            _recognizer.LoadGrammar(g);
-            _recognizer.SetInputToDefaultAudioDevice();
-            _recognizer.SpeechRecognized += (object s, SpeechRecognizedEventArgs a) =>
-            {
-                try {
-                    var h = OnRecognize;
-                    if (h != null)
-                    {
-                        h(a.Result.Text, new EventArgs());
-                    }
-                }
-                catch
-                {
-
-                }
-            };
-            _recognizer.AudioStateChanged += (object s, AudioStateChangedEventArgs a) =>
-            {
-                if(a.AudioState == AudioState.Stopped)
-                {
-                    _recognizer.RecognizeAsync();
-                }
-            };
-            
-        }
-
-        public event EventHandler OnRecognize;
-    }
-}
diff --git a/source/WindowsFormsApplication1/Template.Designer.cs b/source/WindowsFormsApplication1/Template.Designer.cs
deleted file mode 100644
index 1cb48cf..0000000
--- a/source/WindowsFormsApplication1/Template.Designer.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using System;
-
-namespace ShiftOS
-{
-    partial class Template
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.Load += new EventHandler(this.Template_Load);
-            this.pgleft = new System.Windows.Forms.Panel();
-            this.pgbottomlcorner = new System.Windows.Forms.Panel();
-            this.pgright = new System.Windows.Forms.Panel();
-            this.pgbottomrcorner = new System.Windows.Forms.Panel();
-            this.titlebar = new System.Windows.Forms.Panel();
-            this.minimizebutton = new System.Windows.Forms.Panel();
-            this.pnlicon = new System.Windows.Forms.PictureBox();
-            this.rollupbutton = new System.Windows.Forms.Panel();
-            this.closebutton = new System.Windows.Forms.Panel();
-            this.lbtitletext = new System.Windows.Forms.Label();
-            this.pgtoplcorner = new System.Windows.Forms.Panel();
-            this.pgtoprcorner = new System.Windows.Forms.Panel();
-            this.pgbottom = new System.Windows.Forms.Panel();
-            this.pgcontents = new System.Windows.Forms.Panel();
-            this.pullbs = new System.Windows.Forms.Timer(this.components);
-            this.pullbottom = new System.Windows.Forms.Timer(this.components);
-            this.pullside = new System.Windows.Forms.Timer(this.components);
-            this.pgleft.SuspendLayout();
-            this.pgright.SuspendLayout();
-            this.titlebar.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pnlicon)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // pgleft
-            // 
-            this.pgleft.BackColor = System.Drawing.Color.Gray;
-            this.pgleft.Controls.Add(this.pgbottomlcorner);
-            this.pgleft.Dock = System.Windows.Forms.DockStyle.Left;
-            this.pgleft.Location = new System.Drawing.Point(0, 30);
-            this.pgleft.Name = "pgleft";
-            this.pgleft.Size = new System.Drawing.Size(2, 345);
-            this.pgleft.TabIndex = 16;
-            // 
-            // pgbottomlcorner
-            // 
-            this.pgbottomlcorner.BackColor = System.Drawing.Color.Red;
-            this.pgbottomlcorner.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pgbottomlcorner.Location = new System.Drawing.Point(0, 343);
-            this.pgbottomlcorner.Name = "pgbottomlcorner";
-            this.pgbottomlcorner.Size = new System.Drawing.Size(2, 2);
-            this.pgbottomlcorner.TabIndex = 14;
-            // 
-            // pgright
-            // 
-            this.pgright.BackColor = System.Drawing.Color.Gray;
-            this.pgright.Controls.Add(this.pgbottomrcorner);
-            this.pgright.Dock = System.Windows.Forms.DockStyle.Right;
-            this.pgright.Location = new System.Drawing.Point(545, 30);
-            this.pgright.Name = "pgright";
-            this.pgright.Size = new System.Drawing.Size(2, 345);
-            this.pgright.TabIndex = 17;
-            // 
-            // pgbottomrcorner
-            // 
-            this.pgbottomrcorner.BackColor = System.Drawing.Color.Red;
-            this.pgbottomrcorner.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pgbottomrcorner.Location = new System.Drawing.Point(0, 343);
-            this.pgbottomrcorner.Name = "pgbottomrcorner";
-            this.pgbottomrcorner.Size = new System.Drawing.Size(2, 2);
-            this.pgbottomrcorner.TabIndex = 15;
-            // 
-            // titlebar
-            // 
-            this.titlebar.BackColor = System.Drawing.Color.Gray;
-            this.titlebar.Controls.Add(this.minimizebutton);
-            this.titlebar.Controls.Add(this.pnlicon);
-            this.titlebar.Controls.Add(this.rollupbutton);
-            this.titlebar.Controls.Add(this.closebutton);
-            this.titlebar.Controls.Add(this.lbtitletext);
-            this.titlebar.Controls.Add(this.pgtoplcorner);
-            this.titlebar.Controls.Add(this.pgtoprcorner);
-            this.titlebar.Dock = System.Windows.Forms.DockStyle.Top;
-            this.titlebar.ForeColor = System.Drawing.Color.White;
-            this.titlebar.Location = new System.Drawing.Point(0, 0);
-            this.titlebar.Name = "titlebar";
-            this.titlebar.Size = new System.Drawing.Size(547, 30);
-            this.titlebar.TabIndex = 14;
-            // 
-            // minimizebutton
-            // 
-            this.minimizebutton.BackColor = System.Drawing.Color.Black;
-            this.minimizebutton.Location = new System.Drawing.Point(246, 5);
-            this.minimizebutton.Name = "minimizebutton";
-            this.minimizebutton.Size = new System.Drawing.Size(22, 22);
-            this.minimizebutton.Click += new EventHandler(this.minimizebutton_Click);
-            this.minimizebutton.TabIndex = 24;
-            // 
-            // pnlicon
-            // 
-            this.pnlicon.BackColor = System.Drawing.Color.Transparent;
-            this.pnlicon.Location = new System.Drawing.Point(8, 8);
-            this.pnlicon.Name = "pnlicon";
-            this.pnlicon.Size = new System.Drawing.Size(16, 16);
-            this.pnlicon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.pnlicon.TabIndex = 24;
-            this.pnlicon.TabStop = false;
-            this.pnlicon.Visible = false;
-            // 
-            // rollupbutton
-            // 
-            this.rollupbutton.BackColor = System.Drawing.Color.Black;
-            this.rollupbutton.Location = new System.Drawing.Point(274, 3);
-            this.rollupbutton.Name = "rollupbutton";
-            this.rollupbutton.Click += new EventHandler(this.rollupbutton_Click);
-            this.rollupbutton.Size = new System.Drawing.Size(22, 22);
-            this.rollupbutton.TabIndex = 22;
-            // 
-            // closebutton
-            // 
-            this.closebutton.BackColor = System.Drawing.Color.Black;
-            this.closebutton.Location = new System.Drawing.Point(302, 3);
-            this.closebutton.Name = "closebutton";
-            this.closebutton.Click += new EventHandler(this.closebutton_Click);
-            this.closebutton.Size = new System.Drawing.Size(22, 22);
-            this.closebutton.TabIndex = 20;
-            // 
-            // lbtitletext
-            // 
-            this.lbtitletext.AutoSize = true;
-            this.lbtitletext.BackColor = System.Drawing.Color.Transparent;
-            this.lbtitletext.Font = new System.Drawing.Font("Felix Titling", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbtitletext.Location = new System.Drawing.Point(26, 7);
-            this.lbtitletext.Name = "lbtitletext";
-            this.lbtitletext.Size = new System.Drawing.Size(89, 18);
-            this.lbtitletext.TabIndex = 19;
-            this.lbtitletext.Text = "Template";
-            // 
-            // pgtoplcorner
-            // 
-            this.pgtoplcorner.BackColor = System.Drawing.Color.Red;
-            this.pgtoplcorner.Dock = System.Windows.Forms.DockStyle.Left;
-            this.pgtoplcorner.Location = new System.Drawing.Point(0, 0);
-            this.pgtoplcorner.Name = "pgtoplcorner";
-            this.pgtoplcorner.Size = new System.Drawing.Size(2, 30);
-            this.pgtoplcorner.TabIndex = 17;
-            // 
-            // pgtoprcorner
-            // 
-            this.pgtoprcorner.BackColor = System.Drawing.Color.Red;
-            this.pgtoprcorner.Dock = System.Windows.Forms.DockStyle.Right;
-            this.pgtoprcorner.Location = new System.Drawing.Point(545, 0);
-            this.pgtoprcorner.Name = "pgtoprcorner";
-            this.pgtoprcorner.Size = new System.Drawing.Size(2, 30);
-            this.pgtoprcorner.TabIndex = 16;
-            // 
-            // pgbottom
-            // 
-            this.pgbottom.BackColor = System.Drawing.Color.Gray;
-            this.pgbottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pgbottom.Location = new System.Drawing.Point(2, 373);
-            this.pgbottom.Name = "pgbottom";
-            this.pgbottom.Size = new System.Drawing.Size(543, 2);
-            this.pgbottom.TabIndex = 18;
-            // 
-            // pgcontents
-            // 
-            this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pgcontents.Location = new System.Drawing.Point(2, 30);
-            this.pgcontents.Name = "pgcontents";
-            this.pgcontents.Size = new System.Drawing.Size(543, 343);
-            this.pgcontents.TabIndex = 15;
-            // 
-            // pullbs
-            // 
-            this.pullbs.Interval = 1;
-            // 
-            // pullbottom
-            // 
-            this.pullbottom.Interval = 1;
-            // 
-            // pullside
-            // 
-            this.pullside.Interval = 1;
-            // 
-            // Template
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(547, 375);
-            this.Controls.Add(this.pgcontents);
-            this.Controls.Add(this.pgbottom);
-            this.Controls.Add(this.pgright);
-            this.Controls.Add(this.pgleft);
-            this.Controls.Add(this.titlebar);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "Template";
-            this.Text = "template";
-            this.TopMost = true;
-            this.pgleft.ResumeLayout(false);
-            this.pgright.ResumeLayout(false);
-            this.titlebar.ResumeLayout(false);
-            this.titlebar.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pnlicon)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-        internal System.Windows.Forms.Panel pgleft;
-        internal System.Windows.Forms.Panel pgbottomlcorner;
-        internal System.Windows.Forms.Panel pgright;
-        internal System.Windows.Forms.Panel pgbottomrcorner;
-        internal System.Windows.Forms.Panel titlebar;
-        internal System.Windows.Forms.Panel pgtoplcorner;
-        internal System.Windows.Forms.Panel pgtoprcorner;
-        internal System.Windows.Forms.Panel pgbottom;
-        internal System.Windows.Forms.Panel pgcontents;
-        internal System.Windows.Forms.Label lbtitletext;
-        internal System.Windows.Forms.Panel closebutton;
-        internal System.Windows.Forms.Panel rollupbutton;
-        internal System.Windows.Forms.PictureBox pnlicon;
-        internal System.Windows.Forms.Panel minimizebutton;
-        internal System.Windows.Forms.Timer pullbs;
-        internal System.Windows.Forms.Timer pullbottom;
-        internal System.Windows.Forms.Timer pullside;
-    }
-}
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Template.cs b/source/WindowsFormsApplication1/Template.cs
deleted file mode 100644
index 5d0ddd1..0000000
--- a/source/WindowsFormsApplication1/Template.cs
+++ /dev/null
@@ -1,589 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ShiftOS
-{
-    public partial class Template : Form
-    {
-        public List<Control> NewControls = new List<Control>();
-        public Form ManagedForm = null;
-        public Template(string aname, Image aicon, Form frmToTake)
-        {
-            AppName = aname;
-            AppIcon = aicon;
-            foreach(Control ctrl in frmToTake.Controls)
-            {
-                NewControls.Add(ctrl);
-                ctrl.Show();
-            }
-            ManagedForm = frmToTake;
-            InitializeComponent();
-        }
-
-        public Image AppIcon { get; set; }
-        public string AppName { get; set; }
-
-        #region "Template Code"
-        public int rolldownsize;
-        public int oldbordersize;
-        public int oldtitlebarheight;
-        public bool justopened = false;
-        public bool needtorollback = false;
-        //replace with minimum size
-        public int minimumsizewidth = 0;
-        //replace with minimum size
-        public int minimumsizeheight = 0;
-
-        // ERROR: Handles clauses are not supported in C#
-        private void Template_Load(object sender, EventArgs e)
-        {
-            justopened = true;
-            this.Left = (Screen.PrimaryScreen.Bounds.Width - this.Width) / 2;
-            this.Top = (Screen.PrimaryScreen.Bounds.Height - this.Height) / 2;
-            setupall();
-            foreach(Control ctrl in NewControls)
-            {
-                this.pgcontents.Controls.Add(ctrl);
-            }
-            
-            //CHANGE NAME
-            //modify to proper name
-        }
-
-        public void setupall()
-        {
-            setuptitlebar();
-            setupborders();
-            setskin();
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void ShiftOSDesktop_keydown(object sender, System.Windows.Forms.KeyEventArgs e)
-        {
-            //Make terminal appear
-            if (e.KeyCode == Keys.T && e.Control)
-            {
-                API.CreateForm(new Terminal(), API.CurrentSave.TerminalName, Properties.Resources.iconTerminal);
-            }
-
-            //Movable Windows
-            if (API.Upgrades["movablewindows"] == true)
-            {
-                if (e.KeyCode == Keys.A && e.Control)
-                {
-                    e.Handled = true;
-                    this.Location = new Point(this.Location.X - 30, this.Location.Y);
-                }
-                if (e.KeyCode == Keys.D && e.Control)
-                {
-                    e.Handled = true;
-                    this.Location = new Point(this.Location.X + 30, this.Location.Y);
-                }
-                if (e.KeyCode == Keys.W && e.Control)
-                {
-                    e.Handled = true;
-                    this.Location = new Point(this.Location.X, this.Location.Y - 30);
-                }
-                if (e.KeyCode == Keys.S && e.Control)
-                {
-                    e.Handled = true;
-                    this.Location = new Point(this.Location.X, this.Location.Y + 30);
-                }
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void titlebar_MouseDown(object sender, MouseEventArgs e)
-        {
-            // Handle Draggable Windows
-            if (API.Upgrades["draggablewindows"] == true)
-            {
-                if (e.Button == MouseButtons.Left)
-                {
-                    titlebar.Capture = false;
-                    lbtitletext.Capture = false;
-                    pnlicon.Capture = false;
-                    pgtoplcorner.Capture = false;
-                    pgtoprcorner.Capture = false;
-                    const int WM_NCLBUTTONDOWN = 0xa1;
-                    const int HTCAPTION = 2;
-                    Message msg = Message.Create(this.Handle, WM_NCLBUTTONDOWN, new IntPtr(HTCAPTION), IntPtr.Zero);
-                    this.DefWndProc(ref msg);
-                }
-                //ShiftOSDesktop.log = //ShiftOSDesktop.log + My.Computer.Clock.LocalTime + " User dragged " + this.Name + " to " + this.Location.ToString + Environment.NewLine;
-            }
-        }
-
-        public void setupborders()
-        {
-            if (API.Upgrades["windowborders"] == false)
-            {
-                pgleft.Hide();
-                pgbottom.Hide();
-                pgright.Hide();
-                this.Size = new Size(this.Width - pgleft.Width - pgright.Width, this.Height - pgbottom.Height);
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void closebutton_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void closebutton_MouseEnter(object sender, EventArgs e)
-        {
-            closebutton.BackgroundImage = API.CurrentSkinImages.closebtnhover;
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void closebutton_MouseLeave(object sender, EventArgs e)
-        {
-            closebutton.BackgroundImage = API.CurrentSkinImages.closebtn;
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void closebutton_MouseDown(object sender, EventArgs e)
-        {
-            closebutton.BackgroundImage = API.CurrentSkinImages.closebtnclick;
-        }
-
-        public Point OldLoc = new Point(0, 0);
-        public bool Minimized = false;
-
-        // ERROR: Handles clauses are not supported in C#
-        private void minimizebutton_Click(object sender, EventArgs e)
-        {
-            OldLoc = this.Location;
-            Minimized = true;
-            this.Location = new Point(99999, 99999);
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void rollupbutton_Click(object sender, EventArgs e)
-        {
-            rollupanddown();
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void rollupbutton_MouseEnter(object sender, EventArgs e)
-        {
-            rollupbutton.BackgroundImage = API.CurrentSkinImages.rollbtnhover;
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void rollupbutton_MouseLeave(object sender, EventArgs e)
-        {
-            rollupbutton.BackgroundImage = API.CurrentSkinImages.rollbtn;
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void rollupbutton_MouseDown(object sender, EventArgs e)
-        {
-            rollupbutton.BackgroundImage = API.CurrentSkinImages.rollbtnclick;
-        }
-
-
-        public void setuptitlebar()
-        {
-            setupborders();
-
-            if (this.Height == this.titlebar.Height) { pgleft.Show(); pgbottom.Show(); pgright.Show(); this.Height = rolldownsize; needtorollback = true; }
-            pgleft.Width = API.CurrentSkin.borderwidth;
-            pgright.Width = API.CurrentSkin.borderwidth;
-            pgbottom.Height = API.CurrentSkin.borderwidth;
-            titlebar.Height = API.CurrentSkin.titlebarheight;
-
-            if (justopened == true)
-            {
-                this.Size = new Size(420, 510);
-                //put the default size of your window here
-                this.Size = new Size(this.Width, this.Height + API.CurrentSkin.titlebarheight - 30);
-                this.Size = new Size(this.Width + API.CurrentSkin.borderwidth + API.CurrentSkin.borderwidth, this.Height + API.CurrentSkin.borderwidth);
-                oldbordersize = API.CurrentSkin.borderwidth;
-                oldtitlebarheight = API.CurrentSkin.titlebarheight;
-                justopened = false;
-            }
-            else {
-                if (this.Visible == true)
-                {
-                    this.Size = new Size(this.Width - (2 * oldbordersize) + (2 * API.CurrentSkin.borderwidth), (this.Height - oldtitlebarheight - oldbordersize) + API.CurrentSkin.titlebarheight + API.CurrentSkin.borderwidth);
-                    oldbordersize = API.CurrentSkin.borderwidth;
-                    oldtitlebarheight = API.CurrentSkin.titlebarheight;
-                    rolldownsize = this.Height;
-                    if (needtorollback == true) { this.Height = titlebar.Height; pgleft.Hide(); pgbottom.Hide(); pgright.Hide(); }
-                }
-            }
-
-            if (API.CurrentSkin.enablecorners == true)
-            {
-                pgtoplcorner.Show();
-                pgtoprcorner.Show();
-                pgtoprcorner.Width = API.CurrentSkin.titlebarcornerwidth;
-                pgtoplcorner.Width = API.CurrentSkin.titlebarcornerwidth;
-            }
-            else {
-                pgtoplcorner.Hide();
-                pgtoprcorner.Hide();
-            }
-
-            if (API.Upgrades["titlebar"] == false)
-            {
-                titlebar.Hide();
-                this.Size = new Size(this.Width, this.Size.Height - titlebar.Height);
-            }
-
-            if (API.Upgrades["titletext"] == false)
-            {
-                lbtitletext.Hide();
-            }
-            else {
-                lbtitletext.Font = new Font(API.CurrentSkin.titletextfontfamily, API.CurrentSkin.titletextfontsize, API.CurrentSkin.titletextfontstyle, GraphicsUnit.Point);
-                lbtitletext.Text = this.AppName;
-                //Remember to change to name of program!!!!
-                lbtitletext.Show();
-            }
-
-            if (API.Upgrades["closebutton"] == false)
-            {
-                closebutton.Hide();
-            }
-            else {
-                closebutton.BackColor = API.CurrentSkin.closebtncolour;
-                closebutton.Size = API.CurrentSkin.closebtnsize;
-                closebutton.Show();
-            }
-
-            if (API.Upgrades["rollupbutton"] == false)
-            {
-                rollupbutton.Hide();
-            }
-            else {
-                rollupbutton.BackColor = API.CurrentSkin.rollbtncolour;
-                rollupbutton.Size = API.CurrentSkin.rollbtnsize;
-                rollupbutton.Show();
-            }
-
-            if (API.Upgrades["minimizebutton"] == false)
-            {
-                minimizebutton.Hide();
-            }
-            else {
-                minimizebutton.BackColor = API.CurrentSkin.minbtncolour;
-                minimizebutton.Size = API.CurrentSkin.minbtnsize;
-                minimizebutton.Show();
-            }
-
-            if (API.Upgrades["windowborders"] == true)
-            {
-                closebutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.closebtnfromside - closebutton.Size.Width, API.CurrentSkin.closebtnfromtop);
-                rollupbutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.rollbtnfromside - rollupbutton.Size.Width, API.CurrentSkin.rollbtnfromtop);
-                minimizebutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.minbtnfromside - minimizebutton.Size.Width, API.CurrentSkin.minbtnfromtop);
-                switch (API.CurrentSkin.titletextpos)
-                {
-                    case "Left":
-                        lbtitletext.Location = new Point(API.CurrentSkin.titletextfromside, API.CurrentSkin.titletextfromtop);
-                        break;
-                    case "Centre":
-                        lbtitletext.Location = new Point((titlebar.Width / 2) - lbtitletext.Width / 2, API.CurrentSkin.titletextfromtop);
-                        break;
-                }
-                lbtitletext.ForeColor = API.CurrentSkin.titletextcolour;
-            }
-            else {
-                closebutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.closebtnfromside - pgtoplcorner.Width - pgtoprcorner.Width - closebutton.Size.Width, API.CurrentSkin.closebtnfromtop);
-                rollupbutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.rollbtnfromside - pgtoplcorner.Width - pgtoprcorner.Width - rollupbutton.Size.Width, API.CurrentSkin.rollbtnfromtop);
-                minimizebutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.minbtnfromside - pgtoplcorner.Width - pgtoprcorner.Width - minimizebutton.Size.Width, API.CurrentSkin.minbtnfromtop);
-                switch (API.CurrentSkin.titletextpos)
-                {
-                    case "Left":
-                        lbtitletext.Location = new Point(API.CurrentSkin.titletextfromside + pgtoplcorner.Width, API.CurrentSkin.titletextfromtop);
-                        break;
-                    case "Centre":
-                        lbtitletext.Location = new Point((titlebar.Width / 2) - lbtitletext.Width / 2, API.CurrentSkin.titletextfromtop);
-                        break;
-                }
-                lbtitletext.ForeColor = API.CurrentSkin.titletextcolour;
-            }
-
-            //Change when Icon skinning complete
-            // Change to program's icon
-            if (API.Upgrades["appicons"] == true)
-            {
-                pnlicon.Visible = true;
-                pnlicon.Location = new Point(API.CurrentSkin.titleiconfromside, API.CurrentSkin.titleiconfromtop);
-                pnlicon.Size = new Size(API.CurrentSkin.titlebariconsize, API.CurrentSkin.titlebariconsize);
-                pnlicon.Image = this.AppIcon;
-                //Replace with the correct icon for the program.
-            }
-
-        }
-
-        public void rollupanddown()
-        {
-            if (this.Height == this.titlebar.Height)
-            {
-                pgleft.Show();
-                pgbottom.Show();
-                pgright.Show();
-                this.Height = rolldownsize;
-                this.MinimumSize = new Size(minimumsizewidth, minimumsizeheight);
-            }
-            else {
-                this.MinimumSize = new Size(0, 0);
-                pgleft.Hide();
-                pgbottom.Hide();
-                pgright.Hide();
-                rolldownsize = this.Height;
-                this.Height = this.titlebar.Height;
-            }
-        }
-
-        public void resettitlebar()
-        {
-            if (API.Upgrades["windowborders"] == true)
-            {
-                closebutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.closebtnfromside - closebutton.Size.Width, API.CurrentSkin.closebtnfromtop);
-                rollupbutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.rollbtnfromside - rollupbutton.Size.Width, API.CurrentSkin.rollbtnfromtop);
-                minimizebutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.minbtnfromside - minimizebutton.Size.Width, API.CurrentSkin.minbtnfromtop);
-                switch (API.CurrentSkin.titletextpos)
-                {
-                    case "Left":
-                        lbtitletext.Location = new Point(API.CurrentSkin.titletextfromside, API.CurrentSkin.titletextfromtop);
-                        break;
-                    case "Centre":
-                        lbtitletext.Location = new Point((titlebar.Width / 2) - lbtitletext.Width / 2, API.CurrentSkin.titletextfromtop);
-                        break;
-                }
-                lbtitletext.ForeColor = API.CurrentSkin.titletextcolour;
-            }
-            else {
-                closebutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.closebtnfromside - pgtoplcorner.Width - pgtoprcorner.Width - closebutton.Size.Width, API.CurrentSkin.closebtnfromtop);
-                rollupbutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.rollbtnfromside - pgtoplcorner.Width - pgtoprcorner.Width - rollupbutton.Size.Width, API.CurrentSkin.rollbtnfromtop);
-                minimizebutton.Location = new Point(titlebar.Size.Width - API.CurrentSkin.minbtnfromside - pgtoplcorner.Width - pgtoprcorner.Width - minimizebutton.Size.Width, API.CurrentSkin.minbtnfromtop);
-                switch (API.CurrentSkin.titletextpos)
-                {
-                    case "Left":
-                        lbtitletext.Location = new Point(API.CurrentSkin.titletextfromside + pgtoplcorner.Width, API.CurrentSkin.titletextfromtop);
-                        break;
-                    case "Centre":
-                        lbtitletext.Location = new Point((titlebar.Width / 2) - lbtitletext.Width / 2, API.CurrentSkin.titletextfromtop);
-                        break;
-                }
-                lbtitletext.ForeColor = API.CurrentSkin.titletextcolour;
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void pullside_Tick(System.Object sender, System.EventArgs e)
-        {
-            this.Width = Cursor.Position.X - this.Location.X;
-            resettitlebar();
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void pullbottom_Tick(System.Object sender, System.EventArgs e)
-        {
-            this.Height = Cursor.Position.Y - this.Location.Y;
-            resettitlebar();
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void pullbs_Tick(object sender, System.EventArgs e)
-        {
-            this.Width = Cursor.Position.X - this.Location.X;
-            this.Height = Cursor.Position.Y - this.Location.Y;
-            resettitlebar();
-        }
-
-        //delete this for non-resizable windows
-        // ERROR: Handles clauses are not supported in C#
-        private void Rightpull_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                pullside.Start();
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void RightCursorOn_MouseDown(object sender, System.EventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                Cursor = Cursors.SizeWE;
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void bottomCursorOn_MouseDown(object sender, System.EventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                Cursor = Cursors.SizeNS;
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void CornerCursorOn_MouseDown(object sender, System.EventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                Cursor = Cursors.SizeNWSE;
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void SizeCursoroff_MouseDown(object sender, System.EventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                Cursor = Cursors.Default;
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void rightpull_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                pullside.Stop();
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void bottompull_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                pullbottom.Start();
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void buttompull_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                pullbottom.Stop();
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void bspull_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                pullbs.Start();
-            }
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void bspull_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            if (API.Upgrades["resizablewindows"] == true)
-            {
-                pullbs.Stop();
-            }
-        }
-
-        public void setskin()
-        {
-            //disposals
-            closebutton.BackgroundImage = null;
-            titlebar.BackgroundImage = null;
-            rollupbutton.BackgroundImage = null;
-            pgtoplcorner.BackgroundImage = null;
-            pgtoprcorner.BackgroundImage = null;
-            minimizebutton.BackgroundImage = null;
-            //apply new skin
-            if (API.CurrentSkinImages.closebtn == null)
-                closebutton.BackColor = API.CurrentSkin.closebtncolour;
-            else
-                closebutton.BackgroundImage = API.CurrentSkinImages.closebtn;
-            closebutton.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.closebtnlayout;
-            if (API.CurrentSkinImages.titlebar == null)
-                titlebar.BackColor = API.CurrentSkin.titlebarcolour;
-            else
-                titlebar.BackgroundImage = API.CurrentSkinImages.titlebar;
-            titlebar.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.titlebarlayout;
-            if (API.CurrentSkinImages.rollbtn == null)
-                rollupbutton.BackColor = API.CurrentSkin.rollbtncolour;
-            else
-                rollupbutton.BackgroundImage = API.CurrentSkinImages.rollbtn;
-            rollupbutton.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.rollbtnlayout;
-            if (API.CurrentSkinImages.leftcorner == null)
-                pgtoplcorner.BackColor = API.CurrentSkin.leftcornercolour;
-            else
-                pgtoplcorner.BackgroundImage = API.CurrentSkinImages.leftcorner;
-            pgtoplcorner.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.leftcornerlayout;
-            if (API.CurrentSkinImages.rightcorner == null)
-                pgtoprcorner.BackColor = API.CurrentSkin.rightcornercolour;
-            else
-                pgtoprcorner.BackgroundImage = API.CurrentSkinImages.rightcorner;
-            pgtoprcorner.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.rightcornerlayout;
-            if (API.CurrentSkinImages.minbtn == null)
-                minimizebutton.BackColor = API.CurrentSkin.minbtncolour;
-            else
-                minimizebutton.BackgroundImage = API.CurrentSkinImages.minbtn;
-            minimizebutton.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.minbtnlayout;
-            if (API.CurrentSkinImages.borderleft == null)
-                pgleft.BackColor = API.CurrentSkin.borderleftcolour;
-            else
-                pgleft.BackgroundImage = API.CurrentSkinImages.borderleft;
-            pgleft.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.borderleftlayout;
-            if (API.CurrentSkinImages.borderright == null)
-                pgright.BackColor = API.CurrentSkin.borderrightcolour;
-            else
-                pgright.BackgroundImage = API.CurrentSkinImages.borderright;
-            pgleft.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.borderrightlayout;
-            if (API.CurrentSkinImages.borderbottom == null)
-                pgbottom.BackColor = API.CurrentSkin.borderbottomcolour;
-            else
-                pgbottom.BackgroundImage = API.CurrentSkinImages.borderbottom;
-            pgbottom.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.borderbottomlayout;
-            if (API.CurrentSkin.enablebordercorners == true)
-            {
-                if (API.CurrentSkinImages.bottomleftcorner == null)
-                    pgbottomlcorner.BackColor = API.CurrentSkin.bottomleftcornercolour;
-                else
-                    pgbottomlcorner.BackgroundImage = API.CurrentSkinImages.bottomleftcorner;
-                pgbottomlcorner.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.bottomleftcornerlayout;
-                if (API.CurrentSkinImages.bottomrightcorner == null)
-                    pgbottomrcorner.BackColor = API.CurrentSkin.bottomrightcornercolour;
-                else
-                    pgbottomrcorner.BackgroundImage = API.CurrentSkinImages.bottomrightcorner;
-                pgbottomrcorner.BackgroundImageLayout = (ImageLayout)API.CurrentSkin.bottomrightcornerlayout;
-            }
-            else {
-                pgbottomlcorner.BackColor = API.CurrentSkin.borderrightcolour;
-                pgbottomrcorner.BackColor = API.CurrentSkin.borderrightcolour;
-                pgbottomlcorner.BackgroundImage = null;
-                pgbottomrcorner.BackgroundImage = null;
-            }
-
-            //set bottom border corner size
-            pgbottomlcorner.Size = new Size(API.CurrentSkin.borderwidth, API.CurrentSkin.borderwidth);
-            pgbottomrcorner.Size = new Size(API.CurrentSkin.borderwidth, API.CurrentSkin.borderwidth);
-            pgbottomlcorner.Location = new Point(0, this.Height - API.CurrentSkin.borderwidth);
-            pgbottomrcorner.Location = new Point(this.Width, this.Height - API.CurrentSkin.borderwidth);
-
-            this.TransparencyKey = Skinning.Utilities.globaltransparencycolour;
-        }
-
-        // ERROR: Handles clauses are not supported in C#
-        private void Clock_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            this.Close();
-        }
-    }
-    #endregion
-}
diff --git a/source/WindowsFormsApplication1/Template.resx b/source/WindowsFormsApplication1/Template.resx
deleted file mode 100644
index 8bf59aa..0000000
--- a/source/WindowsFormsApplication1/Template.resx
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="pullbs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="pullbottom.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>101, 17</value>
-  </metadata>
-  <metadata name="pullside.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>214, 17</value>
-  </metadata>
-</root>
\ No newline at end of file