diff --git a/ClientServerLib/AndroidRemote/AndroidRemote.csproj b/ClientServerLib/AndroidRemote/AndroidRemote.csproj
index 91c8cc78..be3a86b4 100644
--- a/ClientServerLib/AndroidRemote/AndroidRemote.csproj
+++ b/ClientServerLib/AndroidRemote/AndroidRemote.csproj
@@ -70,15 +70,15 @@
     <Compile Include="..\ClientServerLib\DeffieHellman\StrongNumberProvider.cs">
       <Link>ClientServerLib\DeffieHellman\StrongNumberProvider.cs</Link>
     </Compile>
-    <Compile Include="..\ClientServerLib\Vocaluxe\CCommands.cs">
-      <Link>ClientServerLib\Vocaluxe\CCommands.cs</Link>
-    </Compile>
-    <Compile Include="..\ClientServerLib\Vocaluxe\VocaluxeStructs.cs">
-      <Link>ClientServerLib\Vocaluxe\VocaluxeStructs.cs</Link>
-    </Compile>
     <Compile Include="..\ClientServerLib\CDiscover.cs">
       <Link>ClientServerLib\CDiscover.cs</Link>
     </Compile>
+    <Compile Include="..\..\Vocaluxe\Base\Server\CCommands.cs">
+      <Link>ClientServerLib\Server\CCommands.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Vocaluxe\Base\Server\VocaluxeStructs.cs">
+      <Link>ClientServerLib\Server\VocaluxeStructs.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />
@@ -93,5 +93,7 @@
   <ItemGroup>
     <Folder Include="ClientServerLib\" />
     <Folder Include="Assets\" />
+    <Folder Include="ClientServerLib\Vocaluxe\" />
+    <Folder Include="ClientServerLib\Server\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ClientServerLib/ClientServerLib/CClient.cs b/ClientServerLib/ClientServerLib/CClient.cs
index 2face503..a642f55d 100644
--- a/ClientServerLib/ClientServerLib/CClient.cs
+++ b/ClientServerLib/ClientServerLib/CClient.cs
@@ -118,8 +118,8 @@ namespace ClientServerLib
                     }
                     catch
                     {
-                        connected = false;
-                        RaiseOnConnectionChanged();
+                        DoDisconnect();
+
                         for (int i = 0; i < 500; i++)
                         {
                             if (doConnect)
@@ -133,17 +133,7 @@ namespace ClientServerLib
 
                 if (connected && !doConnect)
                 {
-                    try
-                    {
-                        connection.TcpClient.Close();
-                        connection = new CConnection(new TcpClient(), -1);
-                    }
-                    catch
-                    {
-                    }
-
-                    connected = false;
-                    RaiseOnConnectionChanged();
+                    DoDisconnect();
                 }
 
                 if (doConnect && connected)
@@ -154,16 +144,31 @@ namespace ClientServerLib
                     }
                     catch
                     {
-                        connected = false;
-                        RaiseOnConnectionChanged();
+                        DoDisconnect();
                     }
 
                 }
             }
         }
 
+        private void DoDisconnect()
+        {
+            try
+            {
+                connection.TcpClient.Close();
+            }
+            catch { }
+
+            connection = new CConnection(new TcpClient(), -1);
+            connected = false;
+            RaiseOnConnectionChanged();
+        }
+
         private void Communicate()
         {
+            if (connection.TcpClient == null || !connection.TcpClient.Connected)
+                DoDisconnect();
+
             NetworkStream clientStream = connection.TcpClient.GetStream();
 
             byte[] data = new byte[bufferLength];
diff --git a/ClientServerLib/ClientServerLib/ClientServerLib.csproj b/ClientServerLib/ClientServerLib/ClientServerLib.csproj
index fbda0800..8b4826b3 100644
--- a/ClientServerLib/ClientServerLib/ClientServerLib.csproj
+++ b/ClientServerLib/ClientServerLib/ClientServerLib.csproj
@@ -31,10 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />
@@ -53,8 +49,6 @@
     <Compile Include="DeffieHellman\StrongNumberProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Structs.cs" />
-    <Compile Include="Vocaluxe\CCommands.cs" />
-    <Compile Include="Vocaluxe\VocaluxeStructs.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/ClientServerLib/ClientTest/ClientTest.csproj b/ClientServerLib/ClientTest/ClientTest.csproj
index a86fe023..e8e595bd 100644
--- a/ClientServerLib/ClientTest/ClientTest.csproj
+++ b/ClientServerLib/ClientTest/ClientTest.csproj
@@ -34,6 +34,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ClientServerLib\bin\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -46,6 +50,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Vocaluxe\Base\Server\CCommands.cs">
+      <Link>CCommands.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Vocaluxe\Base\Server\VocaluxeStructs.cs">
+      <Link>VocaluxeStructs.cs</Link>
+    </Compile>
     <Compile Include="ClientTest.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/Output/ClientServerLib.dll b/Output/ClientServerLib.dll
index 57a5fe2e..98e6ee87 100644
Binary files a/Output/ClientServerLib.dll and b/Output/ClientServerLib.dll differ
diff --git a/ClientServerLib/ClientServerLib/Vocaluxe/CCommands.cs b/Vocaluxe/Base/Server/CCommands.cs
similarity index 100%
rename from ClientServerLib/ClientServerLib/Vocaluxe/CCommands.cs
rename to Vocaluxe/Base/Server/CCommands.cs
diff --git a/ClientServerLib/ClientServerLib/Vocaluxe/VocaluxeStructs.cs b/Vocaluxe/Base/Server/VocaluxeStructs.cs
similarity index 100%
rename from ClientServerLib/ClientServerLib/Vocaluxe/VocaluxeStructs.cs
rename to Vocaluxe/Base/Server/VocaluxeStructs.cs
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index bf1a10cf..f8b34199 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -159,6 +159,10 @@
     <Reference Include="Community.CsharpSqlite">
       <HintPath>..\Output\Community.CsharpSqlite.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ClientServerLib\ClientServerLib\bin\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="OpenTK">
       <HintPath>..\Output\OpenTK.dll</HintPath>
     </Reference>
@@ -203,7 +207,9 @@
     <Compile Include="Base\Fonts\CFonts.cs" />
     <Compile Include="Base\Fonts\CGlyph.cs" />
     <Compile Include="Base\Server\CClientHandler.cs" />
+    <Compile Include="Base\Server\CCommands.cs" />
     <Compile Include="Base\Server\CVocaluxeServer.cs" />
+    <Compile Include="Base\Server\VocaluxeStructs.cs" />
     <Compile Include="CSplashScreen.cs">
       <SubType>Form</SubType>
     </Compile>