diff --git a/TweetDuck.csproj b/TweetDuck.csproj
index f69f91f2..9acbb375 100644
--- a/TweetDuck.csproj
+++ b/TweetDuck.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props')" />
   <Import Project="packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props')" />
@@ -343,7 +343,7 @@
       <Project>{b10b0017-819e-4f71-870f-8256b36a26aa}</Project>
       <Name>TweetDuck.Browser</Name>
     </ProjectReference>
-    <ProjectReference Include="video\TweetDuck.Video\TweetDuck.Video.csproj">
+    <ProjectReference Include="video\TweetDuck.Video.csproj">
       <Project>{278b2d11-402d-44b6-b6a1-8fa67db65565}</Project>
       <Name>TweetDuck.Video</Name>
     </ProjectReference>
diff --git a/TweetDuck.sln b/TweetDuck.sln
index ee5b5c76..95c0b692 100644
--- a/TweetDuck.sln
+++ b/TweetDuck.sln
@@ -10,7 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "tests\UnitTest
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetLib.Audio", "lib\TweetLib.Audio\TweetLib.Audio.csproj", "{E9E1FD1B-F480-45B7-9970-BE2ECFD309AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Video", "video\TweetDuck.Video\TweetDuck.Video.csproj", "{278B2D11-402D-44B6-B6A1-8FA67DB65565}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Video", "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/video/TweetDuck.Video/Controls/ControlWMP.cs b/video/Controls/ControlWMP.cs
similarity index 100%
rename from video/TweetDuck.Video/Controls/ControlWMP.cs
rename to video/Controls/ControlWMP.cs
diff --git a/video/TweetDuck.Video/Controls/SeekBar.cs b/video/Controls/SeekBar.cs
similarity index 100%
rename from video/TweetDuck.Video/Controls/SeekBar.cs
rename to video/Controls/SeekBar.cs
diff --git a/video/TweetDuck.Video/FormPlayer.Designer.cs b/video/FormPlayer.Designer.cs
similarity index 100%
rename from video/TweetDuck.Video/FormPlayer.Designer.cs
rename to video/FormPlayer.Designer.cs
diff --git a/video/TweetDuck.Video/FormPlayer.cs b/video/FormPlayer.cs
similarity index 100%
rename from video/TweetDuck.Video/FormPlayer.cs
rename to video/FormPlayer.cs
diff --git a/video/TweetDuck.Video/NativeMethods.cs b/video/NativeMethods.cs
similarity index 100%
rename from video/TweetDuck.Video/NativeMethods.cs
rename to video/NativeMethods.cs
diff --git a/video/TweetDuck.Video/Program.cs b/video/Program.cs
similarity index 98%
rename from video/TweetDuck.Video/Program.cs
rename to video/Program.cs
index 8f514203..8a6b7f03 100644
--- a/video/TweetDuck.Video/Program.cs
+++ b/video/Program.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using System.Windows.Forms;
-using TweetLib.Communication;
 
 namespace TweetDuck.Video{
     static class Program{
diff --git a/video/TweetDuck.Video/Properties/AssemblyInfo.cs b/video/Properties/AssemblyInfo.cs
similarity index 100%
rename from video/TweetDuck.Video/Properties/AssemblyInfo.cs
rename to video/Properties/AssemblyInfo.cs
diff --git a/video/TweetDuck.Video/Resources/icon.ico b/video/Resources/icon.ico
similarity index 100%
rename from video/TweetDuck.Video/Resources/icon.ico
rename to video/Resources/icon.ico
diff --git a/video/TweetDuck.Video/TweetDuck.Video.csproj b/video/TweetDuck.Video.csproj
similarity index 97%
rename from video/TweetDuck.Video/TweetDuck.Video.csproj
rename to video/TweetDuck.Video.csproj
index dcbb7401..dd162f17 100644
--- a/video/TweetDuck.Video/TweetDuck.Video.csproj
+++ b/video/TweetDuck.Video.csproj
@@ -75,7 +75,7 @@
     <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>
     </ProjectReference>