diff --git a/icon.ico b/Resources/icon.ico
similarity index 100%
rename from icon.ico
rename to Resources/icon.ico
diff --git a/rdp-portal.csproj b/rdp-portal.csproj
index 94c422d..c521035 100644
--- a/rdp-portal.csproj
+++ b/rdp-portal.csproj
@@ -15,7 +15,7 @@
         <Deterministic>true</Deterministic>
         <LangVersion>8</LangVersion>
         <Nullable>enable</Nullable>
-        <ApplicationIcon>icon.ico</ApplicationIcon>
+        <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <PlatformTarget>AnyCPU</PlatformTarget>
@@ -140,31 +140,25 @@
         </Reference>
     </ItemGroup>
     <ItemGroup>
-        <Compile Include="About.cs">
-          <SubType>Form</SubType>
-        </Compile>
-        <Compile Include="About.Designer.cs">
-          <DependentUpon>About.cs</DependentUpon>
-        </Compile>
-        <Compile Include="Config.cs" />
-        <Compile Include="MainForm.cs">
-            <SubType>Form</SubType>
-        </Compile>
-        <Compile Include="MainForm.Designer.cs">
-            <DependentUpon>MainForm.cs</DependentUpon>
-        </Compile>
-        <Compile Include="Mstscpw.cs" />
-        <Compile Include="Profile.cs" />
         <Compile Include="Program.cs" />
         <Compile Include="Properties\AssemblyInfo.cs" />
-        <Compile Include="RdpFile.cs" />
-        <Compile Include="StringUtil.cs" />
-        <EmbeddedResource Include="About.resx">
+        <Compile Include="src\About.cs">
+          <SubType>Form</SubType>
+        </Compile>
+        <Compile Include="src\About.Designer.cs">
           <DependentUpon>About.cs</DependentUpon>
-        </EmbeddedResource>
-        <EmbeddedResource Include="MainForm.resx">
+        </Compile>
+        <Compile Include="src\Config.cs" />
+        <Compile Include="src\MainForm.cs">
+          <SubType>Form</SubType>
+        </Compile>
+        <Compile Include="src\MainForm.Designer.cs">
           <DependentUpon>MainForm.cs</DependentUpon>
-        </EmbeddedResource>
+        </Compile>
+        <Compile Include="src\Mstscpw.cs" />
+        <Compile Include="src\Profile.cs" />
+        <Compile Include="src\RdpFile.cs" />
+        <Compile Include="src\StringUtil.cs" />
         <EmbeddedResource Include="Properties\Resources.resx">
             <Generator>ResXFileCodeGenerator</Generator>
             <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -174,7 +168,12 @@
             <AutoGen>True</AutoGen>
             <DependentUpon>Resources.resx</DependentUpon>
         </Compile>
-        <None Include="icon.ico" />
+        <EmbeddedResource Include="src\About.resx">
+          <DependentUpon>About.cs</DependentUpon>
+        </EmbeddedResource>
+        <EmbeddedResource Include="src\MainForm.resx">
+          <DependentUpon>MainForm.cs</DependentUpon>
+        </EmbeddedResource>
         <None Include="packages.config" />
         <None Include="Properties\Settings.settings">
             <Generator>SettingsSingleFileGenerator</Generator>
@@ -185,6 +184,7 @@
             <DependentUpon>Settings.settings</DependentUpon>
             <DesignTimeSharedInput>True</DesignTimeSharedInput>
         </Compile>
+        <None Include="Resources\icon.ico" />
     </ItemGroup>
     <ItemGroup>
         <None Include="App.config" />
diff --git a/About.Designer.cs b/src/About.Designer.cs
similarity index 100%
rename from About.Designer.cs
rename to src/About.Designer.cs
diff --git a/About.cs b/src/About.cs
similarity index 100%
rename from About.cs
rename to src/About.cs
diff --git a/About.resx b/src/About.resx
similarity index 100%
rename from About.resx
rename to src/About.resx
diff --git a/Config.cs b/src/Config.cs
similarity index 100%
rename from Config.cs
rename to src/Config.cs
diff --git a/MainForm.Designer.cs b/src/MainForm.Designer.cs
similarity index 100%
rename from MainForm.Designer.cs
rename to src/MainForm.Designer.cs
diff --git a/MainForm.cs b/src/MainForm.cs
similarity index 100%
rename from MainForm.cs
rename to src/MainForm.cs
diff --git a/MainForm.resx b/src/MainForm.resx
similarity index 100%
rename from MainForm.resx
rename to src/MainForm.resx
diff --git a/Mstscpw.cs b/src/Mstscpw.cs
similarity index 100%
rename from Mstscpw.cs
rename to src/Mstscpw.cs
diff --git a/Profile.cs b/src/Profile.cs
similarity index 100%
rename from Profile.cs
rename to src/Profile.cs
diff --git a/RdpFile.cs b/src/RdpFile.cs
similarity index 100%
rename from RdpFile.cs
rename to src/RdpFile.cs
diff --git a/StringUtil.cs b/src/StringUtil.cs
similarity index 100%
rename from StringUtil.cs
rename to src/StringUtil.cs