diff --git a/NucuCar.TestClient/Program.cs b/NucuCar.TestClient/Program.cs
index 6e3e966..633bd8b 100644
--- a/NucuCar.TestClient/Program.cs
+++ b/NucuCar.TestClient/Program.cs
@@ -1,4 +1,6 @@
 using CommandLine;
+using NucuCar.TestClient.Sensors;
+using NucuCar.TestClient.Telemetry;
 
 namespace NucuCar.TestClient
 {
diff --git a/NucuCar.TestClient/SensorsCmd.cs b/NucuCar.TestClient/Sensors/SensorsCmd.cs
similarity index 100%
rename from NucuCar.TestClient/SensorsCmd.cs
rename to NucuCar.TestClient/Sensors/SensorsCmd.cs
diff --git a/NucuCar.TestClient/AzureTelemetryPublishCmd.cs b/NucuCar.TestClient/Telemetry/AzureTelemetryPublishCmd.cs
similarity index 95%
rename from NucuCar.TestClient/AzureTelemetryPublishCmd.cs
rename to NucuCar.TestClient/Telemetry/AzureTelemetryPublishCmd.cs
index d5db477..9c23d0e 100644
--- a/NucuCar.TestClient/AzureTelemetryPublishCmd.cs
+++ b/NucuCar.TestClient/Telemetry/AzureTelemetryPublishCmd.cs
@@ -1,4 +1,5 @@
 // ReSharper disable UnusedAutoPropertyAccessor.Global
+
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -7,7 +8,7 @@ using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using NucuCar.Domain.Telemetry;
 
-namespace NucuCar.TestClient
+namespace NucuCar.TestClient.Telemetry
 {
     public class AzureTelemetryPublishCmd
     {
diff --git a/NucuCar.TestClient/AzureTelemetryReaderCmd.cs b/NucuCar.TestClient/Telemetry/AzureTelemetryReaderCmd.cs
similarity index 96%
rename from NucuCar.TestClient/AzureTelemetryReaderCmd.cs
rename to NucuCar.TestClient/Telemetry/AzureTelemetryReaderCmd.cs
index 2b3f28e..3206b5f 100644
--- a/NucuCar.TestClient/AzureTelemetryReaderCmd.cs
+++ b/NucuCar.TestClient/Telemetry/AzureTelemetryReaderCmd.cs
@@ -1,4 +1,5 @@
 // ReSharper disable UnusedAutoPropertyAccessor.Global
+
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -9,7 +10,7 @@ using Microsoft.Azure.EventHubs;
 using Microsoft.Extensions.Logging;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace NucuCar.TestClient
+namespace NucuCar.TestClient.Telemetry
 {
     public class AzureTelemetryReaderCmd
     {