diff --git a/IoT/Connector/Data/Mosquitto/ConnectorDataMosquitto.csproj b/IoT/Connector/Data/Mosquitto/ConnectorDataMosquitto.csproj
new file mode 100644
index 0000000..d23e49e
--- /dev/null
+++ b/IoT/Connector/Data/Mosquitto/ConnectorDataMosquitto.csproj
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{39235FAD-BA9D-4B51-82FC-6969967BEAE9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BlubbFish.Utils.IoT.Connector.Data</RootNamespace>
+    <AssemblyName>ConnectorDataMosquitto</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Mosquitto.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Utils-IoT.csproj">
+      <Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
+      <Name>Utils-IoT</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/IoT/Connector/Data/Mosquitto.cs b/IoT/Connector/Data/Mosquitto/Mosquitto.cs
similarity index 100%
rename from IoT/Connector/Data/Mosquitto.cs
rename to IoT/Connector/Data/Mosquitto/Mosquitto.cs
diff --git a/IoT/Connector/Data/Mosquitto/Properties/AssemblyInfo.cs b/IoT/Connector/Data/Mosquitto/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..569c9b9
--- /dev/null
+++ b/IoT/Connector/Data/Mosquitto/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("ConnectorDataMosquitto")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ConnectorDataMosquitto")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("39235fad-ba9d-4b51-82fc-6969967beae9")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// indem Sie "*" wie unten gezeigt eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll b/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll
new file mode 100644
index 0000000..48e4aa5
Binary files /dev/null and b/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll differ
diff --git a/IoT/Connector/Data/Mosquitto/bin/Release/LitJson.dll b/IoT/Connector/Data/Mosquitto/bin/Release/LitJson.dll
new file mode 100644
index 0000000..f00f11f
Binary files /dev/null and b/IoT/Connector/Data/Mosquitto/bin/Release/LitJson.dll differ
diff --git a/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll b/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll
new file mode 100644
index 0000000..34d22f5
Binary files /dev/null and b/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll differ
diff --git a/IoT/Connector/Data/Mqtt/ConnectorDataMqtt.csproj b/IoT/Connector/Data/Mqtt/ConnectorDataMqtt.csproj
new file mode 100644
index 0000000..8001f55
--- /dev/null
+++ b/IoT/Connector/Data/Mqtt/ConnectorDataMqtt.csproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BlubbFish.Utils.IoT.Connector.Data</RootNamespace>
+    <AssemblyName>ConnectorDataMqtt</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="M2Mqtt.Net, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\M2Mqtt.4.3.0.0\lib\net45\M2Mqtt.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Mqtt.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Utils-IoT.csproj">
+      <Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
+      <Name>Utils-IoT</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/IoT/Connector/Data/Mqtt.cs b/IoT/Connector/Data/Mqtt/Mqtt.cs
similarity index 100%
rename from IoT/Connector/Data/Mqtt.cs
rename to IoT/Connector/Data/Mqtt/Mqtt.cs
diff --git a/IoT/Connector/Data/Mqtt/Properties/AssemblyInfo.cs b/IoT/Connector/Data/Mqtt/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..a43a5ad
--- /dev/null
+++ b/IoT/Connector/Data/Mqtt/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("ConnectorDataMqtt")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ConnectorDataMqtt")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("ee6c8f68-ed46-4c1c-abdd-cfcdf75104f2")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// indem Sie "*" wie unten gezeigt eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll b/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll
new file mode 100644
index 0000000..56751a9
Binary files /dev/null and b/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll differ
diff --git a/IoT/Connector/Data/Mqtt/bin/Release/LitJson.dll b/IoT/Connector/Data/Mqtt/bin/Release/LitJson.dll
new file mode 100644
index 0000000..f00f11f
Binary files /dev/null and b/IoT/Connector/Data/Mqtt/bin/Release/LitJson.dll differ
diff --git a/IoT/Connector/Data/Mqtt/bin/Release/M2Mqtt.Net.dll b/IoT/Connector/Data/Mqtt/bin/Release/M2Mqtt.Net.dll
new file mode 100644
index 0000000..154580d
Binary files /dev/null and b/IoT/Connector/Data/Mqtt/bin/Release/M2Mqtt.Net.dll differ
diff --git a/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll b/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll
new file mode 100644
index 0000000..34d22f5
Binary files /dev/null and b/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll differ
diff --git a/IoT/Connector/Data/Mqtt/packages.config b/IoT/Connector/Data/Mqtt/packages.config
new file mode 100644
index 0000000..6a0b044
--- /dev/null
+++ b/IoT/Connector/Data/Mqtt/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="M2Mqtt" version="4.3.0.0" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/IoT/app.config b/IoT/app.config
deleted file mode 100644
index 09059bf..0000000
--- a/IoT/app.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>