diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/DiagnosticsPathGuardsTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/DiagnosticsPathGuardsTests.cs
index 111af940..571007b3 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/DiagnosticsPathGuardsTests.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/DiagnosticsPathGuardsTests.cs
@@ -1,4 +1,4 @@
-using AutopilotMonitor.Agent.Core.Monitoring.Collectors;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather;
 using Xunit;
 
 namespace AutopilotMonitor.Agent.Core.Tests.Collectors
diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/GatherRuleGuardsTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/GatherRuleGuardsTests.cs
index 6fe3f20b..57e03038 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/GatherRuleGuardsTests.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Collectors/GatherRuleGuardsTests.cs
@@ -1,4 +1,4 @@
-using AutopilotMonitor.Agent.Core.Monitoring.Collectors;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather;
 using Xunit;
 
 namespace AutopilotMonitor.Agent.Core.Tests.Collectors
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/AnalyzerManager.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/AnalyzerManager.cs
index 13945e99..1dd216a5 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/AnalyzerManager.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/AnalyzerManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using AutopilotMonitor.Agent.Core.Configuration;
 using AutopilotMonitor.Agent.Core.Logging;
-using AutopilotMonitor.Agent.Core.Monitoring.Analyzers;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Analyzers;
 using AutopilotMonitor.Shared.Models;
 
 namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs
index 3644f645..a22551f3 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs
@@ -6,6 +6,8 @@ using AutopilotMonitor.Agent.Core.Configuration;
 using AutopilotMonitor.Agent.Core.Logging;
 using AutopilotMonitor.Agent.Core.Monitoring.Collectors;
 using AutopilotMonitor.Agent.Core.Monitoring.Core;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic;
 using AutopilotMonitor.Agent.Core.Monitoring.Transport;
 using AutopilotMonitor.Agent.Core.Monitoring.Replay;
 using AutopilotMonitor.Agent.Core.Monitoring.Tracking;
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs
index 5026a5ed..d6c0a79c 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs
@@ -7,6 +7,8 @@ using System.Threading.Tasks;
 using AutopilotMonitor.Agent.Core.Configuration;
 using AutopilotMonitor.Agent.Core.Logging;
 using AutopilotMonitor.Agent.Core.Monitoring.Core;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather;
 using AutopilotMonitor.Agent.Core.Monitoring.Transport;
 using AutopilotMonitor.Shared;
 
@@ -138,7 +140,7 @@ namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime
                             var userProfilePath = UserProfileResolver.ContainsUserProfileToken(entry.Path)
                                 ? UserProfileResolver.GetLoggedOnUserProfilePath() : null;
 
-                            if (!Collectors.DiagnosticsPathGuards.IsDiagnosticsPathAllowed(entry.Path, _configuration.UnrestrictedMode, userProfilePath))
+                            if (!DiagnosticsPathGuards.IsDiagnosticsPathAllowed(entry.Path, _configuration.UnrestrictedMode, userProfilePath))
                             {
                                 _logger.Warning($"Diagnostics path blocked by guard: {entry.Path}");
                                 continue;
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs
index 9efbd095..48eca6d1 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using AutopilotMonitor.Agent.Core.Configuration;
 using AutopilotMonitor.Agent.Core.Logging;
 using AutopilotMonitor.Agent.Core.Monitoring.Core;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo;
 using AutopilotMonitor.Agent.Core.Monitoring.Transport;
 using AutopilotMonitor.Agent.Core.Monitoring.Tracking;
 using AutopilotMonitor.Shared;
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs
index 7294e2f6..d748e2b5 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs
@@ -5,6 +5,7 @@ using AutopilotMonitor.Agent.Core.Configuration;
 using AutopilotMonitor.Agent.Core.Logging;
 using AutopilotMonitor.Agent.Core.Monitoring.Collectors;
 using AutopilotMonitor.Agent.Core.Monitoring.Core;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic;
 using AutopilotMonitor.Agent.Core.Monitoring.Transport;
 using AutopilotMonitor.Shared;
 using AutopilotMonitor.Shared.Models;
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Analyzers/IAgentAnalyzer.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Analyzers/IAgentAnalyzer.cs
similarity index 95%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Analyzers/IAgentAnalyzer.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Analyzers/IAgentAnalyzer.cs
index 67bd842c..967d08d0 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Analyzers/IAgentAnalyzer.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Analyzers/IAgentAnalyzer.cs
@@ -1,4 +1,4 @@
-namespace AutopilotMonitor.Agent.Core.Monitoring.Analyzers
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Analyzers
 {
     /// <summary>
     /// Represents an agent-side security or configuration analyzer.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Analyzers/LocalAdminAnalyzer.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Analyzers/LocalAdminAnalyzer.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Analyzers/LocalAdminAnalyzer.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Analyzers/LocalAdminAnalyzer.cs
index ff626d09..2c081fac 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Analyzers/LocalAdminAnalyzer.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Analyzers/LocalAdminAnalyzer.cs
@@ -7,7 +7,7 @@ using AutopilotMonitor.Agent.Core.Logging;
 using AutopilotMonitor.Shared.Models;
 using Microsoft.Win32;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Analyzers
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Analyzers
 {
     /// <summary>
     /// Analyzes local administrator accounts and user profiles on the device
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Analyzers/SoftwareInventoryAnalyzer.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Analyzers/SoftwareInventoryAnalyzer.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Analyzers/SoftwareInventoryAnalyzer.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Analyzers/SoftwareInventoryAnalyzer.cs
index 229aa0cf..4e5f85a2 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Analyzers/SoftwareInventoryAnalyzer.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Analyzers/SoftwareInventoryAnalyzer.cs
@@ -6,7 +6,7 @@ using AutopilotMonitor.Agent.Core.Logging;
 using AutopilotMonitor.Shared.Models;
 using Microsoft.Win32;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Analyzers
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Analyzers
 {
     /// <summary>
     /// Collects installed software inventory from the Windows registry, normalizes
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/CollectorBase.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/CollectorBase.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/CollectorBase.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/CollectorBase.cs
index 9e7e6859..1cc592da 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/CollectorBase.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/CollectorBase.cs
@@ -3,7 +3,7 @@ using System.Threading;
 using AutopilotMonitor.Agent.Core.Logging;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry
 {
     /// <summary>
     /// Abstract base for interval-based event collectors.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeviceInfoCollector.HardwareSpec.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.HardwareSpec.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeviceInfoCollector.HardwareSpec.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.HardwareSpec.cs
index 94d8bb69..2c088fa9 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeviceInfoCollector.HardwareSpec.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.HardwareSpec.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Management;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo
 {
     /// <summary>
     /// Partial: Static hardware specifications (CPU, RAM, Disk, BIOS, Battery, GPU).
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeviceInfoCollector.NetworkAndSecurity.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.NetworkAndSecurity.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeviceInfoCollector.NetworkAndSecurity.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.NetworkAndSecurity.cs
index f52a2a42..7ab22489 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeviceInfoCollector.NetworkAndSecurity.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.NetworkAndSecurity.cs
@@ -11,7 +11,7 @@ using AutopilotMonitor.Agent.Core.Security;
 using AutopilotMonitor.Shared.Models;
 using Microsoft.Win32;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo
 {
     /// <summary>
     /// Partial: Network, proxy, Autopilot profile, security (SecureBoot, BitLocker, TPM, AAD join),
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeviceInfoCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeviceInfoCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.cs
index be2fa43d..ea074dfd 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeviceInfoCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoCollector.cs
@@ -11,7 +11,7 @@ using AutopilotMonitor.Agent.Core.Monitoring.Core;
 using AutopilotMonitor.Shared.Models;
 using Microsoft.Win32;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo
 {
     /// <summary>
     /// Collects static and semi-static device information at enrollment startup and end.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/DeviceInfoProvider.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoProvider.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/DeviceInfoProvider.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoProvider.cs
index 36ad12fb..6e108374 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/DeviceInfoProvider.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/DeviceInfo/DeviceInfoProvider.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Core
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo
 {
     /// <summary>
     /// Provides device hardware and OS information via WMI and registry queries.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/CommandCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/CommandCollector.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/CommandCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/CommandCollector.cs
index 7cc449a9..2278a43d 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/CommandCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/CommandCollector.cs
@@ -5,7 +5,7 @@ using System.Text;
 using AutopilotMonitor.Agent.Core.Security;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors
 {
     public class CommandCollector : IGatherRuleCollector
     {
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/EventLogCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/EventLogCollector.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/EventLogCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/EventLogCollector.cs
index 5ca5257d..51c30ea7 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/EventLogCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/EventLogCollector.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.Eventing.Reader;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors
 {
     public class EventLogCollector : IGatherRuleCollector
     {
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/FileCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/FileCollector.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/FileCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/FileCollector.cs
index 1b186889..446aa753 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/FileCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/FileCollector.cs
@@ -6,7 +6,7 @@ using AutopilotMonitor.Shared.Models;
 
 using AutopilotMonitor.Agent.Core.Monitoring.Runtime;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors
 {
     public class FileCollector : IGatherRuleCollector
     {
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/JsonCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/JsonCollector.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/JsonCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/JsonCollector.cs
index 2e7cb764..21597b73 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/JsonCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/JsonCollector.cs
@@ -7,7 +7,7 @@ using Newtonsoft.Json.Linq;
 
 using AutopilotMonitor.Agent.Core.Monitoring.Runtime;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors
 {
     public class JsonCollector : IGatherRuleCollector
     {
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/LogParserCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/LogParserCollector.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/LogParserCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/LogParserCollector.cs
index b3d3b001..9060c10c 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/LogParserCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/LogParserCollector.cs
@@ -9,7 +9,7 @@ using AutopilotMonitor.Shared.Models;
 
 using AutopilotMonitor.Agent.Core.Monitoring.Runtime;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors
 {
     public class LogParserCollector : IGatherRuleCollector
     {
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/RegistryCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/RegistryCollector.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/RegistryCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/RegistryCollector.cs
index 899ecaab..18b4423d 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/RegistryCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/RegistryCollector.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using AutopilotMonitor.Shared.Models;
 using Microsoft.Win32;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors
 {
     public class RegistryCollector : IGatherRuleCollector
     {
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/WmiCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/WmiCollector.cs
similarity index 96%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/WmiCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/WmiCollector.cs
index b3829ecb..2b30f9ab 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/WmiCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/WmiCollector.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Management;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors
 {
     public class WmiCollector : IGatherRuleCollector
     {
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/XmlCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/XmlCollector.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/XmlCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/XmlCollector.cs
index 79250dce..f9ce07dc 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/XmlCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/Collectors/XmlCollector.cs
@@ -9,7 +9,7 @@ using AutopilotMonitor.Shared.Models;
 
 using AutopilotMonitor.Agent.Core.Monitoring.Runtime;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors
 {
     public class XmlCollector : IGatherRuleCollector
     {
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DiagnosticsPathGuards.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/DiagnosticsPathGuards.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DiagnosticsPathGuards.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/DiagnosticsPathGuards.cs
index c031ef79..c326d6d1 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DiagnosticsPathGuards.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/DiagnosticsPathGuards.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather
 {
     /// <summary>
     /// Privacy and security guards for configurable diagnostics log paths.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/GatherRuleContext.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleContext.cs
similarity index 97%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/GatherRuleContext.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleContext.cs
index 3fe19159..530889a4 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/GatherRuleContext.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleContext.cs
@@ -4,7 +4,7 @@ using AutopilotMonitor.Agent.Core.Logging;
 using AutopilotMonitor.Agent.Core.Monitoring.Tracking;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather
 {
     /// <summary>
     /// Shared dependencies passed to each gather rule collector.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherRuleExecutor.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleExecutor.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherRuleExecutor.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleExecutor.cs
index d5c8e7a9..7ce8d9ec 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherRuleExecutor.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleExecutor.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using AutopilotMonitor.Agent.Core.Logging;
-using AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather.Collectors;
 using AutopilotMonitor.Agent.Core.Monitoring.Tracking;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather
 {
     /// <summary>
     /// Executes gather rules received from the backend API
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherRuleGuards.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleGuards.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherRuleGuards.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleGuards.cs
index 7366370c..5ab543e8 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherRuleGuards.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/GatherRuleGuards.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json.Linq;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather
 {
     /// <summary>
     /// Privacy and security guards for GatherRule collectors.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/IGatherRuleCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/IGatherRuleCollector.cs
similarity index 82%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/IGatherRuleCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/IGatherRuleCollector.cs
index 9e93b757..40824e32 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/IGatherRuleCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Gather/IGatherRuleCollector.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather
 {
     /// <summary>
     /// Strategy interface for individual gather rule collector implementations.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/AgentSelfMetricsCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/AgentSelfMetricsCollector.cs
similarity index 98%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/AgentSelfMetricsCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/AgentSelfMetricsCollector.cs
index 37d5571a..e0e06273 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/AgentSelfMetricsCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/AgentSelfMetricsCollector.cs
@@ -7,7 +7,7 @@ using AutopilotMonitor.Agent.Core.Monitoring.Core;
 using AutopilotMonitor.Agent.Core.Monitoring.Transport;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic
 {
     /// <summary>
     /// Measures the agent's own resource footprint: process CPU, memory, threads, handles,
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeliveryOptimizationCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/DeliveryOptimizationCollector.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeliveryOptimizationCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/DeliveryOptimizationCollector.cs
index 96174ae1..0011d369 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/DeliveryOptimizationCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/DeliveryOptimizationCollector.cs
@@ -12,7 +12,7 @@ using AutopilotMonitor.Shared.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic
 {
     /// <summary>
     /// Polls OS-level Delivery Optimization status via a persistent PowerShell Runspace.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/NetworkChangeDetector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/NetworkChangeDetector.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/NetworkChangeDetector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/NetworkChangeDetector.cs
index 127ddd6b..e0079c3f 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/NetworkChangeDetector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/NetworkChangeDetector.cs
@@ -12,7 +12,7 @@ using AutopilotMonitor.Agent.Core.Security;
 using AutopilotMonitor.Shared;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic
 {
     /// <summary>
     /// Detects network changes (SSID switches, wired↔wireless, IP changes) during provisioning
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/PerformanceCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/PerformanceCollector.cs
similarity index 99%
rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/PerformanceCollector.cs
rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/PerformanceCollector.cs
index 1e4ea61f..c872f944 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/PerformanceCollector.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Telemetry/Periodic/PerformanceCollector.cs
@@ -8,7 +8,7 @@ using AutopilotMonitor.Agent.Core.Logging;
 using AutopilotMonitor.Agent.Core.Monitoring.Interop;
 using AutopilotMonitor.Shared.Models;
 
-namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors
+namespace AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Periodic
 {
     /// <summary>
     /// Collects system performance metrics (CPU, memory, disk) on a configurable interval.
diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.cs
index 7b13611c..b4008a39 100644
--- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.cs
+++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.cs
@@ -298,7 +298,7 @@ namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking
         // Default IME log folder
         private const string DefaultImeLogFolder = @"%ProgramData%\Microsoft\IntuneManagementExtension\Logs";
 
-        private Collectors.DeviceInfoCollector _deviceInfoCollector;
+        private Telemetry.DeviceInfo.DeviceInfoCollector _deviceInfoCollector;
 
         // ConfigMgr (SCCM) co-management detection — fire-once guard
         private bool _configMgrDetected;
@@ -381,7 +381,7 @@ namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking
             _imeLogPatterns = imeLogPatterns ?? new List<ImeLogPattern>();
             _imeLogFolder = imeLogFolderOverride ?? DefaultImeLogFolder;
             _espAndHelloTracker = espAndHelloTracker;
-            _deviceInfoCollector = new Collectors.DeviceInfoCollector(sessionId, tenantId, emitEvent, logger);
+            _deviceInfoCollector = new Telemetry.DeviceInfo.DeviceInfoCollector(sessionId, tenantId, emitEvent, logger);
 
             // State persistence for crash recovery
             var stateDirectory = @"%ProgramData%\AutopilotMonitor\State";
diff --git a/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs b/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs
index 94d8f78e..7e2a9e00 100644
--- a/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs
+++ b/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs
@@ -7,6 +7,8 @@ using AutopilotMonitor.Agent.Core.Configuration;
 using AutopilotMonitor.Agent.Core.Monitoring.Collectors;
 using AutopilotMonitor.Agent.Core.Monitoring.Core;
 using AutopilotMonitor.Agent.Core.Monitoring.Runtime;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.DeviceInfo;
+using AutopilotMonitor.Agent.Core.Monitoring.Telemetry.Gather;
 using AutopilotMonitor.Agent.Core.Monitoring.Transport;
 using AutopilotMonitor.Shared;
 using AutopilotMonitor.Shared.Models;