diff --git a/ShareX.ImageEffectsLib/ImageEffectPackagerForm.Designer.cs b/ShareX.ImageEffectsLib/Forms/ImageEffectPackagerForm.Designer.cs
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectPackagerForm.Designer.cs
rename to ShareX.ImageEffectsLib/Forms/ImageEffectPackagerForm.Designer.cs
diff --git a/ShareX.ImageEffectsLib/ImageEffectPackagerForm.cs b/ShareX.ImageEffectsLib/Forms/ImageEffectPackagerForm.cs
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectPackagerForm.cs
rename to ShareX.ImageEffectsLib/Forms/ImageEffectPackagerForm.cs
diff --git a/ShareX.ImageEffectsLib/ImageEffectPackagerForm.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectPackagerForm.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectPackagerForm.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectPackagerForm.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.Designer.cs
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.Designer.cs
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.cs b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.cs
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.cs
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.cs
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.de.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.de.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.de.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.de.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.es-MX.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.es-MX.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.es-MX.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.es-MX.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.es.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.es.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.es.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.es.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.fa-IR.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.fa-IR.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.fa-IR.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.fa-IR.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.fr.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.fr.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.fr.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.fr.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.hu.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.hu.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.hu.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.hu.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.id-ID.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.id-ID.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.id-ID.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.id-ID.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.it-IT.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.it-IT.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.it-IT.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.it-IT.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.ko-KR.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.ko-KR.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.ko-KR.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.ko-KR.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.nl-NL.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.nl-NL.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.nl-NL.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.nl-NL.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.pt-BR.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.pt-BR.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.pt-BR.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.pt-BR.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.pt-PT.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.pt-PT.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.pt-PT.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.pt-PT.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.ru.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.ru.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.ru.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.ru.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.tr.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.tr.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.tr.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.tr.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.uk.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.uk.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.uk.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.uk.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.vi-VN.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.vi-VN.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.vi-VN.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.vi-VN.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.zh-CN.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.zh-CN.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.zh-CN.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.zh-CN.resx
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.zh-TW.resx b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.zh-TW.resx
similarity index 100%
rename from ShareX.ImageEffectsLib/ImageEffectsForm.zh-TW.resx
rename to ShareX.ImageEffectsLib/Forms/ImageEffectsForm.zh-TW.resx
diff --git a/ShareX.ImageEffectsLib/WatermarkForm.Designer.cs b/ShareX.ImageEffectsLib/Forms/WatermarkForm.Designer.cs
similarity index 100%
rename from ShareX.ImageEffectsLib/WatermarkForm.Designer.cs
rename to ShareX.ImageEffectsLib/Forms/WatermarkForm.Designer.cs
diff --git a/ShareX.ImageEffectsLib/WatermarkForm.cs b/ShareX.ImageEffectsLib/Forms/WatermarkForm.cs
similarity index 100%
rename from ShareX.ImageEffectsLib/WatermarkForm.cs
rename to ShareX.ImageEffectsLib/Forms/WatermarkForm.cs
diff --git a/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
index 07a12fd5b..bdc435657 100644
--- a/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
+++ b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
@@ -133,10 +133,10 @@
     <Compile Include="Adjustments\Inverse.cs" />
     <Compile Include="Adjustments\Saturation.cs" />
     <Compile Include="ImageEffectPackager.cs" />
-    <Compile Include="ImageEffectPackagerForm.cs">
+    <Compile Include="Forms\ImageEffectPackagerForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="ImageEffectPackagerForm.Designer.cs">
+    <Compile Include="Forms\ImageEffectPackagerForm.Designer.cs">
       <DependentUpon>ImageEffectPackagerForm.cs</DependentUpon>
     </Compile>
     <Compile Include="ImageEffectPreset.cs" />
@@ -152,10 +152,10 @@
     <Compile Include="Manipulations\Flip.cs" />
     <Compile Include="Manipulations\Scale.cs" />
     <Compile Include="ImageEffect.cs" />
-    <Compile Include="ImageEffectsForm.cs">
+    <Compile Include="Forms\ImageEffectsForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="ImageEffectsForm.Designer.cs">
+    <Compile Include="Forms\ImageEffectsForm.Designer.cs">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Drawings\DrawBorder.cs" />
@@ -169,10 +169,10 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="WatermarkConfig.cs" />
-    <Compile Include="WatermarkForm.cs">
+    <Compile Include="Forms\WatermarkForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="WatermarkForm.Designer.cs">
+    <Compile Include="Forms\WatermarkForm.Designer.cs">
       <DependentUpon>WatermarkForm.cs</DependentUpon>
     </Compile>
   </ItemGroup>
@@ -183,64 +183,64 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="ImageEffectPackagerForm.resx">
+    <EmbeddedResource Include="Forms\ImageEffectPackagerForm.resx">
       <DependentUpon>ImageEffectPackagerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.de.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.de.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.es-MX.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.es-MX.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.es.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.es.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.fa-IR.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.fa-IR.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.fr.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.fr.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.hu.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.hu.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.id-ID.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.id-ID.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.it-IT.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.it-IT.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.ko-KR.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.ko-KR.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.nl-NL.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.nl-NL.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.pt-BR.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.pt-BR.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.pt-PT.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.pt-PT.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.ru.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.ru.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.tr.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.tr.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.uk.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.uk.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.vi-VN.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.vi-VN.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.zh-CN.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.zh-CN.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ImageEffectsForm.zh-TW.resx">
+    <EmbeddedResource Include="Forms\ImageEffectsForm.zh-TW.resx">
       <DependentUpon>ImageEffectsForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.de.resx" />