diff --git a/SaveWizard/MainForm.Designer.cs b/SaveWizard/MainForm/MainForm.Designer.cs
similarity index 100%
rename from SaveWizard/MainForm.Designer.cs
rename to SaveWizard/MainForm/MainForm.Designer.cs
diff --git a/SaveWizard/MainForm.cs b/SaveWizard/MainForm/MainForm.cs
similarity index 100%
rename from SaveWizard/MainForm.cs
rename to SaveWizard/MainForm/MainForm.cs
diff --git a/SaveWizard/MainForm.resx b/SaveWizard/MainForm/MainForm.resx
similarity index 100%
rename from SaveWizard/MainForm.resx
rename to SaveWizard/MainForm/MainForm.resx
diff --git a/SaveWizard/SaveWizard.csproj b/SaveWizard/SaveWizard.csproj
index 9c1167e..56c609d 100644
--- a/SaveWizard/SaveWizard.csproj
+++ b/SaveWizard/SaveWizard.csproj
@@ -66,35 +66,35 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SecondForm.cs">
+    <Compile Include="SecondForm\SecondForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SecondForm.Designer.cs">
+    <Compile Include="SecondForm\SecondForm.Designer.cs">
       <DependentUpon>SecondForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="UpdateForm.cs">
+    <Compile Include="UpdateForm\UpdateForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UpdateForm.Designer.cs">
+    <Compile Include="UpdateForm\UpdateForm.Designer.cs">
       <DependentUpon>UpdateForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Utils.cs" />
     <Compile Include="RegexHandler.cs" />
-    <Compile Include="MainForm.cs">
+    <Compile Include="MainForm\MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm.Designer.cs">
+    <Compile Include="MainForm\MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="MainForm.resx">
+    <EmbeddedResource Include="MainForm\MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SecondForm.resx">
+    <EmbeddedResource Include="SecondForm\SecondForm.resx">
       <DependentUpon>SecondForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UpdateForm.resx">
+    <EmbeddedResource Include="UpdateForm\UpdateForm.resx">
       <DependentUpon>UpdateForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
diff --git a/SaveWizard/SecondForm.Designer.cs b/SaveWizard/SecondForm/SecondForm.Designer.cs
similarity index 100%
rename from SaveWizard/SecondForm.Designer.cs
rename to SaveWizard/SecondForm/SecondForm.Designer.cs
diff --git a/SaveWizard/SecondForm.cs b/SaveWizard/SecondForm/SecondForm.cs
similarity index 100%
rename from SaveWizard/SecondForm.cs
rename to SaveWizard/SecondForm/SecondForm.cs
diff --git a/SaveWizard/SecondForm.resx b/SaveWizard/SecondForm/SecondForm.resx
similarity index 100%
rename from SaveWizard/SecondForm.resx
rename to SaveWizard/SecondForm/SecondForm.resx
diff --git a/SaveWizard/UpdateForm.Designer.cs b/SaveWizard/UpdateForm/UpdateForm.Designer.cs
similarity index 100%
rename from SaveWizard/UpdateForm.Designer.cs
rename to SaveWizard/UpdateForm/UpdateForm.Designer.cs
diff --git a/SaveWizard/UpdateForm.cs b/SaveWizard/UpdateForm/UpdateForm.cs
similarity index 100%
rename from SaveWizard/UpdateForm.cs
rename to SaveWizard/UpdateForm/UpdateForm.cs
diff --git a/SaveWizard/UpdateForm.resx b/SaveWizard/UpdateForm/UpdateForm.resx
similarity index 100%
rename from SaveWizard/UpdateForm.resx
rename to SaveWizard/UpdateForm/UpdateForm.resx