diff --git a/02_Windows_App/Perun_v1/App.config b/02_Windows_App/Perun_v1/00_Config/App.config
similarity index 100%
rename from 02_Windows_App/Perun_v1/App.config
rename to 02_Windows_App/Perun_v1/00_Config/App.config
diff --git a/02_Windows_App/Perun_v1/packages.config b/02_Windows_App/Perun_v1/00_Config/packages.config
similarity index 100%
rename from 02_Windows_App/Perun_v1/packages.config
rename to 02_Windows_App/Perun_v1/00_Config/packages.config
diff --git a/02_Windows_App/Perun_v1/Program.cs b/02_Windows_App/Perun_v1/01_Classes/Program.cs
similarity index 100%
rename from 02_Windows_App/Perun_v1/Program.cs
rename to 02_Windows_App/Perun_v1/01_Classes/Program.cs
diff --git a/02_Windows_App/Perun_v1/form_Main.Designer.cs b/02_Windows_App/Perun_v1/02_Forms/form_Main.Designer.cs
similarity index 100%
rename from 02_Windows_App/Perun_v1/form_Main.Designer.cs
rename to 02_Windows_App/Perun_v1/02_Forms/form_Main.Designer.cs
diff --git a/02_Windows_App/Perun_v1/form_Main.cs b/02_Windows_App/Perun_v1/02_Forms/form_Main.cs
similarity index 99%
rename from 02_Windows_App/Perun_v1/form_Main.cs
rename to 02_Windows_App/Perun_v1/02_Forms/form_Main.cs
index ccd5477..22d062b 100644
--- a/02_Windows_App/Perun_v1/form_Main.cs
+++ b/02_Windows_App/Perun_v1/02_Forms/form_Main.cs
@@ -210,7 +210,7 @@ namespace Perun_v1
         private void form_Main_Load(object sender, EventArgs e)
         {
             // Form loaded - fill controls with default values
-            LogHistory[0] = DateTime.Now.ToString("HH:mm:ss") + " > " + "Perun loaded...";
+            LogHistory[0] = DateTime.Now.ToString("HH:mm:ss") + " > " + "Perun loaded";
 
             // Load settings
             con_txt_mysql_database.Text = Properties.Settings.Default.MYSQL_DB;
diff --git a/02_Windows_App/Perun_v1/form_Main.resx b/02_Windows_App/Perun_v1/02_Forms/form_Main.resx
similarity index 100%
rename from 02_Windows_App/Perun_v1/form_Main.resx
rename to 02_Windows_App/Perun_v1/02_Forms/form_Main.resx
diff --git a/02_Windows_App/Perun_v1/perun_logo.ico b/02_Windows_App/Perun_v1/03_Resources/perun_logo.ico
similarity index 100%
rename from 02_Windows_App/Perun_v1/perun_logo.ico
rename to 02_Windows_App/Perun_v1/03_Resources/perun_logo.ico
diff --git a/02_Windows_App/Perun_v1/Perun_v1.csproj b/02_Windows_App/Perun_v1/Perun_v1.csproj
index c9f34f2..f867364 100644
--- a/02_Windows_App/Perun_v1/Perun_v1.csproj
+++ b/02_Windows_App/Perun_v1/Perun_v1.csproj
@@ -61,7 +61,7 @@
     </DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>perun_logo.ico</ApplicationIcon>
+    <ApplicationIcon>03_Resources\perun_logo.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>2ACE4C8C2C325A04CA5986B1CD76744B4B03755D</ManifestCertificateThumbprint>
@@ -116,15 +116,15 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="form_Main.cs">
+    <Compile Include="02_Forms\form_Main.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="form_Main.Designer.cs">
+    <Compile Include="02_Forms\form_Main.Designer.cs">
       <DependentUpon>form_Main.cs</DependentUpon>
     </Compile>
-    <Compile Include="Program.cs" />
+    <Compile Include="01_Classes\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="form_Main.resx">
+    <EmbeddedResource Include="02_Forms\form_Main.resx">
       <DependentUpon>form_Main.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -137,8 +137,8 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="packages.config" />
-    <None Include="Perun_v1_TemporaryKey.pfx" />
+    <None Include="00_Config\packages.config" />
+    <None Include="00_Config\Perun_v1_TemporaryKey.pfx" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -151,7 +151,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="00_Config\App.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
@@ -166,10 +166,8 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="perun_logo.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
+    <Content Include="03_Resources\perun_logo.ico" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file