diff --git a/src/CounterDrone.Core/Models/DroneSpec.cs b/src/CounterDrone.Core/Models/DroneSpec.cs
index a9b62e4..bbf4f0c 100644
--- a/src/CounterDrone.Core/Models/DroneSpec.cs
+++ b/src/CounterDrone.Core/Models/DroneSpec.cs
@@ -1,7 +1,7 @@
-using CounterDrone.Core.Models;
+using CounterDrone.Core.Models;
 using SQLite;
 
-namespace CounterDrone.Core
+namespace CounterDrone.Core.Models
 {
     /// <summary>无人机规格（基础数据模板）</summary>
     [Table("DroneSpec")]
diff --git a/src/CounterDrone.Core/Models/EnvironmentSpec.cs b/src/CounterDrone.Core/Models/EnvironmentSpec.cs
index 16ded46..75628cb 100644
--- a/src/CounterDrone.Core/Models/EnvironmentSpec.cs
+++ b/src/CounterDrone.Core/Models/EnvironmentSpec.cs
@@ -1,7 +1,7 @@
-using CounterDrone.Core.Models;
+using CounterDrone.Core.Models;
 using SQLite;
 
-namespace CounterDrone.Core
+namespace CounterDrone.Core.Models
 {
     /// <summary>环境规格（基础数据模板）</summary>
     [Table("EnvironmentSpec")]
diff --git a/src/CounterDrone.Core/Models/FireUnitSpec.cs b/src/CounterDrone.Core/Models/FireUnitSpec.cs
index ce73599..2840b1d 100644
--- a/src/CounterDrone.Core/Models/FireUnitSpec.cs
+++ b/src/CounterDrone.Core/Models/FireUnitSpec.cs
@@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using CounterDrone.Core.Models;
 using SQLite;
 
-namespace CounterDrone.Core
+namespace CounterDrone.Core.Models
 {
     /// <summary>火力单元规格（基础数据模板）</summary>
     [Table("FireUnitSpec")]
diff --git a/src/CounterDrone.Core/Models/FormationTemplate.cs b/src/CounterDrone.Core/Models/FormationTemplate.cs
index fdcd09f..c5abef9 100644
--- a/src/CounterDrone.Core/Models/FormationTemplate.cs
+++ b/src/CounterDrone.Core/Models/FormationTemplate.cs
@@ -1,6 +1,6 @@
-using CounterDrone.Core.Models;
+using CounterDrone.Core.Models;
 
-namespace CounterDrone.Core
+namespace CounterDrone.Core.Models
 {
     /// <summary>编队模板</summary>
     public class FormationTemplate
diff --git a/src/CounterDrone.Core/Models/PagedResult.cs b/src/CounterDrone.Core/Models/PagedResult.cs
new file mode 100644
index 0000000..f54584f
--- /dev/null
+++ b/src/CounterDrone.Core/Models/PagedResult.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace CounterDrone.Core.Models
+{
+    /// <summary>分页结果</summary>
+    public class PagedResult<T>
+    {
+        public List<T> Items { get; set; } = new();
+        public int TotalCount { get; set; }
+        public int Page { get; set; }
+        public int PageSize { get; set; }
+        public int TotalPages => (TotalCount + PageSize - 1) / PageSize;
+    }
+}
diff --git a/src/CounterDrone.Core/Models/RouteTemplate.cs b/src/CounterDrone.Core/Models/RouteTemplate.cs
index d71b2bd..db7a712 100644
--- a/src/CounterDrone.Core/Models/RouteTemplate.cs
+++ b/src/CounterDrone.Core/Models/RouteTemplate.cs
@@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using CounterDrone.Core.Models;
 using SQLite;
 
-namespace CounterDrone.Core
+namespace CounterDrone.Core.Models
 {
     /// <summary>航线模板（基础数据模板）</summary>
     [Table("RouteTemplate")]
diff --git a/src/CounterDrone.Core/Models/ScenarioConfig.cs b/src/CounterDrone.Core/Models/ScenarioConfig.cs
index 5d408bb..674c640 100644
--- a/src/CounterDrone.Core/Models/ScenarioConfig.cs
+++ b/src/CounterDrone.Core/Models/ScenarioConfig.cs
@@ -16,14 +16,4 @@ namespace CounterDrone.Core.Models
         /// <summary>按 WaveId 分组的航路点</summary>
         public Dictionary<string, List<Waypoint>> WaypointGroups { get; set; } = new();
     }
-
-    /// <summary>分页结果</summary>
-    public class PagedResult<T>
-    {
-        public List<T> Items { get; set; } = new();
-        public int TotalCount { get; set; }
-        public int Page { get; set; }
-        public int PageSize { get; set; }
-        public int TotalPages => (TotalCount + PageSize - 1) / PageSize;
-    }
 }
diff --git a/src/CounterDrone.Core/Models/ScenarioDrone.cs b/src/CounterDrone.Core/Models/ScenarioDrone.cs
index 6cc38d7..0247b8a 100644
--- a/src/CounterDrone.Core/Models/ScenarioDrone.cs
+++ b/src/CounterDrone.Core/Models/ScenarioDrone.cs
@@ -1,5 +1,6 @@
-using System;
+using System;
 using SQLite;
+using CounterDrone.Core.Models;
 
 namespace CounterDrone.Core.Models
 {
diff --git a/src/CounterDrone.Core/Models/ScenarioUnit.cs b/src/CounterDrone.Core/Models/ScenarioUnit.cs
index 144c232..86306a6 100644
--- a/src/CounterDrone.Core/Models/ScenarioUnit.cs
+++ b/src/CounterDrone.Core/Models/ScenarioUnit.cs
@@ -1,5 +1,6 @@
-using System;
+using System;
 using SQLite;
+using CounterDrone.Core.Models;
 
 namespace CounterDrone.Core.Models
 {
diff --git a/src/CounterDrone.Core/Models/SensorSpec.cs b/src/CounterDrone.Core/Models/SensorSpec.cs
index 3986e2c..9f3b5a6 100644
--- a/src/CounterDrone.Core/Models/SensorSpec.cs
+++ b/src/CounterDrone.Core/Models/SensorSpec.cs
@@ -1,7 +1,7 @@
-using CounterDrone.Core.Models;
+using CounterDrone.Core.Models;
 using SQLite;
 
-namespace CounterDrone.Core
+namespace CounterDrone.Core.Models
 {
     /// <summary>传感器规格（基础数据模板）</summary>
     [Table("SensorSpec")]
diff --git a/src/CounterDrone.Core/Repository/DroneSpecRepository.cs b/src/CounterDrone.Core/Repository/DroneSpecRepository.cs
new file mode 100644
index 0000000..506b750
--- /dev/null
+++ b/src/CounterDrone.Core/Repository/DroneSpecRepository.cs
@@ -0,0 +1,11 @@
+using CounterDrone.Core;
+using SQLite;
+using CounterDrone.Core.Models;
+
+namespace CounterDrone.Core.Repository
+{
+    public class DroneSpecRepository : BaseRepository<DroneSpec>
+    {
+        public DroneSpecRepository(SQLiteConnection db) : base(db) { }
+    }
+}
diff --git a/src/CounterDrone.Core/Repository/EnvironmentSpecRepository.cs b/src/CounterDrone.Core/Repository/EnvironmentSpecRepository.cs
new file mode 100644
index 0000000..b1199dd
--- /dev/null
+++ b/src/CounterDrone.Core/Repository/EnvironmentSpecRepository.cs
@@ -0,0 +1,11 @@
+using CounterDrone.Core;
+using SQLite;
+using CounterDrone.Core.Models;
+
+namespace CounterDrone.Core.Repository
+{
+    public class EnvironmentSpecRepository : BaseRepository<EnvironmentSpec>
+    {
+        public EnvironmentSpecRepository(SQLiteConnection db) : base(db) { }
+    }
+}
diff --git a/src/CounterDrone.Core/Repository/FireUnitSpecRepository.cs b/src/CounterDrone.Core/Repository/FireUnitSpecRepository.cs
new file mode 100644
index 0000000..9f9ef6d
--- /dev/null
+++ b/src/CounterDrone.Core/Repository/FireUnitSpecRepository.cs
@@ -0,0 +1,11 @@
+using CounterDrone.Core;
+using SQLite;
+using CounterDrone.Core.Models;
+
+namespace CounterDrone.Core.Repository
+{
+    public class FireUnitSpecRepository : BaseRepository<FireUnitSpec>
+    {
+        public FireUnitSpecRepository(SQLiteConnection db) : base(db) { }
+    }
+}
diff --git a/src/CounterDrone.Core/Repository/FormationTemplateRepository.cs b/src/CounterDrone.Core/Repository/FormationTemplateRepository.cs
new file mode 100644
index 0000000..4e9a99f
--- /dev/null
+++ b/src/CounterDrone.Core/Repository/FormationTemplateRepository.cs
@@ -0,0 +1,11 @@
+using CounterDrone.Core;
+using SQLite;
+using CounterDrone.Core.Models;
+
+namespace CounterDrone.Core.Repository
+{
+    public class FormationTemplateRepository : BaseRepository<FormationTemplate>
+    {
+        public FormationTemplateRepository(SQLiteConnection db) : base(db) { }
+    }
+}
diff --git a/src/CounterDrone.Core/Repository/RouteTemplateRepository.cs b/src/CounterDrone.Core/Repository/RouteTemplateRepository.cs
new file mode 100644
index 0000000..d92d6dd
--- /dev/null
+++ b/src/CounterDrone.Core/Repository/RouteTemplateRepository.cs
@@ -0,0 +1,11 @@
+using CounterDrone.Core;
+using SQLite;
+using CounterDrone.Core.Models;
+
+namespace CounterDrone.Core.Repository
+{
+    public class RouteTemplateRepository : BaseRepository<RouteTemplate>
+    {
+        public RouteTemplateRepository(SQLiteConnection db) : base(db) { }
+    }
+}
diff --git a/src/CounterDrone.Core/Repository/SensorSpecRepository.cs b/src/CounterDrone.Core/Repository/SensorSpecRepository.cs
new file mode 100644
index 0000000..eba9314
--- /dev/null
+++ b/src/CounterDrone.Core/Repository/SensorSpecRepository.cs
@@ -0,0 +1,11 @@
+using CounterDrone.Core;
+using SQLite;
+using CounterDrone.Core.Models;
+
+namespace CounterDrone.Core.Repository
+{
+    public class SensorSpecRepository : BaseRepository<SensorSpec>
+    {
+        public SensorSpecRepository(SQLiteConnection db) : base(db) { }
+    }
+}
diff --git a/src/CounterDrone.Core/Repository/SpecRepositories.cs b/src/CounterDrone.Core/Repository/SpecRepositories.cs
deleted file mode 100644
index f8fd1a2..0000000
--- a/src/CounterDrone.Core/Repository/SpecRepositories.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using CounterDrone.Core;
-using SQLite;
-
-namespace CounterDrone.Core.Repository
-{
-    public class FireUnitSpecRepository : BaseRepository<FireUnitSpec>
-    {
-        public FireUnitSpecRepository(SQLiteConnection db) : base(db) { }
-    }
-
-    public class DroneSpecRepository : BaseRepository<DroneSpec>
-    {
-        public DroneSpecRepository(SQLiteConnection db) : base(db) { }
-    }
-
-    public class SensorSpecRepository : BaseRepository<SensorSpec>
-    {
-        public SensorSpecRepository(SQLiteConnection db) : base(db) { }
-    }
-
-    public class EnvironmentSpecRepository : BaseRepository<EnvironmentSpec>
-    {
-        public EnvironmentSpecRepository(SQLiteConnection db) : base(db) { }
-    }
-
-    public class FormationTemplateRepository : BaseRepository<FormationTemplate>
-    {
-        public FormationTemplateRepository(SQLiteConnection db) : base(db) { }
-    }
-
-    public class RouteTemplateRepository : BaseRepository<RouteTemplate>
-    {
-        public RouteTemplateRepository(SQLiteConnection db) : base(db) { }
-    }
-}
diff --git a/src/CounterDrone.Core/Services/EnumMetadata.cs b/src/CounterDrone.Core/Services/EnumMetadata.cs
new file mode 100644
index 0000000..ba9c260
--- /dev/null
+++ b/src/CounterDrone.Core/Services/EnumMetadata.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+
+namespace CounterDrone.Core.Services
+{
+    /// <summary>枚举元数据（前端下拉框数据源）</summary>
+    public class EnumMetadata
+    {
+        public Dictionary<string, int> DroneType { get; set; } = new();
+        public Dictionary<string, int> PowerType { get; set; } = new();
+        public Dictionary<string, int> PlatformType { get; set; } = new();
+        public Dictionary<string, int> AerosolType { get; set; } = new();
+        public Dictionary<string, int> WeatherType { get; set; } = new();
+        public Dictionary<string, int> WindDirection { get; set; } = new();
+        public Dictionary<string, int> SceneType { get; set; } = new();
+        public Dictionary<string, int> FormationMode { get; set; } = new();
+        public Dictionary<string, int> TriggerMode { get; set; } = new();
+        public Dictionary<string, int> ReleaseMode { get; set; } = new();
+        public Dictionary<string, int> EquipmentRole { get; set; } = new();
+    }
+}
diff --git a/src/CounterDrone.Core/Services/IScenarioService.cs b/src/CounterDrone.Core/Services/IScenarioService.cs
index 95c107e..0d8fcdd 100644
--- a/src/CounterDrone.Core/Services/IScenarioService.cs
+++ b/src/CounterDrone.Core/Services/IScenarioService.cs
@@ -60,20 +60,4 @@ namespace CounterDrone.Core.Services
         /// <summary>返回所有枚举定义（供前端下拉框使用）</summary>
         EnumMetadata GetEnums();
     }
-
-    /// <summary>枚举元数据</summary>
-    public class EnumMetadata
-    {
-        public Dictionary<string, int> DroneType { get; set; } = new();
-        public Dictionary<string, int> PowerType { get; set; } = new();
-        public Dictionary<string, int> PlatformType { get; set; } = new();
-        public Dictionary<string, int> AerosolType { get; set; } = new();
-        public Dictionary<string, int> WeatherType { get; set; } = new();
-        public Dictionary<string, int> WindDirection { get; set; } = new();
-        public Dictionary<string, int> SceneType { get; set; } = new();
-        public Dictionary<string, int> FormationMode { get; set; } = new();
-        public Dictionary<string, int> TriggerMode { get; set; } = new();
-        public Dictionary<string, int> ReleaseMode { get; set; } = new();
-        public Dictionary<string, int> EquipmentRole { get; set; } = new();
-    }
 }