diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionInfoContributor.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionInfoContributor.cs
index 8cf03f4bc8..1089261dd5 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionInfoContributor.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionInfoContributor.cs
@@ -2,6 +2,7 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp.Authorization.Permissions;
 
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationWithExternalServiceProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationWithExternalServiceProvider.cs
index 4480dd1ced..8d6ce774a4 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationWithExternalServiceProvider.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationWithExternalServiceProvider.cs
@@ -6,8 +6,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Telemetry;
-using Volo.Abp.Telemetry.Activity;
 using Volo.Abp.Telemetry.Helpers;
+using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp;
 
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/IActivityDataProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/IActivityDataProvider.cs
similarity index 100%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/IActivityDataProvider.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/IActivityDataProvider.cs
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/IActivityStorage.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/IActivityStorage.cs
similarity index 67%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/IActivityStorage.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/IActivityStorage.cs
index 652e6a68ae..9c8cf3db08 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/IActivityStorage.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/IActivityStorage.cs
@@ -1,18 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
-using Volo.Abp.Telemetry.Shared;
-using Volo.Abp.Telemetry.Shared.Enums;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Contracts;
 
 public interface IActivityStorage
 {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ISolutionInfoProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ISolutionInfoProvider.cs
similarity index 100%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ISolutionInfoProvider.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ISolutionInfoProvider.cs
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityDataProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/ActivityDataProvider.cs
similarity index 96%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityDataProvider.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/ActivityDataProvider.cs
index cf1f946dd2..7ef41af553 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityDataProvider.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/ActivityDataProvider.cs
@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Telemetry.Activity.Contracts;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.Shared;
 using Volo.Abp.Telemetry.Shared.Enums;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Providers;
 
 public class ActivityDataProvider : IActivityDataProvider, IScopedDependency
 {
@@ -53,6 +55,7 @@ public class ActivityDataProvider : IActivityDataProvider, IScopedDependency
         if (activity.ContainsKey(ActivityPropertyName.Assembly) && sessionType == SessionType.ApplicationRuntime)
         {
             await AddApplicationInformationAsync(activity);
+            activity.Remove(ActivityPropertyName.Assembly);
         }
 
         if (await ShouldAddSolutionInformation(activity))
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/SolutionInfoProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/SolutionInfoProvider.cs
similarity index 96%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/SolutionInfoProvider.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/SolutionInfoProvider.cs
index 34142f75c6..c786b48daa 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/SolutionInfoProvider.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/SolutionInfoProvider.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.Shared;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Providers;
 
 public class SolutionInfoProvider : ISolutionInfoProvider, ISingletonDependency
 {
@@ -22,7 +22,8 @@ public class SolutionInfoProvider : ISolutionInfoProvider, ISingletonDependency
             using var doc = JsonDocument.Parse(jsonContent);
             var root = doc.RootElement;
 
-            AddCreatingStudioConfiguration(result, root.GetProperty("creatingStudioConfiguration"));
+            AddSolutionInformation(result, root.GetProperty("creatingStudioConfiguration"));
+            
             result[ActivityPropertyName.LicenseType] = await GetLicenseTypeAsync();
 
             if (root.TryGetProperty("modules", out var modulesElement) && modulesElement.ValueKind == JsonValueKind.Object)
@@ -51,7 +52,7 @@ public class SolutionInfoProvider : ISolutionInfoProvider, ISingletonDependency
         return root.TryGetProperty(propertyName, out var prop) && Guid.TryParse(prop.GetString(), out var id) ? id : null;
     }
 
-    private void AddCreatingStudioConfiguration(Dictionary<string, object> dict, JsonElement config)
+    private void AddSolutionInformation(Dictionary<string, object> dict, JsonElement config)
     {
         var map = new (string Key, Action<JsonElement> Apply)[]
         {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityStorage.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/ActivityStorage.cs
similarity index 98%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityStorage.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/ActivityStorage.cs
index f10f6c3716..2e04bb2f18 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityStorage.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/ActivityStorage.cs
@@ -4,12 +4,12 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Telemetry.Activity.Contracts;
 using Volo.Abp.Telemetry.Shared;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Storage;
 
 public class ActivityStorage : IActivityStorage, ISingletonDependency
 {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityStorageState.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/ActivityStorageState.cs
similarity index 91%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityStorageState.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/ActivityStorageState.cs
index a7c0e33c03..0aebd9f387 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityStorageState.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/ActivityStorageState.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Storage;
 
 public class ActivityStorageState
 {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ApplicationInfo.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ApplicationInfo.cs
deleted file mode 100644
index 5bd2747541..0000000000
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ApplicationInfo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Volo.Abp.Telemetry;
-
-public class ApplicationInfo
-{
-    public int EntityCount { get; set; }
-    public int AppServiceCount { get; set; }
-    public int ControllerCount { get; set; }
-    public int PermissionCount { get; set; }
-    public int AbpModuleCount { get; set; }
-    public int ProjectCount { get; set; } 
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/SoftwareDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Core/SoftwareDetector.cs
similarity index 97%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/SoftwareDetector.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Core/SoftwareDetector.cs
index 215093496b..b58fd1f9a4 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/SoftwareDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Core/SoftwareDetector.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
 
-namespace Volo.Abp.Telemetry.EnvironmentInspection;
+namespace Volo.Abp.Telemetry.EnvironmentInspection.Core;
 
 [ExposeServices(typeof(ISoftwareDetector))]
 public abstract class SoftwareDetector: ISoftwareDetector , ISingletonDependency
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/AbpStudioDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/AbpStudioDetector.cs
index 6482616e05..f79c3ca00a 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/AbpStudioDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/AbpStudioDetector.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared;
 using Volo.Abp.Telemetry.Shared.Enums;
 
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/ChromeDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/ChromeDetector.cs
index 493c9d5cac..6c7140f788 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/ChromeDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/ChromeDetector.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/DotnetSdkDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/DotnetSdkDetector.cs
index afb258bc21..00211a5bb5 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/DotnetSdkDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/DotnetSdkDetector.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/FireFoxDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/FireFoxDetector.cs
index 06321f9b7b..45ead865a4 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/FireFoxDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/FireFoxDetector.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/MsEdgeDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/MsEdgeDetector.cs
index 398bd40305..7e340ca832 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/MsEdgeDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/MsEdgeDetector.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/NodeJsDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/NodeJsDetector.cs
index faf4fae89b..9b441ee57e 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/NodeJsDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/NodeJsDetector.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/OperatingSystemDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/OperatingSystemDetector.cs
index 6100644b63..b74a8ebc0a 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/OperatingSystemDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/OperatingSystemDetector.cs
@@ -4,6 +4,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.Win32;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/RiderDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/RiderDetector.cs
index b40efe4694..9235fea397 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/RiderDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/RiderDetector.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioCodeDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioCodeDetector.cs
index 74170b792b..73f1ed3d66 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioCodeDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioCodeDetector.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioDetector.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioDetector.cs
index a551c031f9..3f72ba381b 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioDetector.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioDetector.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/DeviceInfoProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Providers/DeviceInfoProvider.cs
similarity index 98%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/DeviceInfoProvider.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Providers/DeviceInfoProvider.cs
index baed39d83e..4ab8051ae7 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/DeviceInfoProvider.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Providers/DeviceInfoProvider.cs
@@ -5,13 +5,12 @@ using System.IO;
 using System.Linq;
 using System.Management;
 using System.Runtime.InteropServices;
-using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
 using Volo.Abp.Telemetry.Shared;
 using Volo.Abp.Telemetry.Shared.Enums;
 
-namespace Volo.Abp.Telemetry.EnvironmentInspection;
+namespace Volo.Abp.Telemetry.EnvironmentInspection.Providers;
 
 public class DeviceInfoProvider : IDeviceInfoProvider, ISingletonDependency
 {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/SoftwareInfoProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Providers/SoftwareInfoProvider.cs
similarity index 94%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/SoftwareInfoProvider.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Providers/SoftwareInfoProvider.cs
index c2e366a48d..011a5466d3 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/SoftwareInfoProvider.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Providers/SoftwareInfoProvider.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
 
-namespace Volo.Abp.Telemetry.EnvironmentInspection;
+namespace Volo.Abp.Telemetry.EnvironmentInspection.Providers;
 
 internal class SoftwareInfoProvider : ISoftwareInfoProvider , ISingletonDependency
 {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ModuleInfoContributor.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ModuleInfoContributor.cs
index bb6102e0b1..46c59a3525 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ModuleInfoContributor.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ModuleInfoContributor.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Shared;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ActivityNameConsts.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Shared/ActivityNameConsts.cs
similarity index 99%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ActivityNameConsts.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Shared/ActivityNameConsts.cs
index 59dfff2ea6..48894903bb 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ActivityNameConsts.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Shared/ActivityNameConsts.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.Telemetry;
+namespace Volo.Abp.Telemetry.Shared;
 
 public static class ActivityNameConsts
 {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityPropertyName.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Shared/ActivityPropertyName.cs
similarity index 99%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityPropertyName.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Shared/ActivityPropertyName.cs
index acba00a8fc..7faf4049bf 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityPropertyName.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Shared/ActivityPropertyName.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Shared;
 
 public static class ActivityPropertyName
 {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryDataSender.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryDataSender.cs
index ea8da078fe..0116c461bc 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryDataSender.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryDataSender.cs
@@ -8,6 +8,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Activity.Contracts;
 using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp.Telemetry;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs
index bc8e0196d9..694de4811c 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs
@@ -4,6 +4,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Activity.Contracts;
+using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp.Telemetry;
 
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Telemetry/DomainInfoContributor.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Telemetry/DomainInfoContributor.cs
index 4c7420eb98..06b26c1631 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Telemetry/DomainInfoContributor.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Telemetry/DomainInfoContributor.cs
@@ -5,6 +5,7 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Telemetry;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp.Domain.Telemetry;