diff --git a/Pal.Client/DependencyContextInitializer.cs b/Pal.Client/DependencyContextInitializer.cs
index db1c679..4f29b38 100644
--- a/Pal.Client/DependencyContextInitializer.cs
+++ b/Pal.Client/DependencyContextInitializer.cs
@@ -16,6 +16,7 @@ using Pal.Client.Configuration;
 using Pal.Client.Configuration.Legacy;
 using Pal.Client.Database;
 using Pal.Client.DependencyInjection;
+using Pal.Client.Floors;
 using Pal.Client.Windows;
 
 namespace Pal.Client
@@ -61,7 +62,7 @@ namespace Pal.Client
             _serviceProvider.GetRequiredService<AgreementWindow>();
 
             // initialize components that are mostly self-contained/self-registered
-            _serviceProvider.GetRequiredService<Hooks>();
+            _serviceProvider.GetRequiredService<GameHooks>();
             _serviceProvider.GetRequiredService<FrameworkService>();
             _serviceProvider.GetRequiredService<ChatService>();
 
diff --git a/Pal.Client/DependencyInjection/ChatService.cs b/Pal.Client/DependencyInjection/ChatService.cs
index 4b40b82..97ffaed 100644
--- a/Pal.Client/DependencyInjection/ChatService.cs
+++ b/Pal.Client/DependencyInjection/ChatService.cs
@@ -6,6 +6,7 @@ using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
 using Lumina.Excel.GeneratedSheets;
 using Pal.Client.Configuration;
+using Pal.Client.Floors;
 
 namespace Pal.Client.DependencyInjection
 {
diff --git a/Pal.Client/Hooks.cs b/Pal.Client/DependencyInjection/GameHooks.cs
similarity index 92%
rename from Pal.Client/Hooks.cs
rename to Pal.Client/DependencyInjection/GameHooks.cs
index cf4b373..7e7d868 100644
--- a/Pal.Client/Hooks.cs
+++ b/Pal.Client/DependencyInjection/GameHooks.cs
@@ -1,18 +1,18 @@
-using Dalamud.Game.ClientState.Objects.Types;
+using System;
+using System.Text;
+using Dalamud.Game.ClientState.Objects;
+using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Hooking;
 using Dalamud.Memory;
 using Dalamud.Utility.Signatures;
-using System;
-using System.Text;
-using Dalamud.Game.ClientState.Objects;
 using Microsoft.Extensions.Logging;
-using Pal.Client.DependencyInjection;
+using Pal.Client.Floors;
 
-namespace Pal.Client
+namespace Pal.Client.DependencyInjection
 {
-    internal sealed unsafe class Hooks : IDisposable
+    internal sealed unsafe class GameHooks : IDisposable
     {
-        private readonly ILogger<Hooks> _logger;
+        private readonly ILogger<GameHooks> _logger;
         private readonly ObjectTable _objectTable;
         private readonly TerritoryState _territoryState;
         private readonly FrameworkService _frameworkService;
@@ -24,7 +24,7 @@ namespace Pal.Client
         private Hook<ActorVfxCreateDelegate> ActorVfxCreateHook { get; init; } = null!;
 #pragma warning restore CS0649
 
-        public Hooks(ILogger<Hooks> logger, ObjectTable objectTable, TerritoryState territoryState, FrameworkService frameworkService)
+        public GameHooks(ILogger<GameHooks> logger, ObjectTable objectTable, TerritoryState territoryState, FrameworkService frameworkService)
         {
             _logger = logger;
             _objectTable = objectTable;
diff --git a/Pal.Client/DependencyInjectionContext.cs b/Pal.Client/DependencyInjectionContext.cs
index 00c36cb..941db6c 100644
--- a/Pal.Client/DependencyInjectionContext.cs
+++ b/Pal.Client/DependencyInjectionContext.cs
@@ -105,7 +105,7 @@ namespace Pal.Client
             // plugin-specific
             _serviceCollection.AddScoped<DependencyContextInitializer>();
             _serviceCollection.AddScoped<DebugState>();
-            _serviceCollection.AddScoped<Hooks>();
+            _serviceCollection.AddScoped<GameHooks>();
             _serviceCollection.AddScoped<RemoteApi>();
             _serviceCollection.AddScoped<ConfigurationManager>();
             _serviceCollection.AddScoped<IPalacePalConfiguration>(sp =>
diff --git a/Pal.Client/DependencyInjection/FrameworkService.cs b/Pal.Client/Floors/FrameworkService.cs
similarity index 99%
rename from Pal.Client/DependencyInjection/FrameworkService.cs
rename to Pal.Client/Floors/FrameworkService.cs
index 781bf28..84fde6f 100644
--- a/Pal.Client/DependencyInjection/FrameworkService.cs
+++ b/Pal.Client/Floors/FrameworkService.cs
@@ -2,27 +2,23 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Dalamud.Game;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Logging;
-using ImGuiNET;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
 using Pal.Client.Database;
-using Pal.Client.Extensions;
-using Pal.Client.Floors;
+using Pal.Client.DependencyInjection;
 using Pal.Client.Net;
 using Pal.Client.Rendering;
 using Pal.Client.Scheduled;
 using Pal.Common;
 
-namespace Pal.Client.DependencyInjection
+namespace Pal.Client.Floors
 {
     internal sealed class FrameworkService : IDisposable
     {
diff --git a/Pal.Client/DependencyInjection/TerritoryState.cs b/Pal.Client/Floors/TerritoryState.cs
similarity index 93%
rename from Pal.Client/DependencyInjection/TerritoryState.cs
rename to Pal.Client/Floors/TerritoryState.cs
index 43852b8..febff4c 100644
--- a/Pal.Client/DependencyInjection/TerritoryState.cs
+++ b/Pal.Client/Floors/TerritoryState.cs
@@ -1,9 +1,8 @@
 using Dalamud.Game.ClientState;
 using Dalamud.Game.ClientState.Conditions;
-using Pal.Client.Scheduled;
 using Pal.Common;
 
-namespace Pal.Client.DependencyInjection
+namespace Pal.Client.Floors
 {
     public sealed class TerritoryState
     {