diff --git a/CarManagerV3/CarManagerV3.csproj b/CarManagerV3/CarManagerV3.csproj
index 0dcc141..ac2735a 100644
--- a/CarManagerV3/CarManagerV3.csproj
+++ b/CarManagerV3/CarManagerV3.csproj
@@ -61,47 +61,48 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Car.cs" />
-    <Compile Include="CarCard.cs">
+    <Compile Include="Classes\Car.cs" />
+    <Compile Include="Forms\Components\CarCard.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="CarCard.Designer.cs">
+    <Compile Include="Forms\Components\CarCard.Designer.cs">
       <DependentUpon>CarCard.cs</DependentUpon>
     </Compile>
-    <Compile Include="LegacyException.cs" />
-    <Compile Include="MainForm.cs">
+    <Compile Include="Exceptions\LegacyException.cs" />
+    <Compile Include="Forms\MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm.Designer.cs">
+    <Compile Include="Forms\MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="CarDetailsForm.cs">
+    <Compile Include="Forms\CarDetailsForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="CarDetailsForm.Designer.cs">
+    <Compile Include="Forms\CarDetailsForm.Designer.cs">
       <DependentUpon>CarDetailsForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="ImageManager.cs" />
-    <Compile Include="PleaseWait.cs">
+    <Compile Include="Manager\ImageManager.cs" />
+    <Compile Include="Forms\Util\PleaseWait.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PleaseWait.Designer.cs">
+    <Compile Include="Forms\Util\PleaseWait.Designer.cs">
       <DependentUpon>PleaseWait.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SafeManager.cs" />
-    <Compile Include="StateManager.cs" />
-    <EmbeddedResource Include="CarCard.resx">
+    <Compile Include="Manager\SafeManager.cs" />
+    <Compile Include="Manager\StateManager.cs" />
+    <Compile Include="Util\CUID.cs" />
+    <EmbeddedResource Include="Forms\Components\CarCard.resx">
       <DependentUpon>CarCard.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainForm.resx">
+    <EmbeddedResource Include="Forms\MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CarDetailsForm.resx">
+    <EmbeddedResource Include="Forms\CarDetailsForm.resx">
       <DependentUpon>CarDetailsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PleaseWait.resx">
+    <EmbeddedResource Include="Forms\Util\PleaseWait.resx">
       <DependentUpon>PleaseWait.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -139,8 +140,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Manager\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/CarManagerV3/Car.cs b/CarManagerV3/Classes/Car.cs
similarity index 100%
rename from CarManagerV3/Car.cs
rename to CarManagerV3/Classes/Car.cs
diff --git a/CarManagerV3/LegacyException.cs b/CarManagerV3/Exceptions/LegacyException.cs
similarity index 100%
rename from CarManagerV3/LegacyException.cs
rename to CarManagerV3/Exceptions/LegacyException.cs
diff --git a/CarManagerV3/CarDetailsForm.Designer.cs b/CarManagerV3/Forms/CarDetailsForm.Designer.cs
similarity index 100%
rename from CarManagerV3/CarDetailsForm.Designer.cs
rename to CarManagerV3/Forms/CarDetailsForm.Designer.cs
diff --git a/CarManagerV3/CarDetailsForm.cs b/CarManagerV3/Forms/CarDetailsForm.cs
similarity index 100%
rename from CarManagerV3/CarDetailsForm.cs
rename to CarManagerV3/Forms/CarDetailsForm.cs
diff --git a/CarManagerV3/CarDetailsForm.resx b/CarManagerV3/Forms/CarDetailsForm.resx
similarity index 100%
rename from CarManagerV3/CarDetailsForm.resx
rename to CarManagerV3/Forms/CarDetailsForm.resx
diff --git a/CarManagerV3/CarCard.Designer.cs b/CarManagerV3/Forms/Components/CarCard.Designer.cs
similarity index 100%
rename from CarManagerV3/CarCard.Designer.cs
rename to CarManagerV3/Forms/Components/CarCard.Designer.cs
diff --git a/CarManagerV3/CarCard.cs b/CarManagerV3/Forms/Components/CarCard.cs
similarity index 100%
rename from CarManagerV3/CarCard.cs
rename to CarManagerV3/Forms/Components/CarCard.cs
diff --git a/CarManagerV3/CarCard.resx b/CarManagerV3/Forms/Components/CarCard.resx
similarity index 100%
rename from CarManagerV3/CarCard.resx
rename to CarManagerV3/Forms/Components/CarCard.resx
diff --git a/CarManagerV3/MainForm.Designer.cs b/CarManagerV3/Forms/MainForm.Designer.cs
similarity index 98%
rename from CarManagerV3/MainForm.Designer.cs
rename to CarManagerV3/Forms/MainForm.Designer.cs
index 78f8250..fcba4da 100644
--- a/CarManagerV3/MainForm.Designer.cs
+++ b/CarManagerV3/Forms/MainForm.Designer.cs
@@ -70,7 +70,7 @@
             this.flpCars.AutoScroll = true;
             this.flpCars.AutoScrollMargin = new System.Drawing.Size(0, 200);
             this.flpCars.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flpCars.Location = new System.Drawing.Point(3, 71);
+            this.flpCars.Location = new System.Drawing.Point(3, 67);
             this.flpCars.Name = "flpCars";
             this.flpCars.Size = new System.Drawing.Size(796, 412);
             this.flpCars.TabIndex = 1;
@@ -83,7 +83,7 @@
             this.tableLayoutPanel2.Controls.Add(this.tbxSearch, 0, 0);
             this.tableLayoutPanel2.Controls.Add(this.btnNewCar, 1, 0);
             this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 31);
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 27);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             this.tableLayoutPanel2.RowCount = 1;
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
@@ -117,7 +117,7 @@
             this.fileToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(802, 28);
+            this.menuStrip1.Size = new System.Drawing.Size(802, 24);
             this.menuStrip1.TabIndex = 3;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -131,48 +131,48 @@
             this.recentFilesToolStripMenuItem,
             this.revealInFileExplorerToolStripMenuItem});
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24);
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
             this.fileToolStripMenuItem.Text = "File";
             // 
             // openToolStripMenuItem
             // 
             this.openToolStripMenuItem.Name = "openToolStripMenuItem";
-            this.openToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
+            this.openToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
             this.openToolStripMenuItem.Text = "Open";
             this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
             // 
             // saveToolStripMenuItem
             // 
             this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            this.saveToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
+            this.saveToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
             this.saveToolStripMenuItem.Text = "Save";
             this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
             // 
             // saveAsToolStripMenuItem
             // 
             this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
-            this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
+            this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
             this.saveAsToolStripMenuItem.Text = "Save as";
             this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
             // 
             // importToolStripMenuItem
             // 
             this.importToolStripMenuItem.Name = "importToolStripMenuItem";
-            this.importToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
+            this.importToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
             this.importToolStripMenuItem.Text = "Import";
             this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click);
             // 
             // recentFilesToolStripMenuItem
             // 
             this.recentFilesToolStripMenuItem.Name = "recentFilesToolStripMenuItem";
-            this.recentFilesToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
+            this.recentFilesToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
             this.recentFilesToolStripMenuItem.Text = "Recent Files";
             this.recentFilesToolStripMenuItem.Click += new System.EventHandler(this.recentFilesToolStripMenuItem_Click);
             // 
             // revealInFileExplorerToolStripMenuItem
             // 
             this.revealInFileExplorerToolStripMenuItem.Name = "revealInFileExplorerToolStripMenuItem";
-            this.revealInFileExplorerToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
+            this.revealInFileExplorerToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
             this.revealInFileExplorerToolStripMenuItem.Text = "Reveal in File Explorer";
             this.revealInFileExplorerToolStripMenuItem.Click += new System.EventHandler(this.revealInFileExplorerToolStripMenuItem_Click);
             // 
diff --git a/CarManagerV3/MainForm.cs b/CarManagerV3/Forms/MainForm.cs
similarity index 100%
rename from CarManagerV3/MainForm.cs
rename to CarManagerV3/Forms/MainForm.cs
diff --git a/CarManagerV3/MainForm.resx b/CarManagerV3/Forms/MainForm.resx
similarity index 100%
rename from CarManagerV3/MainForm.resx
rename to CarManagerV3/Forms/MainForm.resx
diff --git a/CarManagerV3/PleaseWait.Designer.cs b/CarManagerV3/Forms/Util/PleaseWait.Designer.cs
similarity index 100%
rename from CarManagerV3/PleaseWait.Designer.cs
rename to CarManagerV3/Forms/Util/PleaseWait.Designer.cs
diff --git a/CarManagerV3/PleaseWait.cs b/CarManagerV3/Forms/Util/PleaseWait.cs
similarity index 100%
rename from CarManagerV3/PleaseWait.cs
rename to CarManagerV3/Forms/Util/PleaseWait.cs
diff --git a/CarManagerV3/PleaseWait.resx b/CarManagerV3/Forms/Util/PleaseWait.resx
similarity index 100%
rename from CarManagerV3/PleaseWait.resx
rename to CarManagerV3/Forms/Util/PleaseWait.resx
diff --git a/CarManagerV3/ImageManager.cs b/CarManagerV3/Manager/ImageManager.cs
similarity index 100%
rename from CarManagerV3/ImageManager.cs
rename to CarManagerV3/Manager/ImageManager.cs
diff --git a/CarManagerV3/SafeManager.cs b/CarManagerV3/Manager/SafeManager.cs
similarity index 100%
rename from CarManagerV3/SafeManager.cs
rename to CarManagerV3/Manager/SafeManager.cs
diff --git a/CarManagerV3/StateManager.cs b/CarManagerV3/Manager/StateManager.cs
similarity index 100%
rename from CarManagerV3/StateManager.cs
rename to CarManagerV3/Manager/StateManager.cs