diff --git a/TweetDuck.sln b/TweetDuck.sln
index 1aaf9849..fb280a64 100644
--- a/TweetDuck.sln
+++ b/TweetDuck.sln
@@ -4,9 +4,9 @@ VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck", "TweetDuck.csproj", "{2389A7CD-E0D3-4706-8294-092929A33A2D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Browser", "subprocess\TweetDuck.Browser.csproj", "{B10B0017-819E-4F71-870F-8256B36A26AA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Browser", "windows\TweetDuck.Browser\TweetDuck.Browser.csproj", "{B10B0017-819E-4F71-870F-8256B36A26AA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Video", "video\TweetDuck.Video.csproj", "{278B2D11-402D-44B6-B6A1-8FA67DB65565}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Video", "windows\TweetDuck.Video\TweetDuck.Video.csproj", "{278B2D11-402D-44B6-B6A1-8FA67DB65565}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetLib.Communication", "lib\TweetLib.Communication\TweetLib.Communication.csproj", "{72473763-4B9D-4FB6-A923-9364B2680F06}"
 EndProject
diff --git a/subprocess/Program.cs b/windows/TweetDuck.Browser/Program.cs
similarity index 100%
rename from subprocess/Program.cs
rename to windows/TweetDuck.Browser/Program.cs
diff --git a/subprocess/Properties/AssemblyInfo.cs b/windows/TweetDuck.Browser/Properties/AssemblyInfo.cs
similarity index 100%
rename from subprocess/Properties/AssemblyInfo.cs
rename to windows/TweetDuck.Browser/Properties/AssemblyInfo.cs
diff --git a/subprocess/TweetDuck.Browser.csproj b/windows/TweetDuck.Browser/TweetDuck.Browser.csproj
similarity index 79%
rename from subprocess/TweetDuck.Browser.csproj
rename to windows/TweetDuck.Browser/TweetDuck.Browser.csproj
index e4c57640..1e8f7a40 100644
--- a/subprocess/TweetDuck.Browser.csproj
+++ b/windows/TweetDuck.Browser/TweetDuck.Browser.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" />
+  <Import Project="..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -31,16 +31,16 @@
   <ItemGroup>
     <Reference Include="CefSharp, Version=96.0.260, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\CefSharp.Common.96.0.180\lib\net452\CefSharp.dll</HintPath>
+      <HintPath>..\..\packages\CefSharp.Common.96.0.180\lib\net452\CefSharp.dll</HintPath>
     </Reference>
     <Reference Include="CefSharp.BrowserSubprocess.Core, Version=96.0.260, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\CefSharp.Common.96.0.180\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
+      <HintPath>..\..\packages\CefSharp.Common.96.0.180\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Version.cs">
+    <Compile Include="..\..\Version.cs">
       <Link>Version.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
@@ -58,6 +58,6 @@ editbin /largeaddressaware /TSAWARE "$(TargetPath)"</PostBuildEvent>
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props'))" />
   </Target>
 </Project>
diff --git a/subprocess/packages.config b/windows/TweetDuck.Browser/packages.config
similarity index 100%
rename from subprocess/packages.config
rename to windows/TweetDuck.Browser/packages.config
diff --git a/video/Controls/ControlWMP.cs b/windows/TweetDuck.Video/Controls/ControlWMP.cs
similarity index 100%
rename from video/Controls/ControlWMP.cs
rename to windows/TweetDuck.Video/Controls/ControlWMP.cs
diff --git a/video/Controls/LabelTooltip.cs b/windows/TweetDuck.Video/Controls/LabelTooltip.cs
similarity index 100%
rename from video/Controls/LabelTooltip.cs
rename to windows/TweetDuck.Video/Controls/LabelTooltip.cs
diff --git a/video/Controls/SeekBar.cs b/windows/TweetDuck.Video/Controls/SeekBar.cs
similarity index 100%
rename from video/Controls/SeekBar.cs
rename to windows/TweetDuck.Video/Controls/SeekBar.cs
diff --git a/video/FormPlayer.Designer.cs b/windows/TweetDuck.Video/FormPlayer.Designer.cs
similarity index 100%
rename from video/FormPlayer.Designer.cs
rename to windows/TweetDuck.Video/FormPlayer.Designer.cs
diff --git a/video/FormPlayer.cs b/windows/TweetDuck.Video/FormPlayer.cs
similarity index 100%
rename from video/FormPlayer.cs
rename to windows/TweetDuck.Video/FormPlayer.cs
diff --git a/video/NativeMethods.cs b/windows/TweetDuck.Video/NativeMethods.cs
similarity index 100%
rename from video/NativeMethods.cs
rename to windows/TweetDuck.Video/NativeMethods.cs
diff --git a/video/Program.cs b/windows/TweetDuck.Video/Program.cs
similarity index 100%
rename from video/Program.cs
rename to windows/TweetDuck.Video/Program.cs
diff --git a/video/Properties/AssemblyInfo.cs b/windows/TweetDuck.Video/Properties/AssemblyInfo.cs
similarity index 100%
rename from video/Properties/AssemblyInfo.cs
rename to windows/TweetDuck.Video/Properties/AssemblyInfo.cs
diff --git a/video/Properties/Resources.Designer.cs b/windows/TweetDuck.Video/Properties/Resources.Designer.cs
similarity index 100%
rename from video/Properties/Resources.Designer.cs
rename to windows/TweetDuck.Video/Properties/Resources.Designer.cs
diff --git a/video/Properties/Resources.resx b/windows/TweetDuck.Video/Properties/Resources.resx
similarity index 100%
rename from video/Properties/Resources.resx
rename to windows/TweetDuck.Video/Properties/Resources.resx
diff --git a/video/Resources/btnClose.png b/windows/TweetDuck.Video/Resources/btnClose.png
similarity index 100%
rename from video/Resources/btnClose.png
rename to windows/TweetDuck.Video/Resources/btnClose.png
diff --git a/video/Resources/btnDownload.png b/windows/TweetDuck.Video/Resources/btnDownload.png
similarity index 100%
rename from video/Resources/btnDownload.png
rename to windows/TweetDuck.Video/Resources/btnDownload.png
diff --git a/video/Resources/btnResize.png b/windows/TweetDuck.Video/Resources/btnResize.png
similarity index 100%
rename from video/Resources/btnResize.png
rename to windows/TweetDuck.Video/Resources/btnResize.png
diff --git a/video/Resources/icon.ico b/windows/TweetDuck.Video/Resources/icon.ico
similarity index 100%
rename from video/Resources/icon.ico
rename to windows/TweetDuck.Video/Resources/icon.ico
diff --git a/video/TweetDuck.Video.csproj b/windows/TweetDuck.Video/TweetDuck.Video.csproj
similarity index 87%
rename from video/TweetDuck.Video.csproj
rename to windows/TweetDuck.Video/TweetDuck.Video.csproj
index 643d209d..df1df87e 100644
--- a/video/TweetDuck.Video.csproj
+++ b/windows/TweetDuck.Video/TweetDuck.Video.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" />
+  <Import Project="..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -49,7 +49,7 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Version.cs">
+    <Compile Include="..\..\Version.cs">
       <Link>Version.cs</Link>
     </Compile>
     <Compile Include="Controls\ControlWMP.cs">
@@ -95,9 +95,9 @@
     <Content Include="Resources\icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\lib\TweetLib.Communication\TweetLib.Communication.csproj">
+    <ProjectReference Include="..\..\lib\TweetLib.Communication\TweetLib.Communication.csproj">
       <Project>{72473763-4b9d-4fb6-a923-9364b2680f06}</Project>
-      <Name>TweetLib.Windows</Name>
+      <Name>TweetLib.Communication</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -111,6 +111,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/video/packages.config b/windows/TweetDuck.Video/packages.config
similarity index 100%
rename from video/packages.config
rename to windows/TweetDuck.Video/packages.config