diff --git a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj
index 0dddb34..141200c 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
@@ -66,64 +66,64 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AboutWindow.cs">
+    <Compile Include="Windows\AboutWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AboutWindow.Designer.cs">
+    <Compile Include="Windows\AboutWindow.Designer.cs">
       <DependentUpon>AboutWindow.cs</DependentUpon>
     </Compile>
     <Compile Include="Command.cs" />
     <Compile Include="Commander.cs" />
     <Compile Include="Drawer.cs" />
-    <Compile Include="DrawPreview.cs">
+    <Compile Include="Windows\DrawPreview.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DrawPreview.Designer.cs">
+    <Compile Include="Windows\DrawPreview.Designer.cs">
       <DependentUpon>DrawPreview.cs</DependentUpon>
     </Compile>
-    <Compile Include="DetailsWindow.cs">
+    <Compile Include="Windows\DetailsWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DetailsWindow.Designer.cs">
+    <Compile Include="Windows\DetailsWindow.Designer.cs">
       <DependentUpon>DetailsWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="ErrorWindow.cs">
+    <Compile Include="Windows\ErrorWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="ErrorWindow.Designer.cs">
+    <Compile Include="Windows\ErrorWindow.Designer.cs">
       <DependentUpon>ErrorWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="TextEditor.cs">
+    <Compile Include="Windows\TextEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="TextEditor.Designer.cs">
+    <Compile Include="Windows\TextEditor.Designer.cs">
       <DependentUpon>TextEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="SettingsAndHelperFunctions.cs" />
-    <Compile Include="Menu.cs">
+    <Compile Include="Windows\Menu.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Menu.Designer.cs">
+    <Compile Include="Windows\Menu.Designer.cs">
       <DependentUpon>Menu.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="AboutWindow.resx">
+    <EmbeddedResource Include="Windows\AboutWindow.resx">
       <DependentUpon>AboutWindow.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DrawPreview.resx">
+    <EmbeddedResource Include="Windows\DrawPreview.resx">
       <DependentUpon>DrawPreview.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DetailsWindow.resx">
+    <EmbeddedResource Include="Windows\DetailsWindow.resx">
       <DependentUpon>DetailsWindow.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ErrorWindow.resx">
+    <EmbeddedResource Include="Windows\ErrorWindow.resx">
       <DependentUpon>ErrorWindow.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="TextEditor.resx">
+    <EmbeddedResource Include="Windows\TextEditor.resx">
       <DependentUpon>TextEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Menu.resx">
+    <EmbeddedResource Include="Windows\Menu.resx">
       <DependentUpon>Menu.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
diff --git a/Advanced Software Engineering/Advanced Software Engineering/AboutWindow.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/AboutWindow.Designer.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/AboutWindow.Designer.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/AboutWindow.Designer.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/AboutWindow.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/AboutWindow.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/AboutWindow.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/AboutWindow.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/AboutWindow.resx b/Advanced Software Engineering/Advanced Software Engineering/Windows/AboutWindow.resx
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/AboutWindow.resx
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/AboutWindow.resx
diff --git a/Advanced Software Engineering/Advanced Software Engineering/DetailsWindow.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/DetailsWindow.Designer.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/DetailsWindow.Designer.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/DetailsWindow.Designer.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/DetailsWindow.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/DetailsWindow.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/DetailsWindow.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/DetailsWindow.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/DetailsWindow.resx b/Advanced Software Engineering/Advanced Software Engineering/Windows/DetailsWindow.resx
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/DetailsWindow.resx
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/DetailsWindow.resx
diff --git a/Advanced Software Engineering/Advanced Software Engineering/DrawPreview.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.Designer.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/DrawPreview.Designer.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.Designer.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/DrawPreview.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/DrawPreview.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/DrawPreview.resx b/Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.resx
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/DrawPreview.resx
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.resx
diff --git a/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.Designer.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.Designer.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.Designer.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.resx b/Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.resx
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.resx
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.resx
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Menu.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/Menu.Designer.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Menu.Designer.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/Menu.Designer.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Menu.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/Menu.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Menu.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/Menu.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Menu.resx b/Advanced Software Engineering/Advanced Software Engineering/Windows/Menu.resx
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Menu.resx
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/Menu.resx
diff --git a/Advanced Software Engineering/Advanced Software Engineering/TextEditor.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.Designer.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/TextEditor.Designer.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.Designer.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/TextEditor.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/TextEditor.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/TextEditor.resx b/Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.resx
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/TextEditor.resx
rename to Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.resx