diff --git a/NucuCar.Telemetry/NucuCar.Telemetry.csproj b/NucuCar.Domain.Telemetry/NucuCar.Domain.Telemetry.csproj
similarity index 88%
rename from NucuCar.Telemetry/NucuCar.Telemetry.csproj
rename to NucuCar.Domain.Telemetry/NucuCar.Domain.Telemetry.csproj
index 98d33fa..9347bd7 100644
--- a/NucuCar.Telemetry/NucuCar.Telemetry.csproj
+++ b/NucuCar.Domain.Telemetry/NucuCar.Domain.Telemetry.csproj
@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
+        <RootNamespace>NucuCar.Telemetry</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/NucuCar.Telemetry/Telemetry.cs b/NucuCar.Domain.Telemetry/Telemetry.cs
similarity index 100%
rename from NucuCar.Telemetry/Telemetry.cs
rename to NucuCar.Domain.Telemetry/Telemetry.cs
diff --git a/NucuCar.Telemetry/TelemetryConfig.cs b/NucuCar.Domain.Telemetry/TelemetryConfig.cs
similarity index 100%
rename from NucuCar.Telemetry/TelemetryConfig.cs
rename to NucuCar.Domain.Telemetry/TelemetryConfig.cs
diff --git a/NucuCar.Telemetry/TelemetryPublisherAzure.cs b/NucuCar.Domain.Telemetry/TelemetryPublisherAzure.cs
similarity index 100%
rename from NucuCar.Telemetry/TelemetryPublisherAzure.cs
rename to NucuCar.Domain.Telemetry/TelemetryPublisherAzure.cs
diff --git a/NucuCar.Telemetry/TelemetryPublisherDisk.cs b/NucuCar.Domain.Telemetry/TelemetryPublisherDisk.cs
similarity index 100%
rename from NucuCar.Telemetry/TelemetryPublisherDisk.cs
rename to NucuCar.Domain.Telemetry/TelemetryPublisherDisk.cs
diff --git a/NucuCar.Telemetry/TelemetryPublisherFactory.cs b/NucuCar.Domain.Telemetry/TelemetryPublisherFactory.cs
similarity index 100%
rename from NucuCar.Telemetry/TelemetryPublisherFactory.cs
rename to NucuCar.Domain.Telemetry/TelemetryPublisherFactory.cs
diff --git a/NucuCar.Telemetry/TelemetryPublisherFirestore.cs b/NucuCar.Domain.Telemetry/TelemetryPublisherFirestore.cs
similarity index 100%
rename from NucuCar.Telemetry/TelemetryPublisherFirestore.cs
rename to NucuCar.Domain.Telemetry/TelemetryPublisherFirestore.cs
diff --git a/NucuCar.Telemetry/TelemetryPublisherType.cs b/NucuCar.Domain.Telemetry/TelemetryPublisherType.cs
similarity index 100%
rename from NucuCar.Telemetry/TelemetryPublisherType.cs
rename to NucuCar.Domain.Telemetry/TelemetryPublisherType.cs
diff --git a/NucuCar.Telemetry/TelemetryWorker.cs b/NucuCar.Domain.Telemetry/TelemetryWorker.cs
similarity index 100%
rename from NucuCar.Telemetry/TelemetryWorker.cs
rename to NucuCar.Domain.Telemetry/TelemetryWorker.cs
diff --git a/NucuCar.Sensors/NucuCar.Sensors.csproj b/NucuCar.Sensors/NucuCar.Sensors.csproj
index 9e3f884..9a1cfd5 100644
--- a/NucuCar.Sensors/NucuCar.Sensors.csproj
+++ b/NucuCar.Sensors/NucuCar.Sensors.csproj
@@ -78,7 +78,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\NucuCar.Domain.Telemetry\NucuCar.Domain.Telemetry.csproj" />
       <ProjectReference Include="..\NucuCar.Domain\NucuCar.Domain.csproj" />
-      <ProjectReference Include="..\NucuCar.Telemetry\NucuCar.Telemetry.csproj" />
     </ItemGroup>
 </Project>
diff --git a/NucuCar.TestClient/NucuCar.TestClient.csproj b/NucuCar.TestClient/NucuCar.TestClient.csproj
index 22c1d8f..adc560d 100644
--- a/NucuCar.TestClient/NucuCar.TestClient.csproj
+++ b/NucuCar.TestClient/NucuCar.TestClient.csproj
@@ -13,8 +13,8 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\NucuCar.Domain.Telemetry\NucuCar.Domain.Telemetry.csproj" />
       <ProjectReference Include="..\NucuCar.Domain\NucuCar.Domain.csproj" />
-      <ProjectReference Include="..\NucuCar.Telemetry\NucuCar.Telemetry.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/NucuCar.UnitTests/NucuCar.UnitTests.csproj b/NucuCar.UnitTests/NucuCar.UnitTests.csproj
index f1d1264..b3943b5 100644
--- a/NucuCar.UnitTests/NucuCar.UnitTests.csproj
+++ b/NucuCar.UnitTests/NucuCar.UnitTests.csproj
@@ -16,9 +16,9 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\NucuCar.Domain.Telemetry\NucuCar.Domain.Telemetry.csproj" />
       <ProjectReference Include="..\NucuCar.Domain\NucuCar.Domain.csproj" />
       <ProjectReference Include="..\NucuCar.Sensors\NucuCar.Sensors.csproj" />
-      <ProjectReference Include="..\NucuCar.Telemetry\NucuCar.Telemetry.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/NucuCar.sln b/NucuCar.sln
index a1fdcf5..591f4ca 100644
--- a/NucuCar.sln
+++ b/NucuCar.sln
@@ -8,7 +8,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucuCar.Domain", "NucuCar.D
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucuCar.UnitTests", "NucuCar.UnitTests\NucuCar.UnitTests.csproj", "{C6F07921-1052-4945-911E-F328A622F229}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucuCar.Telemetry", "NucuCar.Telemetry\NucuCar.Telemetry.csproj", "{C20407F3-AB62-4590-B4FF-A0DCFCFA232B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucuCar.Domain.Telemetry", "NucuCar.Domain.Telemetry\NucuCar.Domain.Telemetry.csproj", "{C20407F3-AB62-4590-B4FF-A0DCFCFA232B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucuCar.Common", "NucuCar.Common\NucuCar.Common.csproj", "{C2C40BF1-2375-4C74-938E-652CC3C31BDD}"
 EndProject
diff --git a/NucuCar.sln.DotSettings.user b/NucuCar.sln.DotSettings.user
index b33993d..215653b 100644
--- a/NucuCar.sln.DotSettings.user
+++ b/NucuCar.sln.DotSettings.user
@@ -3,29 +3,21 @@
   &lt;Assembly Path="/home/denis/.nuget/packages/iot.device.bindings/1.0.0/lib/netcoreapp2.1/Iot.Device.Bindings.dll" /&gt;
   &lt;Assembly Path="/home/denis/.nuget/packages/firebaseresttranslator/0.1.1/lib/netcoreapp3.0/FirebaseRestTranslator.dll" /&gt;
 &lt;/AssemblyExplorer&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=59acec6f_002Dda48_002D4e34_002Dbf2a_002D5b52d718278a/@EntryIndexedValue">&lt;SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="Test_PublishAsync_Authorization_OK" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"&gt;
-  &lt;TestAncestor&gt;
-    &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_Authorization_OK&lt;/TestId&gt;
-  &lt;/TestAncestor&gt;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=59acec6f_002Dda48_002D4e34_002Dbf2a_002D5b52d718278a/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="Test_PublishAsync_Authorization_OK" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_Authorization_OK&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
 	
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=8687c1ea_002Dea4c_002D426e_002Da605_002D3d34b0c68f64/@EntryIndexedValue">&lt;SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="Session" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"&gt;
-  &lt;Or&gt;
-    &lt;Or&gt;
-      &lt;TestAncestor&gt;
-        &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_OK&lt;/TestId&gt;
-      &lt;/TestAncestor&gt;
-      &lt;TestAncestor&gt;
-        &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_Cancel&lt;/TestId&gt;
-      &lt;/TestAncestor&gt;
-    &lt;/Or&gt;
-    &lt;TestAncestor&gt;
-      &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_Authorization_OK&lt;/TestId&gt;
-    &lt;/TestAncestor&gt;
-  &lt;/Or&gt;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=8687c1ea_002Dea4c_002D426e_002Da605_002D3d34b0c68f64/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="Session" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_OK&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_Cancel&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_Authorization_OK&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=e8af539e_002D0b50_002D476d_002Daa84_002D80fbff5a748b/@EntryIndexedValue">&lt;SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="Test_PublishAsync_OK" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"&gt;
-  &lt;TestAncestor&gt;
-    &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_OK&lt;/TestId&gt;
-  &lt;/TestAncestor&gt;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=e8af539e_002D0b50_002D476d_002Daa84_002D80fbff5a748b/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="Test_PublishAsync_OK" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;xUnit::C6F07921-1052-4945-911E-F328A622F229::.NETCoreApp,Version=v3.1::NucuCar.UnitTests.NucuCar.Telemetry.Tests.TelemetryPublisherFirestoreTest.Test_PublishAsync_OK&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
\ No newline at end of file