diff --git a/Frameworks/MQTTnet.NetCoreApp/MQTTnet.NetCoreApp.csproj b/Frameworks/MQTTnet.NetCoreApp/MQTTnet.NetCoreApp.csproj
index ec45201..5bc9e6d 100644
--- a/Frameworks/MQTTnet.NetCoreApp/MQTTnet.NetCoreApp.csproj
+++ b/Frameworks/MQTTnet.NetCoreApp/MQTTnet.NetCoreApp.csproj
@@ -27,8 +27,19 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Any CPU|x86'" />
 
+  <ItemGroup>
+    <Compile Include="..\MQTTnet.NetStandard\Implementations\MqttServerAdapter.cs" Link="Implementations\MqttServerAdapter.cs" />
+    <Compile Include="..\MQTTnet.NetStandard\Implementations\MqttTcpChannel.cs" Link="Implementations\MqttTcpChannel.cs" />
+    <Compile Include="..\MQTTnet.NetStandard\MqttClientFactory.cs" Link="MqttClientFactory.cs" />
+    <Compile Include="..\MQTTnet.NetStandard\MqttServerFactory.cs" Link="MqttServerFactory.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\MQTTnet.Core\MQTTnet.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Implementations\" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Frameworks/MQTTnet.NetCoreApp/Implementations/MqttServerAdapter.cs b/Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.cs
similarity index 100%
rename from Frameworks/MQTTnet.NetCoreApp/Implementations/MqttServerAdapter.cs
rename to Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.cs
diff --git a/Frameworks/MQTTnet.NetCoreApp/Implementations/MqttTcpChannel.cs b/Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.cs
similarity index 100%
rename from Frameworks/MQTTnet.NetCoreApp/Implementations/MqttTcpChannel.cs
rename to Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.cs
diff --git a/Frameworks/MQTTnet.NetCoreApp/MqttClientFactory.cs b/Frameworks/MQTTnet.NetStandard/MqttClientFactory.cs
similarity index 100%
rename from Frameworks/MQTTnet.NetCoreApp/MqttClientFactory.cs
rename to Frameworks/MQTTnet.NetStandard/MqttClientFactory.cs
diff --git a/Frameworks/MQTTnet.NetCoreApp/MqttServerFactory.cs b/Frameworks/MQTTnet.NetStandard/MqttServerFactory.cs
similarity index 100%
rename from Frameworks/MQTTnet.NetCoreApp/MqttServerFactory.cs
rename to Frameworks/MQTTnet.NetStandard/MqttServerFactory.cs
diff --git a/Frameworks/MQTTnet.Netstandard/MQTTnet.Netstandard.csproj b/Frameworks/MQTTnet.Netstandard/MQTTnet.Netstandard.csproj
index f5875bb..10ffeed 100644
--- a/Frameworks/MQTTnet.Netstandard/MQTTnet.Netstandard.csproj
+++ b/Frameworks/MQTTnet.Netstandard/MQTTnet.Netstandard.csproj
@@ -10,21 +10,10 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
 
-  <ItemGroup>
-    <Compile Include="..\MQTTnet.NetCoreApp\Implementations\MqttServerAdapter.cs" Link="Implementations\MqttServerAdapter.cs" />
-    <Compile Include="..\MQTTnet.NetCoreApp\Implementations\MqttTcpChannel.cs" Link="Implementations\MqttTcpChannel.cs" />
-    <Compile Include="..\MQTTnet.NetCoreApp\MqttClientFactory.cs" Link="MqttClientFactory.cs" />
-    <Compile Include="..\MQTTnet.NetCoreApp\MqttServerFactory.cs" Link="MqttServerFactory.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\MQTTnet.Core\MQTTnet.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Implementations\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.Net.Security" Version="4.3.1" />
   </ItemGroup>
diff --git a/MQTTnet.sln b/MQTTnet.sln
index dabb915..58e427e 100644
--- a/MQTTnet.sln
+++ b/MQTTnet.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+VisualStudioVersion = 15.0.26430.15
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTTnet.Core.Tests", "Tests\MQTTnet.Core.Tests\MQTTnet.Core.Tests.csproj", "{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}"
 EndProject
@@ -26,7 +26,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTTnet.TestApp.NetFramewor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTTnet.TestApp.UniversalWindows", "Tests\MQTTnet.TestApp.UniversalWindows\MQTTnet.TestApp.UniversalWindows.csproj", "{FF1F72D6-9524-4422-9497-3CC0002216ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Netstandard", "Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj", "{3587E506-55A2-4EB3-99C7-DC01E42D25D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.NetStandard", "Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj", "{3587E506-55A2-4EB3-99C7-DC01E42D25D2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution