diff --git a/CodeWalker.csproj b/CodeWalker.csproj
index f39166b..f7c74b7 100644
--- a/CodeWalker.csproj
+++ b/CodeWalker.csproj
@@ -137,10 +137,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AboutForm.cs">
+    <Compile Include="Tools\AboutForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AboutForm.Designer.cs">
+    <Compile Include="Tools\AboutForm.Designer.cs">
       <DependentUpon>AboutForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\GenericForm.cs">
@@ -155,10 +155,10 @@
     <Compile Include="Forms\ModelMatForm.Designer.cs">
       <DependentUpon>ModelMatForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Peds\PedsForm.cs">
+    <Compile Include="PedsForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Peds\PedsForm.Designer.cs">
+    <Compile Include="PedsForm.Designer.cs">
       <DependentUpon>PedsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Project\Panels\GenerateLODLightsPanel.cs">
@@ -307,10 +307,10 @@
     <Compile Include="Tools\JenkIndForm.Designer.cs">
       <DependentUpon>JenkIndForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="KeyBindForm.cs">
+    <Compile Include="Utils\KeyBindForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="KeyBindForm.Designer.cs">
+    <Compile Include="Utils\KeyBindForm.Designer.cs">
       <DependentUpon>KeyBindForm.cs</DependentUpon>
     </Compile>
     <Compile Include="MenuForm.cs">
@@ -533,23 +533,23 @@
     <Compile Include="Rendering\Utils\UnitDisc.cs" />
     <Compile Include="Rendering\Utils\UnitSphere.cs" />
     <Compile Include="Rendering\VertexTypes.cs" />
-    <Compile Include="SelectFolderForm.cs">
+    <Compile Include="Utils\SelectFolderForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SelectFolderForm.Designer.cs">
+    <Compile Include="Utils\SelectFolderForm.Designer.cs">
       <DependentUpon>SelectFolderForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Settings.cs" />
-    <Compile Include="SettingsForm.cs">
+    <Compile Include="World\SettingsForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SettingsForm.Designer.cs">
+    <Compile Include="World\SettingsForm.Designer.cs">
       <DependentUpon>SettingsForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="StatisticsForm.cs">
+    <Compile Include="World\StatisticsForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="StatisticsForm.Designer.cs">
+    <Compile Include="World\StatisticsForm.Designer.cs">
       <DependentUpon>StatisticsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Utils\TextInputForm.cs">
@@ -564,22 +564,22 @@
     <Compile Include="Utils\MapUtils.cs" />
     <Compile Include="GameFiles\TextureFormats.cs" />
     <Compile Include="Utils\TextureLoader.cs" />
-    <Compile Include="Vehicles\VehicleForm.cs">
+    <Compile Include="VehicleForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Vehicles\VehicleForm.Designer.cs">
+    <Compile Include="VehicleForm.Designer.cs">
       <DependentUpon>VehicleForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="WorldInfoForm.cs">
+    <Compile Include="World\WorldInfoForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="WorldInfoForm.Designer.cs">
+    <Compile Include="World\WorldInfoForm.Designer.cs">
       <DependentUpon>WorldInfoForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="WorldSearchForm.cs">
+    <Compile Include="World\WorldSearchForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="WorldSearchForm.Designer.cs">
+    <Compile Include="World\WorldSearchForm.Designer.cs">
       <DependentUpon>WorldSearchForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Rendering\DirectX\DXForm.cs" />
@@ -598,7 +598,7 @@
       <DependentUpon>WorldForm.cs</DependentUpon>
     </Compile>
     <Compile Include="World\Widget.cs" />
-    <EmbeddedResource Include="AboutForm.resx">
+    <EmbeddedResource Include="Tools\AboutForm.resx">
       <DependentUpon>AboutForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\GenericForm.resx">
@@ -607,7 +607,7 @@
     <EmbeddedResource Include="Forms\ModelMatForm.resx">
       <DependentUpon>ModelMatForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Peds\PedsForm.resx">
+    <EmbeddedResource Include="PedsForm.resx">
       <DependentUpon>PedsForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Project\Panels\GenerateLODLightsPanel.resx">
@@ -682,7 +682,7 @@
     <EmbeddedResource Include="Tools\JenkIndForm.resx">
       <DependentUpon>JenkIndForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="KeyBindForm.resx">
+    <EmbeddedResource Include="Utils\KeyBindForm.resx">
       <DependentUpon>KeyBindForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="MenuForm.resx">
@@ -791,28 +791,28 @@
     <EmbeddedResource Include="Tools\BinarySearchForm.resx">
       <DependentUpon>BinarySearchForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SelectFolderForm.resx">
+    <EmbeddedResource Include="Utils\SelectFolderForm.resx">
       <DependentUpon>SelectFolderForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SettingsForm.resx">
+    <EmbeddedResource Include="World\SettingsForm.resx">
       <DependentUpon>SettingsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="StatisticsForm.resx">
+    <EmbeddedResource Include="World\StatisticsForm.resx">
       <DependentUpon>StatisticsForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Utils\TextInputForm.resx">
       <DependentUpon>TextInputForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Vehicles\VehicleForm.resx">
+    <EmbeddedResource Include="VehicleForm.resx">
       <DependentUpon>VehicleForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="WorldForm.resx">
       <DependentUpon>WorldForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="WorldInfoForm.resx">
+    <EmbeddedResource Include="World\WorldInfoForm.resx">
       <DependentUpon>WorldInfoForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="WorldSearchForm.resx">
+    <EmbeddedResource Include="World\WorldSearchForm.resx">
       <DependentUpon>WorldSearchForm.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="packages.config" />
diff --git a/Peds/PedsForm.Designer.cs b/PedsForm.Designer.cs
similarity index 100%
rename from Peds/PedsForm.Designer.cs
rename to PedsForm.Designer.cs
diff --git a/Peds/PedsForm.cs b/PedsForm.cs
similarity index 100%
rename from Peds/PedsForm.cs
rename to PedsForm.cs
diff --git a/Peds/PedsForm.resx b/PedsForm.resx
similarity index 100%
rename from Peds/PedsForm.resx
rename to PedsForm.resx
diff --git a/AboutForm.Designer.cs b/Tools/AboutForm.Designer.cs
similarity index 100%
rename from AboutForm.Designer.cs
rename to Tools/AboutForm.Designer.cs
diff --git a/AboutForm.cs b/Tools/AboutForm.cs
similarity index 100%
rename from AboutForm.cs
rename to Tools/AboutForm.cs
diff --git a/AboutForm.resx b/Tools/AboutForm.resx
similarity index 100%
rename from AboutForm.resx
rename to Tools/AboutForm.resx
diff --git a/KeyBindForm.Designer.cs b/Utils/KeyBindForm.Designer.cs
similarity index 100%
rename from KeyBindForm.Designer.cs
rename to Utils/KeyBindForm.Designer.cs
diff --git a/KeyBindForm.cs b/Utils/KeyBindForm.cs
similarity index 100%
rename from KeyBindForm.cs
rename to Utils/KeyBindForm.cs
diff --git a/KeyBindForm.resx b/Utils/KeyBindForm.resx
similarity index 100%
rename from KeyBindForm.resx
rename to Utils/KeyBindForm.resx
diff --git a/SelectFolderForm.Designer.cs b/Utils/SelectFolderForm.Designer.cs
similarity index 100%
rename from SelectFolderForm.Designer.cs
rename to Utils/SelectFolderForm.Designer.cs
diff --git a/SelectFolderForm.cs b/Utils/SelectFolderForm.cs
similarity index 100%
rename from SelectFolderForm.cs
rename to Utils/SelectFolderForm.cs
diff --git a/SelectFolderForm.resx b/Utils/SelectFolderForm.resx
similarity index 100%
rename from SelectFolderForm.resx
rename to Utils/SelectFolderForm.resx
diff --git a/Vehicles/VehicleForm.Designer.cs b/VehicleForm.Designer.cs
similarity index 100%
rename from Vehicles/VehicleForm.Designer.cs
rename to VehicleForm.Designer.cs
diff --git a/Vehicles/VehicleForm.cs b/VehicleForm.cs
similarity index 100%
rename from Vehicles/VehicleForm.cs
rename to VehicleForm.cs
diff --git a/Vehicles/VehicleForm.resx b/VehicleForm.resx
similarity index 100%
rename from Vehicles/VehicleForm.resx
rename to VehicleForm.resx
diff --git a/SettingsForm.Designer.cs b/World/SettingsForm.Designer.cs
similarity index 100%
rename from SettingsForm.Designer.cs
rename to World/SettingsForm.Designer.cs
diff --git a/SettingsForm.cs b/World/SettingsForm.cs
similarity index 100%
rename from SettingsForm.cs
rename to World/SettingsForm.cs
diff --git a/SettingsForm.resx b/World/SettingsForm.resx
similarity index 100%
rename from SettingsForm.resx
rename to World/SettingsForm.resx
diff --git a/StatisticsForm.Designer.cs b/World/StatisticsForm.Designer.cs
similarity index 100%
rename from StatisticsForm.Designer.cs
rename to World/StatisticsForm.Designer.cs
diff --git a/StatisticsForm.cs b/World/StatisticsForm.cs
similarity index 100%
rename from StatisticsForm.cs
rename to World/StatisticsForm.cs
diff --git a/StatisticsForm.resx b/World/StatisticsForm.resx
similarity index 100%
rename from StatisticsForm.resx
rename to World/StatisticsForm.resx
diff --git a/WorldInfoForm.Designer.cs b/World/WorldInfoForm.Designer.cs
similarity index 100%
rename from WorldInfoForm.Designer.cs
rename to World/WorldInfoForm.Designer.cs
diff --git a/WorldInfoForm.cs b/World/WorldInfoForm.cs
similarity index 100%
rename from WorldInfoForm.cs
rename to World/WorldInfoForm.cs
diff --git a/WorldInfoForm.resx b/World/WorldInfoForm.resx
similarity index 100%
rename from WorldInfoForm.resx
rename to World/WorldInfoForm.resx
diff --git a/WorldSearchForm.Designer.cs b/World/WorldSearchForm.Designer.cs
similarity index 100%
rename from WorldSearchForm.Designer.cs
rename to World/WorldSearchForm.Designer.cs
diff --git a/WorldSearchForm.cs b/World/WorldSearchForm.cs
similarity index 100%
rename from WorldSearchForm.cs
rename to World/WorldSearchForm.cs
diff --git a/WorldSearchForm.resx b/World/WorldSearchForm.resx
similarity index 100%
rename from WorldSearchForm.resx
rename to World/WorldSearchForm.resx