diff --git a/shiftos_next.v12.suo b/shiftos_next.v12.suo
index 9b99923..0726f15 100644
Binary files a/shiftos_next.v12.suo and b/shiftos_next.v12.suo differ
diff --git a/shiftos_next/API.vb b/shiftos_next/APIs/API.vb
similarity index 98%
rename from shiftos_next/API.vb
rename to shiftos_next/APIs/API.vb
index 0b37667..d3a70fe 100644
--- a/shiftos_next/API.vb
+++ b/shiftos_next/APIs/API.vb
@@ -1,6 +1,7 @@
 Module API
     'Terminal
 
+    Public debugmode As Boolean = False 'If this boolean value is set to True, any exceptions will be shown, rather than supressed.
     Public txtterm As TextBox = Terminal.terminaltext
 
     Public Function SetColorbasic(colorname As String)
diff --git a/shiftos_next/TerminalGames.vb b/shiftos_next/APIs/TerminalGames.vb
similarity index 100%
rename from shiftos_next/TerminalGames.vb
rename to shiftos_next/APIs/TerminalGames.vb
diff --git a/shiftos_next/filesystem.vb b/shiftos_next/APIs/filesystem.vb
similarity index 100%
rename from shiftos_next/filesystem.vb
rename to shiftos_next/APIs/filesystem.vb
diff --git a/shiftos_next/saveengine.vb b/shiftos_next/APIs/saveengine.vb
similarity index 100%
rename from shiftos_next/saveengine.vb
rename to shiftos_next/APIs/saveengine.vb
diff --git a/shiftos_next/shiftorium_api.vb b/shiftos_next/APIs/shiftorium_api.vb
similarity index 100%
rename from shiftos_next/shiftorium_api.vb
rename to shiftos_next/APIs/shiftorium_api.vb
diff --git a/shiftos_next/BWM User Controls/Titlebar.vb b/shiftos_next/BWM User Controls/Titlebar.vb
index 7e380d5..2d4e6e6 100644
--- a/shiftos_next/BWM User Controls/Titlebar.vb	
+++ b/shiftos_next/BWM User Controls/Titlebar.vb	
@@ -11,6 +11,11 @@
 
     Friend WithEvents prnt As Form = ParentForm
 
+    Private Sub Titlebar_Load(sender As Object, e As EventArgs) Handles Me.Load
+        Me.Dock = DockStyle.Top
+        Me.BringToFront()
+    End Sub
+
     Private Sub titlebar_MouseDown(sender As Object, e As MouseEventArgs) Handles Me.MouseDown, lbtitle.MouseDown
         ' Handle Draggable Windows
         If boughtdraggablewindows = True Then
@@ -31,8 +36,8 @@
         If boughtbasicwm = True Then
             Me.Show()
             ParentForm.WindowState = FormWindowState.Normal
-            ParentForm.Left = (Screen.PrimaryScreen.Bounds.Width - Me.Width) / 2
-            ParentForm.Top = (Screen.PrimaryScreen.Bounds.Height - Me.Height) / 2
+            ParentForm.Left = (Screen.PrimaryScreen.Bounds.Width - ParentForm.Width) / 2
+            ParentForm.Top = (Screen.PrimaryScreen.Bounds.Height - ParentForm.Height) / 2
             ParentForm.TopMost = True
         Else
             Me.Hide()
diff --git a/shiftos_next/ColorPicker.Designer.vb b/shiftos_next/BWM and CMD Apps/ColorPicker.Designer.vb
similarity index 100%
rename from shiftos_next/ColorPicker.Designer.vb
rename to shiftos_next/BWM and CMD Apps/ColorPicker.Designer.vb
diff --git a/shiftos_next/ColorPicker.resx b/shiftos_next/BWM and CMD Apps/ColorPicker.resx
similarity index 100%
rename from shiftos_next/ColorPicker.resx
rename to shiftos_next/BWM and CMD Apps/ColorPicker.resx
diff --git a/shiftos_next/ColorPicker.vb b/shiftos_next/BWM and CMD Apps/ColorPicker.vb
similarity index 100%
rename from shiftos_next/ColorPicker.vb
rename to shiftos_next/BWM and CMD Apps/ColorPicker.vb
diff --git a/shiftos_next/TextPad.Designer.vb b/shiftos_next/BWM and CMD Apps/TextPad.Designer.vb
similarity index 100%
rename from shiftos_next/TextPad.Designer.vb
rename to shiftos_next/BWM and CMD Apps/TextPad.Designer.vb
diff --git a/shiftos_next/TextPad.resx b/shiftos_next/BWM and CMD Apps/TextPad.resx
similarity index 100%
rename from shiftos_next/TextPad.resx
rename to shiftos_next/BWM and CMD Apps/TextPad.resx
diff --git a/shiftos_next/TextPad.vb b/shiftos_next/BWM and CMD Apps/TextPad.vb
similarity index 100%
rename from shiftos_next/TextPad.vb
rename to shiftos_next/BWM and CMD Apps/TextPad.vb
diff --git a/shiftos_next/basicwm_infobox.Designer.vb b/shiftos_next/BWM and CMD Apps/basicwm_infobox.Designer.vb
similarity index 100%
rename from shiftos_next/basicwm_infobox.Designer.vb
rename to shiftos_next/BWM and CMD Apps/basicwm_infobox.Designer.vb
diff --git a/shiftos_next/basicwm_infobox.resx b/shiftos_next/BWM and CMD Apps/basicwm_infobox.resx
similarity index 100%
rename from shiftos_next/basicwm_infobox.resx
rename to shiftos_next/BWM and CMD Apps/basicwm_infobox.resx
diff --git a/shiftos_next/basicwm_infobox.vb b/shiftos_next/BWM and CMD Apps/basicwm_infobox.vb
similarity index 100%
rename from shiftos_next/basicwm_infobox.vb
rename to shiftos_next/BWM and CMD Apps/basicwm_infobox.vb
diff --git a/shiftos_next/file skimmer.Designer.vb b/shiftos_next/BWM and CMD Apps/file skimmer.Designer.vb
similarity index 100%
rename from shiftos_next/file skimmer.Designer.vb
rename to shiftos_next/BWM and CMD Apps/file skimmer.Designer.vb
diff --git a/shiftos_next/file skimmer.resx b/shiftos_next/BWM and CMD Apps/file skimmer.resx
similarity index 100%
rename from shiftos_next/file skimmer.resx
rename to shiftos_next/BWM and CMD Apps/file skimmer.resx
diff --git a/shiftos_next/file skimmer.vb b/shiftos_next/BWM and CMD Apps/file skimmer.vb
similarity index 100%
rename from shiftos_next/file skimmer.vb
rename to shiftos_next/BWM and CMD Apps/file skimmer.vb
diff --git a/shiftos_next/shiftorium_cmd.Designer.vb b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.Designer.vb
similarity index 100%
rename from shiftos_next/shiftorium_cmd.Designer.vb
rename to shiftos_next/BWM and CMD Apps/shiftorium_cmd.Designer.vb
diff --git a/shiftos_next/shiftorium_cmd.resx b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.resx
similarity index 100%
rename from shiftos_next/shiftorium_cmd.resx
rename to shiftos_next/BWM and CMD Apps/shiftorium_cmd.resx
diff --git a/shiftos_next/shiftorium_cmd.vb b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.vb
similarity index 93%
rename from shiftos_next/shiftorium_cmd.vb
rename to shiftos_next/BWM and CMD Apps/shiftorium_cmd.vb
index 9999279..ba9b840 100644
--- a/shiftos_next/shiftorium_cmd.vb
+++ b/shiftos_next/BWM and CMD Apps/shiftorium_cmd.vb	
@@ -52,7 +52,9 @@
                         If boughtbasicwm = False Then
                             AddItem("Basic Window Manager", 100)
                         Else
-                            'Placeholder
+                            If boughtdraggablewindows = False Then
+                                AddItem("BWM Draggable Windows", 25)
+                            End If
                         End If
                     End If
                 End If
@@ -67,9 +69,13 @@
                     AddItem("Set Terminal Text Color", 10)
                 End If
             End If
-            lbitems.SelectedIndex = 1
+            lbitems.SelectedIndex = 0
         Catch ex As Exception
-            lbitems.Items.Add("No items available.")
+            If debugmode = False Then
+                lbitems.Items.Add("No items available.")
+            Else
+                lbitems.Items.Add(ex.Message)
+            End If
         End Try
         lbitems.DrawMode = DrawMode.OwnerDrawFixed
     End Sub
@@ -91,6 +97,7 @@
                     lbitems.SelectedIndex -= 1
                 End If
             Case Keys.Enter
+                handleitemdescription("BWM Draggable Windows - 25 CP", "We are able to have multiple windows on the screen, but they all stick to the center of the screen and can't be moved! This upgrade fixes that.")
                 handleitemdescription("Basic Window Manager - 100 CP", "Fullscreen applications, well, suck. You can't get any work done outside of that app without closing it, and can't even view the Terminal. This upgrade changes that. We've found a way to use the Basic GUI server to create a simple window manager. It allows multiple windows on the screen, and up to 3 Terminal windows at once.")
                 handleitemdescription("Textpad - 50 CP", "Hmmmmm... What was I gonna do on Sunday? Oh yeah! I have to get that website written for my buddy. Better write that down before I forget... " & vbNewLine & vbNewLine & "Textpad allows you to create text documents. Handy if you need to write something down!")
                 handleitemdescription("FS Delete - 15 CP", "Alright, What's this unused document doing on my PC? I don't need this. I must delete it. With this upgrade, you can delete files in the File Skimmer.")
@@ -103,6 +110,7 @@
                 handleitemdescription("Custom Username - 10 CP", "Hello, user! Isn't that wierd that that's all we know you as? Buy this upgrade to change yourr name from ""user"" to anything you want!")
                 handleitemdescription("Basic Terminal Settings - 5 CP", "Ever wanted to customize the terminal to act the way you'd like it to? This upgrade is for you. You won't be able to use it until you buy settings, but hey! The command is there.")
             Case Keys.Space
+                handlebuy("BWM Draggable Windows - 25 CP", boughtdraggablewindows, "The upgrade has been applied, and now we can drag windows around using our mouse!")
                 handlebuy("Basic Window Manager - 100 CP", boughtbasicwm, "Awesome! Just exit the Shiftorium and type ""bwm"" into the Terminal, and away we go. Future sessions will not require typing ""bwm"".")
                 handlebuy("Textpad - 50 CP", boughttextpad, "Great. Now our computer is a bit more useful than before...")
                 handlebuy("FS Delete - 15 CP", boughtfileskimmerdelete, "There. I can finally destroy that evil document that's been taking up 3/4 of my hard drive. Just right-click a file and click 'Delete' to delete a file.")
diff --git a/shiftos_next/BWMDesktop.Designer.vb b/shiftos_next/Desktop Environments/BWMDesktop.Designer.vb
similarity index 100%
rename from shiftos_next/BWMDesktop.Designer.vb
rename to shiftos_next/Desktop Environments/BWMDesktop.Designer.vb
diff --git a/shiftos_next/BWMDesktop.resx b/shiftos_next/Desktop Environments/BWMDesktop.resx
similarity index 100%
rename from shiftos_next/BWMDesktop.resx
rename to shiftos_next/Desktop Environments/BWMDesktop.resx
diff --git a/shiftos_next/BWMDesktop.vb b/shiftos_next/Desktop Environments/BWMDesktop.vb
similarity index 100%
rename from shiftos_next/BWMDesktop.vb
rename to shiftos_next/Desktop Environments/BWMDesktop.vb
diff --git a/shiftos_next/BasicWM_ColorTable.vb b/shiftos_next/Menu Renderers/BasicWM_ColorTable.vb
similarity index 100%
rename from shiftos_next/BasicWM_ColorTable.vb
rename to shiftos_next/Menu Renderers/BasicWM_ColorTable.vb
diff --git a/shiftos_next/basicwm_renderer.vb b/shiftos_next/Menu Renderers/basicwm_renderer.vb
similarity index 100%
rename from shiftos_next/basicwm_renderer.vb
rename to shiftos_next/Menu Renderers/basicwm_renderer.vb
diff --git a/shiftos_next/Hijack.Designer.vb b/shiftos_next/Other/Hijack.Designer.vb
similarity index 100%
rename from shiftos_next/Hijack.Designer.vb
rename to shiftos_next/Other/Hijack.Designer.vb
diff --git a/shiftos_next/Hijack.resx b/shiftos_next/Other/Hijack.resx
similarity index 100%
rename from shiftos_next/Hijack.resx
rename to shiftos_next/Other/Hijack.resx
diff --git a/shiftos_next/Hijack.vb b/shiftos_next/Other/Hijack.vb
similarity index 100%
rename from shiftos_next/Hijack.vb
rename to shiftos_next/Other/Hijack.vb
diff --git a/shiftos_next/Terminal.Designer.vb b/shiftos_next/Other/Terminal.Designer.vb
similarity index 100%
rename from shiftos_next/Terminal.Designer.vb
rename to shiftos_next/Other/Terminal.Designer.vb
diff --git a/shiftos_next/Terminal.resx b/shiftos_next/Other/Terminal.resx
similarity index 100%
rename from shiftos_next/Terminal.resx
rename to shiftos_next/Other/Terminal.resx
diff --git a/shiftos_next/Terminal.vb b/shiftos_next/Other/Terminal.vb
similarity index 100%
rename from shiftos_next/Terminal.vb
rename to shiftos_next/Other/Terminal.vb
diff --git a/shiftos_next/bin/Debug/shiftos_next.exe b/shiftos_next/bin/Debug/shiftos_next.exe
index bc00aab..cea38f3 100644
Binary files a/shiftos_next/bin/Debug/shiftos_next.exe and b/shiftos_next/bin/Debug/shiftos_next.exe differ
diff --git a/shiftos_next/bin/Debug/shiftos_next.pdb b/shiftos_next/bin/Debug/shiftos_next.pdb
index 7ee40d3..683dcab 100644
Binary files a/shiftos_next/bin/Debug/shiftos_next.pdb and b/shiftos_next/bin/Debug/shiftos_next.pdb differ
diff --git a/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index ee2f7a0..d8cd611 100644
Binary files a/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/shiftos_next/obj/Debug/shiftos_next.exe b/shiftos_next/obj/Debug/shiftos_next.exe
index bc00aab..cea38f3 100644
Binary files a/shiftos_next/obj/Debug/shiftos_next.exe and b/shiftos_next/obj/Debug/shiftos_next.exe differ
diff --git a/shiftos_next/obj/Debug/shiftos_next.pdb b/shiftos_next/obj/Debug/shiftos_next.pdb
index 7ee40d3..683dcab 100644
Binary files a/shiftos_next/obj/Debug/shiftos_next.pdb and b/shiftos_next/obj/Debug/shiftos_next.pdb differ
diff --git a/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache b/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache
index 4a8c593..8f96502 100644
Binary files a/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache and b/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache differ
diff --git a/shiftos_next/shiftos_next.vbproj b/shiftos_next/shiftos_next.vbproj
index 35221e0..d327d3b 100644
--- a/shiftos_next/shiftos_next.vbproj
+++ b/shiftos_next/shiftos_next.vbproj
@@ -70,44 +70,44 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="API.vb" />
-    <Compile Include="BasicWM_ColorTable.vb" />
-    <Compile Include="basicwm_infobox.Designer.vb">
+    <Compile Include="APIs\API.vb" />
+    <Compile Include="Menu Renderers\BasicWM_ColorTable.vb" />
+    <Compile Include="BWM and CMD Apps\basicwm_infobox.Designer.vb">
       <DependentUpon>basicwm_infobox.vb</DependentUpon>
     </Compile>
-    <Compile Include="basicwm_infobox.vb">
+    <Compile Include="BWM and CMD Apps\basicwm_infobox.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="basicwm_renderer.vb" />
+    <Compile Include="Menu Renderers\basicwm_renderer.vb" />
     <Compile Include="BWM User Controls\Titlebar.Designer.vb">
       <DependentUpon>Titlebar.vb</DependentUpon>
     </Compile>
     <Compile Include="BWM User Controls\Titlebar.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="BWMDesktop.Designer.vb">
+    <Compile Include="Desktop Environments\BWMDesktop.Designer.vb">
       <DependentUpon>BWMDesktop.vb</DependentUpon>
     </Compile>
-    <Compile Include="BWMDesktop.vb">
+    <Compile Include="Desktop Environments\BWMDesktop.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="ColorPicker.Designer.vb">
+    <Compile Include="BWM and CMD Apps\ColorPicker.Designer.vb">
       <DependentUpon>ColorPicker.vb</DependentUpon>
     </Compile>
-    <Compile Include="ColorPicker.vb">
+    <Compile Include="BWM and CMD Apps\ColorPicker.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="file skimmer.Designer.vb">
+    <Compile Include="BWM and CMD Apps\file skimmer.Designer.vb">
       <DependentUpon>file skimmer.vb</DependentUpon>
     </Compile>
-    <Compile Include="file skimmer.vb">
+    <Compile Include="BWM and CMD Apps\file skimmer.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="filesystem.vb" />
-    <Compile Include="Hijack.Designer.vb">
+    <Compile Include="APIs\filesystem.vb" />
+    <Compile Include="Other\Hijack.Designer.vb">
       <DependentUpon>Hijack.vb</DependentUpon>
     </Compile>
-    <Compile Include="Hijack.vb">
+    <Compile Include="Other\Hijack.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="My Project\AssemblyInfo.vb" />
@@ -125,45 +125,45 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="saveengine.vb" />
-    <Compile Include="shiftorium_api.vb" />
-    <Compile Include="shiftorium_cmd.Designer.vb">
+    <Compile Include="APIs\saveengine.vb" />
+    <Compile Include="APIs\shiftorium_api.vb" />
+    <Compile Include="BWM and CMD Apps\shiftorium_cmd.Designer.vb">
       <DependentUpon>shiftorium_cmd.vb</DependentUpon>
     </Compile>
-    <Compile Include="shiftorium_cmd.vb">
+    <Compile Include="BWM and CMD Apps\shiftorium_cmd.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Terminal.Designer.vb">
+    <Compile Include="Other\Terminal.Designer.vb">
       <DependentUpon>Terminal.vb</DependentUpon>
     </Compile>
-    <Compile Include="Terminal.vb">
+    <Compile Include="Other\Terminal.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="TerminalGames.vb" />
-    <Compile Include="TextPad.Designer.vb">
+    <Compile Include="APIs\TerminalGames.vb" />
+    <Compile Include="BWM and CMD Apps\TextPad.Designer.vb">
       <DependentUpon>TextPad.vb</DependentUpon>
     </Compile>
-    <Compile Include="TextPad.vb">
+    <Compile Include="BWM and CMD Apps\TextPad.vb">
       <SubType>Form</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="basicwm_infobox.resx">
+    <EmbeddedResource Include="BWM and CMD Apps\basicwm_infobox.resx">
       <DependentUpon>basicwm_infobox.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="BWM User Controls\Titlebar.resx">
       <DependentUpon>Titlebar.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BWMDesktop.resx">
+    <EmbeddedResource Include="Desktop Environments\BWMDesktop.resx">
       <DependentUpon>BWMDesktop.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ColorPicker.resx">
+    <EmbeddedResource Include="BWM and CMD Apps\ColorPicker.resx">
       <DependentUpon>ColorPicker.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="file skimmer.resx">
+    <EmbeddedResource Include="BWM and CMD Apps\file skimmer.resx">
       <DependentUpon>file skimmer.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Hijack.resx">
+    <EmbeddedResource Include="Other\Hijack.resx">
       <DependentUpon>Hijack.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="My Project\Resources.resx">
@@ -172,13 +172,13 @@
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="shiftorium_cmd.resx">
+    <EmbeddedResource Include="BWM and CMD Apps\shiftorium_cmd.resx">
       <DependentUpon>shiftorium_cmd.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Terminal.resx">
+    <EmbeddedResource Include="Other\Terminal.resx">
       <DependentUpon>Terminal.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="TextPad.resx">
+    <EmbeddedResource Include="BWM and CMD Apps\TextPad.resx">
       <DependentUpon>TextPad.vb</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
@@ -203,6 +203,7 @@
   <ItemGroup>
     <None Include="Resources\Folder1.png" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/shiftos_next/shiftos_next.vbproj.user b/shiftos_next/shiftos_next.vbproj.user
index fe7dc22..a4a6cdf 100644
--- a/shiftos_next/shiftos_next.vbproj.user
+++ b/shiftos_next/shiftos_next.vbproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>
\ No newline at end of file