diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs
index 9b11794..930cae0 100644
--- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs
+++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs
@@ -139,6 +139,7 @@ namespace NovetusLauncher
             this.pictureBox9 = new System.Windows.Forms.PictureBox();
             this.listBox9 = new System.Windows.Forms.ListBox();
             this.tabPage7 = new System.Windows.Forms.TabPage();
+            this.button71 = new System.Windows.Forms.Button();
             this.label8 = new System.Windows.Forms.Label();
             this.pictureBox10 = new System.Windows.Forms.PictureBox();
             this.button60 = new System.Windows.Forms.Button();
@@ -153,7 +154,6 @@ namespace NovetusLauncher
             this.button54 = new System.Windows.Forms.Button();
             this.button53 = new System.Windows.Forms.Button();
             this.button52 = new System.Windows.Forms.Button();
-            this.button71 = new System.Windows.Forms.Button();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -1325,6 +1325,16 @@ namespace NovetusLauncher
             this.tabPage7.Text = "OTHER";
             this.tabPage7.UseVisualStyleBackColor = true;
             // 
+            // button71
+            // 
+            this.button71.Location = new System.Drawing.Point(365, 37);
+            this.button71.Name = "button71";
+            this.button71.Size = new System.Drawing.Size(99, 31);
+            this.button71.TabIndex = 13;
+            this.button71.Text = "Save Outfit";
+            this.button71.UseVisualStyleBackColor = true;
+            this.button71.Click += new System.EventHandler(this.button71_Click);
+            // 
             // label8
             // 
             this.label8.Location = new System.Drawing.Point(293, 6);
@@ -1403,9 +1413,9 @@ namespace NovetusLauncher
             // label5
             // 
             this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label5.Location = new System.Drawing.Point(238, 9);
+            this.label5.Location = new System.Drawing.Point(231, 9);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(45, 19);
+            this.label5.Size = new System.Drawing.Size(56, 19);
             this.label5.TabIndex = 5;
             this.label5.Text = "NBC";
             // 
@@ -1423,9 +1433,9 @@ namespace NovetusLauncher
             // label3
             // 
             this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.Location = new System.Drawing.Point(112, 9);
+            this.label3.Location = new System.Drawing.Point(104, 9);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(130, 19);
+            this.label3.Size = new System.Drawing.Size(131, 19);
             this.label3.TabIndex = 3;
             this.label3.Text = "Selected Icon:";
             // 
@@ -1468,16 +1478,6 @@ namespace NovetusLauncher
             this.button52.UseVisualStyleBackColor = true;
             this.button52.Click += new System.EventHandler(this.Button52Click);
             // 
-            // button71
-            // 
-            this.button71.Location = new System.Drawing.Point(365, 37);
-            this.button71.Name = "button71";
-            this.button71.Size = new System.Drawing.Size(99, 31);
-            this.button71.TabIndex = 13;
-            this.button71.Text = "Save Outfit";
-            this.button71.UseVisualStyleBackColor = true;
-            this.button71.Click += new System.EventHandler(this.button71_Click);
-            // 
             // CharacterCustomization
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj
index a45ea7f..cb2e8a7 100644
--- a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj
+++ b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj
@@ -100,10 +100,10 @@
     <Compile Include="SDK\ItemMaker.Designer.cs">
       <DependentUpon>ItemMaker.cs</DependentUpon>
     </Compile>
-    <Compile Include="LoaderForm.cs">
+    <Compile Include="URI\LoaderForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="LoaderForm.Designer.cs">
+    <Compile Include="URI\LoaderForm.Designer.cs">
       <DependentUpon>LoaderForm.cs</DependentUpon>
     </Compile>
     <Compile Include="SDK\SplashTester.cs">
@@ -112,10 +112,10 @@
     <Compile Include="SDK\SplashTester.Designer.cs">
       <DependentUpon>SplashTester.cs</DependentUpon>
     </Compile>
-    <Compile Include="NovetusSDK.cs">
+    <Compile Include="SDK\NovetusSDK.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="NovetusSDK.Designer.cs">
+    <Compile Include="SDK\NovetusSDK.Designer.cs">
       <DependentUpon>NovetusSDK.cs</DependentUpon>
     </Compile>
     <Compile Include="SDK\AssetLocalizer.cs">
@@ -129,10 +129,10 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="QuickConfigure.cs">
+    <Compile Include="URI\QuickConfigure.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="QuickConfigure.Designer.cs">
+    <Compile Include="URI\QuickConfigure.Designer.cs">
       <DependentUpon>QuickConfigure.cs</DependentUpon>
     </Compile>
     <Compile Include="ServerInfo.cs">
@@ -163,7 +163,7 @@
     <EmbeddedResource Include="SDK\ItemMaker.resx">
       <DependentUpon>ItemMaker.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="LoaderForm.resx">
+    <EmbeddedResource Include="URI\LoaderForm.resx">
       <DependentUpon>LoaderForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="SDK\SplashTester.resx">
@@ -172,7 +172,7 @@
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="NovetusSDK.resx">
+    <EmbeddedResource Include="SDK\NovetusSDK.resx">
       <DependentUpon>NovetusSDK.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="SDK\AssetLocalizer.resx">
@@ -182,7 +182,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="QuickConfigure.resx">
+    <EmbeddedResource Include="URI\QuickConfigure.resx">
       <DependentUpon>QuickConfigure.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="ServerInfo.resx">
diff --git a/NovetusLauncher/NovetusLauncher/NovetusSDK.Designer.cs b/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.Designer.cs
similarity index 100%
rename from NovetusLauncher/NovetusLauncher/NovetusSDK.Designer.cs
rename to NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.Designer.cs
diff --git a/NovetusLauncher/NovetusLauncher/NovetusSDK.cs b/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs
similarity index 100%
rename from NovetusLauncher/NovetusLauncher/NovetusSDK.cs
rename to NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs
diff --git a/NovetusLauncher/NovetusLauncher/NovetusSDK.resx b/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.resx
similarity index 100%
rename from NovetusLauncher/NovetusLauncher/NovetusSDK.resx
rename to NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.resx
diff --git a/NovetusLauncher/NovetusLauncher/LoaderForm.Designer.cs b/NovetusLauncher/NovetusLauncher/URI/LoaderForm.Designer.cs
similarity index 100%
rename from NovetusLauncher/NovetusLauncher/LoaderForm.Designer.cs
rename to NovetusLauncher/NovetusLauncher/URI/LoaderForm.Designer.cs
diff --git a/NovetusLauncher/NovetusLauncher/LoaderForm.cs b/NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs
similarity index 100%
rename from NovetusLauncher/NovetusLauncher/LoaderForm.cs
rename to NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs
diff --git a/NovetusLauncher/NovetusLauncher/LoaderForm.resx b/NovetusLauncher/NovetusLauncher/URI/LoaderForm.resx
similarity index 100%
rename from NovetusLauncher/NovetusLauncher/LoaderForm.resx
rename to NovetusLauncher/NovetusLauncher/URI/LoaderForm.resx
diff --git a/NovetusLauncher/NovetusLauncher/QuickConfigure.Designer.cs b/NovetusLauncher/NovetusLauncher/URI/QuickConfigure.Designer.cs
similarity index 100%
rename from NovetusLauncher/NovetusLauncher/QuickConfigure.Designer.cs
rename to NovetusLauncher/NovetusLauncher/URI/QuickConfigure.Designer.cs
diff --git a/NovetusLauncher/NovetusLauncher/QuickConfigure.cs b/NovetusLauncher/NovetusLauncher/URI/QuickConfigure.cs
similarity index 100%
rename from NovetusLauncher/NovetusLauncher/QuickConfigure.cs
rename to NovetusLauncher/NovetusLauncher/URI/QuickConfigure.cs
diff --git a/NovetusLauncher/NovetusLauncher/QuickConfigure.resx b/NovetusLauncher/NovetusLauncher/URI/QuickConfigure.resx
similarity index 100%
rename from NovetusLauncher/NovetusLauncher/QuickConfigure.resx
rename to NovetusLauncher/NovetusLauncher/URI/QuickConfigure.resx