diff --git a/JustAnotherVoiceChat.Server.Dummy/JustAnotherVoiceChat.Server.Dummy.csproj b/JustAnotherVoiceChat.Server.Dummy/JustAnotherVoiceChat.Server.Dummy.csproj
index 593a148..05bc766 100644
--- a/JustAnotherVoiceChat.Server.Dummy/JustAnotherVoiceChat.Server.Dummy.csproj
+++ b/JustAnotherVoiceChat.Server.Dummy/JustAnotherVoiceChat.Server.Dummy.csproj
@@ -5,25 +5,6 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>7</LangVersion>
     <IsPackable>false</IsPackable>
-    <Configurations>Debug Linux;Debug Windows;Release Linux;Release Windows</Configurations>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;LINUX;NETCOREAPP2_0;NETCOREAPP2_0</DefineConstants>
-    <OutputPath>bin\Debug\Linux\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_0</DefineConstants>
-    <OutputPath>bin\Debug\Windows\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
-    <DefineConstants>TRACE;RELEASE;NETCOREAPP2_0</DefineConstants>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\Windows\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
-    <DefineConstants>TRACE;RELEASE;LINUX;NETCOREAPP2_0</DefineConstants>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\Linux\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\JustAnotherVoiceChat.Server.Wrapper\JustAnotherVoiceChat.Server.Wrapper.csproj" />
diff --git a/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj b/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj
index 1a3d5b3..d5113e9 100644
--- a/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj
+++ b/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj
@@ -12,41 +12,18 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <LangVersion>7</LangVersion>
-    <Configurations>Debug Linux;Debug Windows;Debug Windows GTMP;Release Linux;Release Windows</Configurations>
+    <Configurations>Debug;Debug GTMP;Release</Configurations>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <OutputPath>bin\Release\Linux\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
-    <OutputPath>bin\Release\Windows\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <OutputPath>bin\Debug\Windows\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <OutputPath>bin\Debug\Linux\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows GTMP|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug GTMP|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -55,6 +32,12 @@
     <WarningLevel>4</WarningLevel>
     <OutputPath>..\..\JustAnotherVoiceChat-GTMP\resources\justanothervoicechat\</OutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <OutputPath>bin\Release\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BCrypt.Net, Version=0.1.5073.29922, Culture=neutral, PublicKeyToken=6bcd409ee6bc9292">
       <HintPath>..\packages\BCrypt-Official.0.1.109\lib\BCrypt.Net.dll</HintPath>
@@ -113,4 +96,4 @@
     <Target Name="AfterBuild">
     </Target>
     -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/JustAnotherVoiceChat.Server.GTMP/JustAnotherVoiceChat.Server.GTMP.csproj b/JustAnotherVoiceChat.Server.GTMP/JustAnotherVoiceChat.Server.GTMP.csproj
index c7db373..a8e1b46 100644
--- a/JustAnotherVoiceChat.Server.GTMP/JustAnotherVoiceChat.Server.GTMP.csproj
+++ b/JustAnotherVoiceChat.Server.GTMP/JustAnotherVoiceChat.Server.GTMP.csproj
@@ -12,38 +12,20 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <LangVersion>7</LangVersion>
-    <Configurations>Debug Linux;Debug Windows;Release Linux;Release Windows</Configurations>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <OutputPath>bin\Debug\Linux\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
-    <OutputPath>bin\Debug\Windows\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <OutputPath>bin\Release\Windows\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <OutputPath>bin\Release\Linux\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <OutputPath>bin\Debug\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BCrypt.Net, Version=0.1.5073.29922, Culture=neutral, PublicKeyToken=6bcd409ee6bc9292">
diff --git a/JustAnotherVoiceChat.Server.Testing/JustAnotherVoiceChat.Server.Testing.csproj b/JustAnotherVoiceChat.Server.Testing/JustAnotherVoiceChat.Server.Testing.csproj
index 049a4b1..743cab4 100644
--- a/JustAnotherVoiceChat.Server.Testing/JustAnotherVoiceChat.Server.Testing.csproj
+++ b/JustAnotherVoiceChat.Server.Testing/JustAnotherVoiceChat.Server.Testing.csproj
@@ -4,23 +4,4 @@
     <IsPackable>false</IsPackable>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug Windows</Configuration>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
-    <WarningLevel>0</WarningLevel>
-    <OutputPath>bin\Debug\Linux\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;NETSTANDARD1_2</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
-    <OutputPath>bin\Debug\Windows\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_2</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
-    <OutputPath>bin\Release\Windows\</OutputPath>
-    <DefineConstants>TRACE;NETSTANDARD1_2</DefineConstants>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
-    <OutputPath>bin\Release\Linux\</OutputPath>
-    <DefineConstants>TRACE;LINUX;NETSTANDARD1_2</DefineConstants>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/JustAnotherVoiceChat.Server.Wrapper.Tests/JustAnotherVoiceChat.Server.Wrapper.Tests.csproj b/JustAnotherVoiceChat.Server.Wrapper.Tests/JustAnotherVoiceChat.Server.Wrapper.Tests.csproj
index 90f94dd..3e773b7 100644
--- a/JustAnotherVoiceChat.Server.Wrapper.Tests/JustAnotherVoiceChat.Server.Wrapper.Tests.csproj
+++ b/JustAnotherVoiceChat.Server.Wrapper.Tests/JustAnotherVoiceChat.Server.Wrapper.Tests.csproj
@@ -3,7 +3,6 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug Windows</Configuration>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <Configurations>Debug Linux;Debug Windows;Release Linux;Release Windows</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\JustAnotherVoiceChat.Server.Testing\JustAnotherVoiceChat.Server.Testing.csproj" />
@@ -15,23 +14,4 @@
     <PackageReference Include="NUnit" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
   </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
-    <WarningLevel>0</WarningLevel>
-    <OutputPath>bin\Debug\Linux\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;NETCOREAPP2_0</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
-    <OutputPath>bin\Debug\Windows\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_0</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
-    <OutputPath>bin\Release\Windows\</OutputPath>
-    <DefineConstants>TRACE;NETCOREAPP2_0</DefineConstants>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
-    <OutputPath>bin\Release\Linux\</OutputPath>
-    <DefineConstants>TRACE;LINUX;NETCOREAPP2_0</DefineConstants>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj b/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj
index b4cf7c9..80c2b9a 100644
--- a/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj
+++ b/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj
@@ -7,7 +7,6 @@
     <FileVersion>$(VoiceChatVersion)</FileVersion>
     <Version>$(VoiceChatVersion)</Version>
     <LangVersion>7</LangVersion>
-    <Configurations>Debug Linux;Debug Windows;Release Linux;Release Windows</Configurations>
     <Title>JustAnotherVoiceChat-Server .NET Standard Wrapper</Title>
     <Description>JustAnotherVoiceChat-Server is the control unit of the JustAnotherVoiceChat TeamSpeak3-Plugin. It uses a dedicated TeamSpeak3-Server to communicate with other players on any .NET based multiplayer-server.</Description>
     <Copyright>2018 JustAnotherVoiceChat</Copyright>
@@ -20,28 +19,14 @@
     <Authors>JustAnotherVoiceChat contributors</Authors>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
-    <WarningLevel>0</WarningLevel>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>bin\Debug\Linux\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;NETSTANDARD1_2</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
-    <OutputPath>bin\Debug\Windows\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_2</DefineConstants>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GTMP|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>bin\Release\Windows\</OutputPath>
-    <DefineConstants>TRACE;NETSTANDARD1_2</DefineConstants>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>bin\Release\Linux\</OutputPath>
-    <DefineConstants>TRACE;LINUX;NETSTANDARD1_2</DefineConstants>
-    <Optimize>true</Optimize>
   </PropertyGroup>
   <!-- LINUX NATIVE LIBRARY -->
   <Target Name="Clean" Condition="'$(Configuration)' == 'Debug Linux' Or '$(Configuration)' == 'Release Linux'">
diff --git a/JustAnotherVoiceChat.Server.Wrapper/src/Elements/Wrapper/NativeLibary.cs b/JustAnotherVoiceChat.Server.Wrapper/src/Elements/Wrapper/NativeLibary.cs
index 529eaad..446da6a 100644
--- a/JustAnotherVoiceChat.Server.Wrapper/src/Elements/Wrapper/NativeLibary.cs
+++ b/JustAnotherVoiceChat.Server.Wrapper/src/Elements/Wrapper/NativeLibary.cs
@@ -34,12 +34,8 @@ namespace JustAnotherVoiceChat.Server.Wrapper.Elements.Wrapper
 {
     internal static class NativeLibary
     {
-
-#if LINUX
-        private const string JustAnotherVoiceChatLibrary = "libJustAnotherVoiceChat.Server.so";
-#else
-        private const string JustAnotherVoiceChatLibrary = "JustAnotherVoiceChat.Server.dll";
-#endif
+     
+        private const string JustAnotherVoiceChatLibrary = "JustAnotherVoiceChatServer";
 
         [DllImport(JustAnotherVoiceChatLibrary)]
         internal static extern void JV_CreateServer(ushort port, string teamspeakServerId, ulong teamspeakChannelId, string teamspeakChannelPassword);
diff --git a/JustAnotherVoiceChat.Server.sln b/JustAnotherVoiceChat.Server.sln
index c76ce29..168573a 100644
--- a/JustAnotherVoiceChat.Server.sln
+++ b/JustAnotherVoiceChat.Server.sln
@@ -21,72 +21,47 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JustAnotherVoiceChat.Server
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Linux|Any CPU = Debug Linux|Any CPU
-		Debug Windows GTMP|Any CPU = Debug Windows GTMP|Any CPU
-		Debug Windows|Any CPU = Debug Windows|Any CPU
-		Release Linux|Any CPU = Release Linux|Any CPU
-		Release Windows|Any CPU = Release Windows|Any CPU
+		Release|Any CPU = Release|Any CPU
+		Debug|Any CPU = Debug|Any CPU
+		Debug GTMP|Any CPU = Debug GTMP|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows|Any CPU
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Windows GTMP|Any CPU.Build.0 = Debug Windows|Any CPU
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU
-		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Windows GTMP|Any CPU.Build.0 = Debug Windows|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU
-		{7362E09D-6D62-493B-86FF-00544D5967F8}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU
-		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU
-		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU
-		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows|Any CPU
-		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU
-		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU
-		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU
-		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU
-		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU
-		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows GTMP|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Windows GTMP|Any CPU.Build.0 = Debug Windows GTMP|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU
-		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Windows GTMP|Any CPU.Build.0 = Debug Windows|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU
-		{AD192460-A5D5-461A-AEC3-476713B055DE}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Linux|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Linux|Any CPU.Build.0 = Debug|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Windows GTMP|Any CPU.Build.0 = Debug|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Windows|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Windows|Any CPU.Build.0 = Debug|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release Linux|Any CPU.ActiveCfg = Release|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release Linux|Any CPU.Build.0 = Release|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release Windows|Any CPU.ActiveCfg = Release|Any CPU
-		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release Windows|Any CPU.Build.0 = Release|Any CPU
+		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU
+		{3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU
+		{7362E09D-6D62-493B-86FF-00544D5967F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7362E09D-6D62-493B-86FF-00544D5967F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU
+		{7362E09D-6D62-493B-86FF-00544D5967F8}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU
+		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU
+		{3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU
+		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug GTMP|Any CPU.ActiveCfg = Debug GTMP|Any CPU
+		{62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug GTMP|Any CPU.Build.0 = Debug GTMP|Any CPU
+		{AD192460-A5D5-461A-AEC3-476713B055DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD192460-A5D5-461A-AEC3-476713B055DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD192460-A5D5-461A-AEC3-476713B055DE}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU
+		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/appveyor.yml b/appveyor.yml
index ce570cc..283c6f2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,8 +23,8 @@ artifacts:
   - path: 'JustAnotherVoiceChat-%APPVEYOR_BUILD_VERSION%-GTMP.zip'
     name: GT-MP Resource
 
-  - path: 'JustAnotherVoiceChat.Server.dll'
-    name: Server x64
+  - path: 'JustAnotherVoiceChatServer.dll'
+    name: Server Win x64
 
 install:
   - mkdir C:\projects\dependencies
@@ -53,27 +53,27 @@ build_script:
   - cd build
   - cmake .. -G "Visual Studio 15 2017 Win64"
   - cmake --build . --config Release
-  - cp src\Release\JustAnotherVoiceChat.Server.dll C:\projects\justanothervoicechat-server\
-  - move src\Release\JustAnotherVoiceChat.Server.dll ..\..\JustAnotherVoiceChat.Server.Wrapper\
+  - cp src\Release\JustAnotherVoiceChatServer.dll C:\projects\justanothervoicechat-server\
+  - move src\Release\JustAnotherVoiceChatServer.dll ..\..\JustAnotherVoiceChat.Server.Wrapper\
 
   # C#
   - cd C:\projects\justanothervoicechat-server
-  - dotnet build JustAnotherVoiceChat.Server.Wrapper\JustAnotherVoiceChat.Server.Wrapper.csproj -c "Release Windows" -f netstandard1.2
-  - dotnet build JustAnotherVoiceChat.Server.GTMP\JustAnotherVoiceChat.Server.GTMP.csproj -c "Release Windows" -f net452
-  - dotnet build JustAnotherVoiceChat.Server.GTMP.Resource\JustAnotherVoiceChat.Server.GTMP.Resource.csproj -c "Release Windows" -f net452
+  - dotnet build JustAnotherVoiceChat.Server.Wrapper\JustAnotherVoiceChat.Server.Wrapper.csproj -c "Release" -f netstandard1.2
+  - dotnet build JustAnotherVoiceChat.Server.GTMP\JustAnotherVoiceChat.Server.GTMP.csproj -c "Release" -f net452
+  - dotnet build JustAnotherVoiceChat.Server.GTMP.Resource\JustAnotherVoiceChat.Server.GTMP.Resource.csproj -c "Release" -f net452
 
 after_build:
-  - dotnet pack JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj -c "Release Windows" -o "..\"
-  - nuget pack JustAnotherVoiceChat.Server.GTMP\JustAnotherVoiceChat.Server.GTMP.csproj -Properties "Configuration=Release Windows"
+  - dotnet pack JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj -c "Release" -o "..\"
+  - nuget pack JustAnotherVoiceChat.Server.GTMP\JustAnotherVoiceChat.Server.GTMP.csproj -Properties "Configuration=Release"
   
   # Build GT-MP Resource
-  - cd C:\projects\justanothervoicechat-server\JustAnotherVoiceChat.Server.GTMP.Resource\bin\Release\Windows
+  - cd C:\projects\justanothervoicechat-server\JustAnotherVoiceChat.Server.GTMP.Resource\bin\Release
   - 7z a JustAnotherVoiceChat-%APPVEYOR_BUILD_VERSION%-GTMP.zip JustAnotherVoiceChat* meta.xml Client\JustAnotherVoiceChat.js
   - move JustAnotherVoiceChat-%APPVEYOR_BUILD_VERSION%-GTMP.zip C:\projects\justanothervoicechat-server\
 
 test_script:
   - cd C:\projects\justanothervoicechat-server
-  - dotnet test JustAnotherVoiceChat.Server.Wrapper.Tests\JustAnotherVoiceChat.Server.Wrapper.Tests.csproj -c "Release Windows" --logger trx;LogFileName=results.xml
+  - dotnet test JustAnotherVoiceChat.Server.Wrapper.Tests\JustAnotherVoiceChat.Server.Wrapper.Tests.csproj -c "Release" --logger trx;LogFileName=results.xml
   
 on_finish:
   - ps: |
@@ -101,7 +101,7 @@ deploy:
     prerelease: true
     draft: true
     description: $(APPVEYOR_REPO_COMMIT_MESSAGE)
-    artifact: /.*\.nupkg/, JustAnotherVoiceChat-$(appveyor_build_version)-GTMP.zip, JustAnotherVoiceChat.Server.dll
+    artifact: /.*\.nupkg/, JustAnotherVoiceChat-$(appveyor_build_version)-GTMP.zip, JustAnotherVoiceChatServer.dll
     on:
       branch: master
       appveyor_repo_tag: true