diff --git a/Directory.Build.props b/Directory.Build.props
index 42731fba8..0274eff1c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -38,5 +38,21 @@
 			<HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
 			<Private>False</Private>
 		</Reference>
+
+		<Using Include="Dalamud.Game.ClientState.JobGauge.Enums" />
+		<Using Include="Dalamud.Game.ClientState.Objects.Types" />
+		<Using Include="Dalamud.Interface" />
+		<Using Include="ImGuiNET" />
+		<Using Include="Newtonsoft.Json" />
+		<Using Include="RotationSolver.Basic" />
+		<Using Include="RotationSolver.Basic.Actions" />
+		<Using Include="RotationSolver.Basic.Attributes" />
+		<Using Include="RotationSolver.Basic.Configuration.RotationConfig" />
+		<Using Include="RotationSolver.Basic.Data" />
+		<Using Include="RotationSolver.Basic.Helpers" />
+		<Using Include="RotationSolver.Basic.Rotations" />
+		<Using Include="RotationSolver.Basic.Rotations.Basic" />
+		<Using Include="System.Numerics" />
+		<Using Include="System.Reflection" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/RotationSolver.Basic/Actions/BaseAction/BaseAction_ActionInfo.cs b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
similarity index 93%
rename from RotationSolver.Basic/Actions/BaseAction/BaseAction_ActionInfo.cs
rename to RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
index b3584af66..802517d02 100644
--- a/RotationSolver.Basic/Actions/BaseAction/BaseAction_ActionInfo.cs
+++ b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
@@ -1,12 +1,6 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using FFXIVClientStructs.FFXIV.Client.Game;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
-namespace RotationSolver.Actions.BaseAction;
+using FFXIVClientStructs.FFXIV.Client.Game;
+
+namespace RotationSolver.Basic.Actions;
 
 public partial class BaseAction
 {
diff --git a/RotationSolver.Basic/Actions/BaseAction/BaseAction_BasicInfo.cs b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
similarity index 94%
rename from RotationSolver.Basic/Actions/BaseAction/BaseAction_BasicInfo.cs
rename to RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
index bba6617ef..580e6f5b5 100644
--- a/RotationSolver.Basic/Actions/BaseAction/BaseAction_BasicInfo.cs
+++ b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
@@ -1,11 +1,7 @@
 using FFXIVClientStructs.FFXIV.Client.Game;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
 using Action = Lumina.Excel.GeneratedSheets.Action;
 
-namespace RotationSolver.Actions.BaseAction;
+namespace RotationSolver.Basic.Actions;
 
 public partial class BaseAction : IBaseAction
 {
diff --git a/RotationSolver.Basic/Actions/BaseAction/BaseAction_Cooldown.cs b/RotationSolver.Basic/Actions/BaseAction_Cooldown.cs
similarity index 95%
rename from RotationSolver.Basic/Actions/BaseAction/BaseAction_Cooldown.cs
rename to RotationSolver.Basic/Actions/BaseAction_Cooldown.cs
index d9038b82a..b837c1f01 100644
--- a/RotationSolver.Basic/Actions/BaseAction/BaseAction_Cooldown.cs
+++ b/RotationSolver.Basic/Actions/BaseAction_Cooldown.cs
@@ -1,9 +1,6 @@
 using FFXIVClientStructs.FFXIV.Client.Game;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Helpers;
-using System.ComponentModel;
 
-namespace RotationSolver.Actions.BaseAction;
+namespace RotationSolver.Basic.Actions;
 
 public partial class BaseAction
 {
diff --git a/RotationSolver.Basic/Actions/BaseAction/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
similarity index 98%
rename from RotationSolver.Basic/Actions/BaseAction/BaseAction_Target.cs
rename to RotationSolver.Basic/Actions/BaseAction_Target.cs
index 31a706d3f..c16df7985 100644
--- a/RotationSolver.Basic/Actions/BaseAction/BaseAction_Target.cs
+++ b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -1,13 +1,8 @@
 using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Logging;
 using FFXIVClientStructs.FFXIV.Client.Game;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using System.Numerics;
 
-namespace RotationSolver.Actions.BaseAction;
+namespace RotationSolver.Basic.Actions;
 
 public partial class BaseAction
 {
diff --git a/RotationSolver.Basic/Actions/BaseItem.cs b/RotationSolver.Basic/Actions/BaseItem.cs
index 2672acea9..2df7f91f4 100644
--- a/RotationSolver.Basic/Actions/BaseItem.cs
+++ b/RotationSolver.Basic/Actions/BaseItem.cs
@@ -1,7 +1,5 @@
 using FFXIVClientStructs.FFXIV.Client.Game;
 using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Helpers;
 
 namespace RotationSolver.Basic.Actions;
 
diff --git a/RotationSolver.Basic/Actions/IAction.cs b/RotationSolver.Basic/Actions/IAction.cs
index 78b0ee64a..34831f84b 100644
--- a/RotationSolver.Basic/Actions/IAction.cs
+++ b/RotationSolver.Basic/Actions/IAction.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel;
-
-namespace RotationSolver.Basic.Actions;
+namespace RotationSolver.Basic.Actions;
 
 public interface IAction : ITexture
 {
diff --git a/RotationSolver.Basic/Actions/IBaseAction.cs b/RotationSolver.Basic/Actions/IBaseAction.cs
index 2c4d16240..a64c5d26e 100644
--- a/RotationSolver.Basic/Actions/IBaseAction.cs
+++ b/RotationSolver.Basic/Actions/IBaseAction.cs
@@ -1,8 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using RotationSolver.Basic.Data;
-using System;
-
-namespace RotationSolver.Basic.Actions
+namespace RotationSolver.Basic.Actions
 {
     public interface IBaseAction : IAction
     {
diff --git a/RotationSolver.Basic/Actions/IBaseItem.cs b/RotationSolver.Basic/Actions/IBaseItem.cs
index cdfcd3929..4148bdd7e 100644
--- a/RotationSolver.Basic/Actions/IBaseItem.cs
+++ b/RotationSolver.Basic/Actions/IBaseItem.cs
@@ -1,7 +1,6 @@
-namespace RotationSolver.Basic.Actions
+namespace RotationSolver.Basic.Actions;
+
+public interface IBaseItem : IAction
 {
-    public interface IBaseItem : IAction
-    {
-        bool CanUse(out IAction item);
-    }
+    bool CanUse(out IAction item);
 }
diff --git a/RotationSolver.Basic/Actions/MedicineItem.cs b/RotationSolver.Basic/Actions/MedicineItem.cs
index 04b413417..55f0e1e2c 100644
--- a/RotationSolver.Basic/Actions/MedicineItem.cs
+++ b/RotationSolver.Basic/Actions/MedicineItem.cs
@@ -1,7 +1,4 @@
-using RotationSolver.Basic.Rotations;
-using RotationSolver.Rotations.CustomRotation;
-
-namespace RotationSolver.Basic.Actions
+namespace RotationSolver.Basic.Actions
 {
     internal class MedicineItem : BaseItem
     {
diff --git a/RotationSolver.Basic/Attributes/LinkDescriptionAttribute.cs b/RotationSolver.Basic/Attributes/LinkDescriptionAttribute.cs
index 304b7c653..c71ba6dc1 100644
--- a/RotationSolver.Basic/Attributes/LinkDescriptionAttribute.cs
+++ b/RotationSolver.Basic/Attributes/LinkDescriptionAttribute.cs
@@ -1,9 +1,4 @@
-using Dalamud.Utility;
-using System.Net;
-using System;
-using ImGuiScene;
-using Dalamud.Interface.Internal;
-using RotationSolver.Basic.Data;
+using ImGuiScene;
 
 namespace RotationSolver.Basic.Attributes;
 
diff --git a/RotationSolver.Basic/Attributes/RotationDescAttribute.cs b/RotationSolver.Basic/Attributes/RotationDescAttribute.cs
index 16fab48d5..2ebdb05aa 100644
--- a/RotationSolver.Basic/Attributes/RotationDescAttribute.cs
+++ b/RotationSolver.Basic/Attributes/RotationDescAttribute.cs
@@ -1,7 +1,4 @@
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-
-namespace RotationSolver.Basic.Attributes;
+namespace RotationSolver.Basic.Attributes;
 
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class RotationDescAttribute : Attribute
diff --git a/RotationSolver.Basic/Attributes/SourceCodeAttribute.cs b/RotationSolver.Basic/Attributes/SourceCodeAttribute.cs
index 4a26dc813..9225c8e12 100644
--- a/RotationSolver.Basic/Attributes/SourceCodeAttribute.cs
+++ b/RotationSolver.Basic/Attributes/SourceCodeAttribute.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RotationSolver.Basic.Attributes;
+namespace RotationSolver.Basic.Attributes;
 
 [AttributeUsage(AttributeTargets.Class)]
 public class SourceCodeAttribute : Attribute
diff --git a/RotationSolver.Basic/Configuration/JsonCreationConverter.cs b/RotationSolver.Basic/Configuration/JsonCreationConverter.cs
deleted file mode 100644
index d2c29088b..000000000
--- a/RotationSolver.Basic/Configuration/JsonCreationConverter.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace RotationSolver.Basic.Configuration
-{
-    internal class JsonCreationConverter<T>
-    {
-    }
-}
\ No newline at end of file
diff --git a/RotationSolver.Basic/Configuration/MacroInfo.cs b/RotationSolver.Basic/Configuration/MacroInfo.cs
index 3c9d61a75..d9d7c935d 100644
--- a/RotationSolver.Basic/Configuration/MacroInfo.cs
+++ b/RotationSolver.Basic/Configuration/MacroInfo.cs
@@ -1,6 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using FFXIVClientStructs.FFXIV.Client.UI.Misc;
-using RotationSolver.Basic.Data;
+using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 
 namespace RotationSolver.Basic.Configuration;
 
diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
index f1e2876cb..e32d9e981 100644
--- a/RotationSolver.Basic/Configuration/PluginConfiguration.cs
+++ b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -1,8 +1,5 @@
 using Dalamud.Configuration;
 using Dalamud.Game.ClientState.GamePad;
-using Newtonsoft.Json;
-using RotationSolver.Basic.Data;
-using System.Numerics;
 
 namespace RotationSolver.Basic.Configuration;
 
diff --git a/RotationSolver.Basic/Configuration/RotationConfig/IRotationConfig.cs b/RotationSolver.Basic/Configuration/RotationConfig/IRotationConfig.cs
index ab3ce3e18..a8a920eb5 100644
--- a/RotationSolver.Basic/Configuration/RotationConfig/IRotationConfig.cs
+++ b/RotationSolver.Basic/Configuration/RotationConfig/IRotationConfig.cs
@@ -1,6 +1,4 @@
-using RotationSolver.Basic.Data;
-
-namespace RotationSolver.Basic.Configuration.RotationConfig;
+namespace RotationSolver.Basic.Configuration.RotationConfig;
 
 public interface IRotationConfig
 {
diff --git a/RotationSolver.Basic/Configuration/RotationConfig/IRotationConfigSet.cs b/RotationSolver.Basic/Configuration/RotationConfig/IRotationConfigSet.cs
index 1eaf6f0f7..dd154005e 100644
--- a/RotationSolver.Basic/Configuration/RotationConfig/IRotationConfigSet.cs
+++ b/RotationSolver.Basic/Configuration/RotationConfig/IRotationConfigSet.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace RotationSolver.Basic.Configuration.RotationConfig;
+namespace RotationSolver.Basic.Configuration.RotationConfig;
 
 public interface IRotationConfigSet : IEnumerable<IRotationConfig>
 {
diff --git a/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigBase.cs b/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigBase.cs
index 6d2991db1..4d1dbd026 100644
--- a/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigBase.cs
+++ b/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigBase.cs
@@ -1,8 +1,4 @@
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using System.Collections.Generic;
-
-namespace RotationSolver.Basic.Configuration.RotationConfig;
+namespace RotationSolver.Basic.Configuration.RotationConfig;
 
 public abstract class RotationConfigBase : IRotationConfig
 {
diff --git a/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigCombo.cs b/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigCombo.cs
index b515e4ce2..370dad3ba 100644
--- a/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigCombo.cs
+++ b/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigCombo.cs
@@ -1,6 +1,4 @@
-using RotationSolver.Basic.Data;
-
-namespace RotationSolver.Basic.Configuration.RotationConfig;
+namespace RotationSolver.Basic.Configuration.RotationConfig;
 
 public class RotationConfigCombo : RotationConfigBase
 {
diff --git a/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigComparer.cs b/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigComparer.cs
index 8faafd9f8..b23021d15 100644
--- a/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigComparer.cs
+++ b/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigComparer.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 
 namespace RotationSolver.Basic.Configuration.RotationConfig
 {
diff --git a/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigSet.cs b/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigSet.cs
index 5d814bd6d..15338a393 100644
--- a/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigSet.cs
+++ b/RotationSolver.Basic/Configuration/RotationConfig/RotationConfigSet.cs
@@ -1,7 +1,4 @@
-using RotationSolver.Basic.Data;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections;
 
 namespace RotationSolver.Basic.Configuration.RotationConfig;
 
diff --git a/RotationSolver.Basic/Data/ActionEffectSet.cs b/RotationSolver.Basic/Data/ActionEffectSet.cs
index 758529a68..7355e7f8c 100644
--- a/RotationSolver.Basic/Data/ActionEffectSet.cs
+++ b/RotationSolver.Basic/Data/ActionEffectSet.cs
@@ -1,5 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using FFXIVClientStructs.FFXIV.Client.Game;
+using FFXIVClientStructs.FFXIV.Client.Game;
 using Action = Lumina.Excel.GeneratedSheets.Action;
 
 namespace RotationSolver.Basic.Data;
diff --git a/RotationSolver.Basic/Data/ChatPayload.cs b/RotationSolver.Basic/Data/ChatPayload.cs
index 6d1c982a0..56f401a80 100644
--- a/RotationSolver.Basic/Data/ChatPayload.cs
+++ b/RotationSolver.Basic/Data/ChatPayload.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using System.Text;
 
 namespace RotationSolver.Basic.Data;
diff --git a/RotationSolver.Basic/Data/IconSet.cs b/RotationSolver.Basic/Data/IconSet.cs
index fa9306e49..7439b4e67 100644
--- a/RotationSolver.Basic/Data/IconSet.cs
+++ b/RotationSolver.Basic/Data/IconSet.cs
@@ -1,7 +1,5 @@
 using Dalamud.Utility;
 using ImGuiScene;
-using RotationSolver.Basic.Rotations;
-using System.Collections.Generic;
 using System.Net;
 
 namespace RotationSolver.Basic.Data;
diff --git a/RotationSolver.Basic/Data/MacroItem.cs b/RotationSolver.Basic/Data/MacroItem.cs
index 496262d22..90480dbff 100644
--- a/RotationSolver.Basic/Data/MacroItem.cs
+++ b/RotationSolver.Basic/Data/MacroItem.cs
@@ -1,7 +1,5 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using FFXIVClientStructs.FFXIV.Client.UI.Misc;
+using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using FFXIVClientStructs.FFXIV.Client.UI.Shell;
-using RotationSolver.Basic;
 
 namespace RotationSolver.Basic.Data;
 
diff --git a/RotationSolver.Basic/Data/NextAct.cs b/RotationSolver.Basic/Data/NextAct.cs
index 382d65f37..0e92818d2 100644
--- a/RotationSolver.Basic/Data/NextAct.cs
+++ b/RotationSolver.Basic/Data/NextAct.cs
@@ -1,5 +1,3 @@
-using RotationSolver.Basic.Actions;
-
-namespace RotationSolver.Basic.Data;
+namespace RotationSolver.Basic.Data;
 
 public record NextAct(IAction act, DateTime deadTime);
diff --git a/RotationSolver.Basic/Data/ObjectListDelay.cs b/RotationSolver.Basic/Data/ObjectListDelay.cs
index 3242d1526..a2cf6d781 100644
--- a/RotationSolver.Basic/Data/ObjectListDelay.cs
+++ b/RotationSolver.Basic/Data/ObjectListDelay.cs
@@ -1,5 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using System.Collections;
+using System.Collections;
 
 namespace RotationSolver.Basic.Data;
 
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
index b61e76ba3..27c181b5c 100644
--- a/RotationSolver.Basic/DataCenter.cs
+++ b/RotationSolver.Basic/DataCenter.cs
@@ -1,13 +1,9 @@
 using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Logging;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Fate;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
 using Action = Lumina.Excel.GeneratedSheets.Action;
 using CharacterManager = FFXIVClientStructs.FFXIV.Client.Game.Character.CharacterManager;
 
diff --git a/RotationSolver.Basic/Helpers/ActionHelper.cs b/RotationSolver.Basic/Helpers/ActionHelper.cs
index 2b6ebaa5d..8f4984c70 100644
--- a/RotationSolver.Basic/Helpers/ActionHelper.cs
+++ b/RotationSolver.Basic/Helpers/ActionHelper.cs
@@ -1,5 +1,4 @@
-using RotationSolver.Basic.Data;
-using Action = Lumina.Excel.GeneratedSheets.Action;
+using Action = Lumina.Excel.GeneratedSheets.Action;
 
 
 namespace RotationSolver.Basic.Helpers;
diff --git a/RotationSolver.Basic/Helpers/ConfigurationHelper.cs b/RotationSolver.Basic/Helpers/ConfigurationHelper.cs
index 7d9f7fa10..541f527b0 100644
--- a/RotationSolver.Basic/Helpers/ConfigurationHelper.cs
+++ b/RotationSolver.Basic/Helpers/ConfigurationHelper.cs
@@ -1,7 +1,4 @@
 using Dalamud.Game.ClientState.Keys;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using System.Collections.Generic;
 
 namespace RotationSolver.Basic.Helpers;
 
diff --git a/RotationSolver.Basic/Helpers/CooldownHelper.cs b/RotationSolver.Basic/Helpers/CooldownHelper.cs
index 33f8f3a85..a4e53c2fd 100644
--- a/RotationSolver.Basic/Helpers/CooldownHelper.cs
+++ b/RotationSolver.Basic/Helpers/CooldownHelper.cs
@@ -1,6 +1,4 @@
-using RotationSolver.Basic;
-
-namespace RotationSolver.Basic.Helpers;
+namespace RotationSolver.Basic.Helpers;
 
 public static class CooldownHelper
 {
diff --git a/RotationSolver.Basic/Helpers/IActionHelper.cs b/RotationSolver.Basic/Helpers/IActionHelper.cs
index f7f1e4b7c..05da3c8a0 100644
--- a/RotationSolver.Basic/Helpers/IActionHelper.cs
+++ b/RotationSolver.Basic/Helpers/IActionHelper.cs
@@ -1,8 +1,4 @@
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-
-namespace RotationSolver.Basic.Helpers;
+namespace RotationSolver.Basic.Helpers;
 
 public static class IActionHelper
 {
diff --git a/RotationSolver.Basic/Helpers/MarkingHelper.cs b/RotationSolver.Basic/Helpers/MarkingHelper.cs
index 2c22b23ce..3a26ec1da 100644
--- a/RotationSolver.Basic/Helpers/MarkingHelper.cs
+++ b/RotationSolver.Basic/Helpers/MarkingHelper.cs
@@ -1,5 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using FFXIVClientStructs.FFXIV.Client.Game.UI;
+using FFXIVClientStructs.FFXIV.Client.Game.UI;
 
 namespace RotationSolver.Basic.Helpers;
 
diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
index 3c31b18de..5e34ec671 100644
--- a/RotationSolver.Basic/Helpers/ObjectHelper.cs
+++ b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -1,11 +1,7 @@
 using Dalamud.Game.ClientState.Objects.Enums;
-using Dalamud.Game.ClientState.Objects.Types;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Event;
 using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using System.Numerics;
 
 namespace RotationSolver.Basic.Helpers;
 
diff --git a/RotationSolver.Basic/Helpers/ReflectionHelper.cs b/RotationSolver.Basic/Helpers/ReflectionHelper.cs
index 90168f4e2..582f55800 100644
--- a/RotationSolver.Basic/Helpers/ReflectionHelper.cs
+++ b/RotationSolver.Basic/Helpers/ReflectionHelper.cs
@@ -1,7 +1,4 @@
-using System.ComponentModel;
-using System.Reflection;
-
-namespace RotationSolver.Basic.Helpers;
+namespace RotationSolver.Basic.Helpers;
 
 public static class ReflectionHelper
 {
diff --git a/RotationSolver.Basic/Helpers/StatusHelper.cs b/RotationSolver.Basic/Helpers/StatusHelper.cs
index e95b77656..8bb8ff886 100644
--- a/RotationSolver.Basic/Helpers/StatusHelper.cs
+++ b/RotationSolver.Basic/Helpers/StatusHelper.cs
@@ -1,7 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Game.ClientState.Statuses;
-using RotationSolver.Basic.Data;
-using System.ComponentModel;
+using Dalamud.Game.ClientState.Statuses;
 
 
 namespace RotationSolver.Basic.Helpers;
diff --git a/RotationSolver.Basic/Helpers/TargetFilter.cs b/RotationSolver.Basic/Helpers/TargetFilter.cs
index 634b67a5d..d1017a5c9 100644
--- a/RotationSolver.Basic/Helpers/TargetFilter.cs
+++ b/RotationSolver.Basic/Helpers/TargetFilter.cs
@@ -1,8 +1,5 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic.Data;
+using Lumina.Excel.GeneratedSheets;
 using System.Data;
-using System.Numerics;
 
 namespace RotationSolver.Basic.Helpers;
 
diff --git a/RotationSolver.Basic/RotationSolver.Basic.csproj b/RotationSolver.Basic/RotationSolver.Basic.csproj
index 9f13ac550..b7f67f6f1 100644
--- a/RotationSolver.Basic/RotationSolver.Basic.csproj
+++ b/RotationSolver.Basic/RotationSolver.Basic.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
 	  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	  <PackageIcon>RotationSolverIcon_128.png</PackageIcon>
@@ -15,19 +14,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\COPYING.LESSER">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-    <None Include="..\docs\RotationSolverIcon_128.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
-	<ItemGroup>
+	  <Using Include="System.ComponentModel" />
+	  <Using Include="Dalamud.Game.ClientState.JobGauge.Types" />
+
+
+	  <None Include="..\COPYING.LESSER">
+		<Pack>True</Pack>
+		<PackagePath>\</PackagePath>
+      </None>
+      <None Include="..\docs\RotationSolverIcon_128.png">
+		<Pack>True</Pack>
+		<PackagePath>\</PackagePath>
+      </None>
 	  <None Update="README.md">
-	    <Pack>True</Pack>
-	    <PackagePath>\</PackagePath>
+		<Pack>True</Pack>
+		<PackagePath>\</PackagePath>
 	  </None>
-	</ItemGroup>
+  </ItemGroup>
 </Project>
diff --git a/RotationSolver.Basic/Rotations/Basic/AST_Base.cs b/RotationSolver.Basic/Rotations/Basic/AST_Base.cs
index 8d9222d3c..415fdf894 100644
--- a/RotationSolver.Basic/Rotations/Basic/AST_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/AST_Base.cs
@@ -1,12 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Enums;
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class AST_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs
index de59bc21e..c7a289a39 100644
--- a/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs
@@ -1,12 +1,4 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
-namespace RotationSolver.Basic.Rotations.Basic;
+namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract partial class BLM_Base : CustomRotation
 {
diff --git a/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs
index 366b7133c..a752673bc 100644
--- a/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs
@@ -1,14 +1,4 @@
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Configuration.RotationConfig;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-using System.Linq;
-
-namespace RotationSolver.Basic.Rotations.Basic;
-
+namespace RotationSolver.Basic.Rotations.Basic;
 
 public interface IBLUAction : IBaseAction
 {
diff --git a/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs b/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs
index 1d75c4b88..0c46202b5 100644
--- a/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs
@@ -1,12 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Enums;
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class BRD_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs b/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs
index 9a8ff5af5..94e884c94 100644
--- a/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs
@@ -1,11 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 public abstract class DNC_Base : CustomRotation
 {
diff --git a/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs b/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs
index 875425041..82584373b 100644
--- a/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs
@@ -1,11 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class DRG_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs b/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs
index ccd26a143..5ee4b3c1c 100644
--- a/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs
@@ -1,12 +1,4 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
-namespace RotationSolver.Basic.Rotations.Basic;
+namespace RotationSolver.Basic.Rotations.Basic;
 public abstract class DRK_Base : CustomRotation
 {
     private static DRKGauge JobGauge => Service.JobGauges.Get<DRKGauge>();
diff --git a/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs b/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs
index efb6a01f2..28877502d 100644
--- a/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs
@@ -1,12 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-using static FFXIVClientStructs.FFXIV.Client.UI.Misc.ConfigModule;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class GNB_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs b/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs
index d49349e5a..5be9af97f 100644
--- a/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs
@@ -1,11 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class MCH_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/MNK_Base.cs b/RotationSolver.Basic/Rotations/Basic/MNK_Base.cs
index 7171b74a2..ce15339d4 100644
--- a/RotationSolver.Basic/Rotations/Basic/MNK_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/MNK_Base.cs
@@ -1,12 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Enums;
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class MNK_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs b/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs
index f825c71d0..59398cf52 100644
--- a/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs
@@ -1,11 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public interface INinAction : IBaseAction
diff --git a/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs b/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs
index cbc465956..615328886 100644
--- a/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs
@@ -1,12 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-using static FFXIVClientStructs.FFXIV.Client.UI.Misc.ConfigModule;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class PLD_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs b/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs
index d8ce1aa72..125709c8e 100644
--- a/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs
@@ -1,12 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-using static FFXIVClientStructs.FFXIV.Client.UI.Misc.ConfigModule;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class RDM_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs b/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs
index 4f8bf4aae..02e0b33a2 100644
--- a/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs
@@ -1,13 +1,4 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-using static FFXIVClientStructs.FFXIV.Client.UI.Misc.ConfigModule;
-
-namespace RotationSolver.Basic.Rotations.Basic;
+namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class RPR_Base : CustomRotation
 {
diff --git a/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs b/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs
index 0ee984729..1e4000b39 100644
--- a/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs
@@ -1,12 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-using static FFXIVClientStructs.FFXIV.Client.UI.Misc.ConfigModule;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class SAM_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/SCH_Base.cs b/RotationSolver.Basic/Rotations/Basic/SCH_Base.cs
index 364a75aec..ddcb10b87 100644
--- a/RotationSolver.Basic/Rotations/Basic/SCH_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/SCH_Base.cs
@@ -1,10 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class SCH_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs b/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs
index c503668f9..1d0301632 100644
--- a/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs
@@ -1,12 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-using static FFXIVClientStructs.FFXIV.Client.UI.Misc.ConfigModule;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class SGE_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs b/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs
index de705cc32..1cb15c2b3 100644
--- a/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs
@@ -1,11 +1,4 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Rotations.CustomRotation;
-
-namespace RotationSolver.Basic.Rotations.Basic;
+namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class SMN_Base : CustomRotation
 {
diff --git a/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs b/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs
index fced92951..39f82eb5d 100644
--- a/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs
@@ -1,12 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-using System.ComponentModel;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class WAR_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/Basic/WHM_Base.cs b/RotationSolver.Basic/Rotations/Basic/WHM_Base.cs
index dd227dbfa..c6bf45f10 100644
--- a/RotationSolver.Basic/Rotations/Basic/WHM_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/WHM_Base.cs
@@ -1,10 +1,3 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-
 namespace RotationSolver.Basic.Rotations.Basic;
 
 public abstract class WHM_Base : CustomRotation
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
index 4ab4766fc..e874d0199 100644
--- a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
+++ b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
@@ -1,11 +1,4 @@
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-
-namespace RotationSolver.Rotations.CustomRotation;
+namespace RotationSolver.Basic.Rotations;
 
 public abstract partial class CustomRotation
 {
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
index a774fb6de..25aeb4351 100644
--- a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
+++ b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -1,13 +1,4 @@
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Basic.Rotations.Basic;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace RotationSolver.Rotations.CustomRotation;
+namespace RotationSolver.Basic.Rotations;
 
 public abstract partial class CustomRotation
 {
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_BasicInfo.cs b/RotationSolver.Basic/Rotations/CustomRotation_BasicInfo.cs
index 9434e3478..1146a0507 100644
--- a/RotationSolver.Basic/Rotations/CustomRotation_BasicInfo.cs
+++ b/RotationSolver.Basic/Rotations/CustomRotation_BasicInfo.cs
@@ -1,12 +1,6 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Configuration.RotationConfig;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Rotations;
-namespace RotationSolver.Rotations.CustomRotation;
+using Lumina.Excel.GeneratedSheets;
+
+namespace RotationSolver.Basic.Rotations;
 
 [RotationDesc(DescType.BurstActions)]
 public abstract partial class CustomRotation : ICustomRotation
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs b/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs
index 7e5242a8f..b57910287 100644
--- a/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs
+++ b/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs
@@ -1,10 +1,4 @@
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-
-namespace RotationSolver.Rotations.CustomRotation;
+namespace RotationSolver.Basic.Rotations;
 
 public abstract partial class CustomRotation
 {
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs b/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs
index eae75c0ff..1c4226d19 100644
--- a/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs
+++ b/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs
@@ -1,9 +1,4 @@
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-
-namespace RotationSolver.Rotations.CustomRotation;
+namespace RotationSolver.Basic.Rotations;
 
 public abstract partial class CustomRotation
 {
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Medicine.cs b/RotationSolver.Basic/Rotations/CustomRotation_Medicine.cs
index f26edb0c1..483207807 100644
--- a/RotationSolver.Basic/Rotations/CustomRotation_Medicine.cs
+++ b/RotationSolver.Basic/Rotations/CustomRotation_Medicine.cs
@@ -1,8 +1,4 @@
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Helpers;
-
-namespace RotationSolver.Rotations.CustomRotation;
+namespace RotationSolver.Basic.Rotations;
 
 public enum MedicineType : byte
 {
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs b/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs
index 8991aba3e..c32c129c0 100644
--- a/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs
+++ b/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs
@@ -1,15 +1,7 @@
-using Dalamud.Game.ClientState;
-using Dalamud;
+using Dalamud;
 using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Game.ClientState.Objects.Types;
-using FFXIVClientStructs.FFXIV.Client.UI.Agent;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using System.Reflection;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Helpers;
-
-namespace RotationSolver.Rotations.CustomRotation;
+
+namespace RotationSolver.Basic.Rotations;
 public abstract partial class CustomRotation
 {
     #region Player
diff --git a/RotationSolver.Basic/Rotations/ICustomRotation.cs b/RotationSolver.Basic/Rotations/ICustomRotation.cs
index 64c7bd3dd..d40b3ea28 100644
--- a/RotationSolver.Basic/Rotations/ICustomRotation.cs
+++ b/RotationSolver.Basic/Rotations/ICustomRotation.cs
@@ -1,11 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Configuration.RotationConfig;
-using RotationSolver.Basic.Data;
-using RotationSolver.Rotations.CustomRotation;
-using System.Collections.Generic;
-using System.Reflection;
+using Lumina.Excel.GeneratedSheets;
 
 namespace RotationSolver.Basic.Rotations;
 
diff --git a/RotationSolver.Basic/Service.cs b/RotationSolver.Basic/Service.cs
index f2db599c8..d1131b762 100644
--- a/RotationSolver.Basic/Service.cs
+++ b/RotationSolver.Basic/Service.cs
@@ -25,11 +25,7 @@
 using ImGuiScene;
 using Lumina.Excel;
 using RotationSolver.Basic.Configuration;
-using RotationSolver.Basic.Data;
-using System.Numerics;
-using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Xml.Linq;
 
 namespace RotationSolver.Basic;
 
diff --git a/RotationSolver.Default/RotationSolver.Default.csproj b/RotationSolver.Default/RotationSolver.Default.csproj
index 1f848a547..638f44adf 100644
--- a/RotationSolver.Default/RotationSolver.Default.csproj
+++ b/RotationSolver.Default/RotationSolver.Default.csproj
@@ -1,15 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
 	  <ProjectReference Include="..\RotationSolver.Basic\RotationSolver.Basic.csproj" />
-
-	  <Using Include="Dalamud.Game.ClientState.JobGauge.Enums" />
-	  <Using Include="RotationSolver.Actions.BaseAction" />
-	  <Using Include="RotationSolver.Basic" />
-	  <Using Include="RotationSolver.Basic.Actions" />
-	  <Using Include="RotationSolver.Basic.Attributes" />
-	  <Using Include="RotationSolver.Basic.Configuration.RotationConfig" />
-	  <Using Include="RotationSolver.Basic.Data" />
-	  <Using Include="RotationSolver.Basic.Helpers" />
-	  <Using Include="RotationSolver.Basic.Rotations.Basic" />
   </ItemGroup>
 </Project>
diff --git a/RotationSolver.Extra/RotationSolver.Extra.csproj b/RotationSolver.Extra/RotationSolver.Extra.csproj
index e8a009104..7bfc5f4c2 100644
--- a/RotationSolver.Extra/RotationSolver.Extra.csproj
+++ b/RotationSolver.Extra/RotationSolver.Extra.csproj
@@ -1,16 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<ItemGroup>
 		<ProjectReference Include="..\RotationSolver.Basic\RotationSolver.Basic.csproj" />
-
-		<Using Include="Dalamud.Game.ClientState.JobGauge.Enums" />
-		<Using Include="RotationSolver.Actions.BaseAction" />
-		<Using Include="RotationSolver.Basic" />
-		<Using Include="RotationSolver.Basic.Actions" />
-		<Using Include="RotationSolver.Basic.Attributes" />
-		<Using Include="RotationSolver.Basic.Configuration.RotationConfig" />
-		<Using Include="RotationSolver.Basic.Data" />
-		<Using Include="RotationSolver.Basic.Helpers" />
-		<Using Include="RotationSolver.Basic.Rotations.Basic" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/RotationSolver.Old/RotationSolver.Old.csproj b/RotationSolver.Old/RotationSolver.Old.csproj
index a5a20608f..e582ab154 100644
--- a/RotationSolver.Old/RotationSolver.Old.csproj
+++ b/RotationSolver.Old/RotationSolver.Old.csproj
@@ -7,16 +7,6 @@
   </PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\RotationSolver.Basic\RotationSolver.Basic.csproj" />
-
-		<Using Include="Dalamud.Game.ClientState.JobGauge.Enums" />
-		<Using Include="RotationSolver.Actions.BaseAction" />
-		<Using Include="RotationSolver.Basic" />
-		<Using Include="RotationSolver.Basic.Actions" />
-		<Using Include="RotationSolver.Basic.Attributes" />
-		<Using Include="RotationSolver.Basic.Configuration.RotationConfig" />
-		<Using Include="RotationSolver.Basic.Data" />
-		<Using Include="RotationSolver.Basic.Helpers" />
-		<Using Include="RotationSolver.Basic.Rotations.Basic" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Folder Include="Healer\" />
diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
index fcd48762a..5516315ed 100644
--- a/RotationSolver/Commands/RSCommands_Actions.cs
+++ b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -1,9 +1,4 @@
 using Dalamud.Game.ClientState.Conditions;
-using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
 using RotationSolver.Localization;
 using RotationSolver.Updaters;
 
diff --git a/RotationSolver/Commands/RSCommands_BasicInfo.cs b/RotationSolver/Commands/RSCommands_BasicInfo.cs
index d28a85a43..69ea72550 100644
--- a/RotationSolver/Commands/RSCommands_BasicInfo.cs
+++ b/RotationSolver/Commands/RSCommands_BasicInfo.cs
@@ -1,11 +1,5 @@
 using Dalamud.Game.Command;
-using FFXIVClientStructs.FFXIV.Client.Game.UI;
-using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
 using RotationSolver.Localization;
-using System;
-using System.Linq;
 
 namespace RotationSolver.Commands;
 
diff --git a/RotationSolver/Commands/RSCommands_OtherCommand.cs b/RotationSolver/Commands/RSCommands_OtherCommand.cs
index ecb93c769..401fdb849 100644
--- a/RotationSolver/Commands/RSCommands_OtherCommand.cs
+++ b/RotationSolver/Commands/RSCommands_OtherCommand.cs
@@ -1,8 +1,4 @@
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Rotations;
-using RotationSolver.Localization;
+using RotationSolver.Localization;
 using RotationSolver.Updaters;
 
 namespace RotationSolver.Commands
diff --git a/RotationSolver/Commands/RSCommands_StateSpecialCommand.cs b/RotationSolver/Commands/RSCommands_StateSpecialCommand.cs
index 13e510f86..a5e744bd5 100644
--- a/RotationSolver/Commands/RSCommands_StateSpecialCommand.cs
+++ b/RotationSolver/Commands/RSCommands_StateSpecialCommand.cs
@@ -1,7 +1,4 @@
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Localization;
+using RotationSolver.Localization;
 
 namespace RotationSolver.Commands
 {
diff --git a/RotationSolver/Localization/EnumTranslations.cs b/RotationSolver/Localization/EnumTranslations.cs
index 958d4c583..0459061b3 100644
--- a/RotationSolver/Localization/EnumTranslations.cs
+++ b/RotationSolver/Localization/EnumTranslations.cs
@@ -1,8 +1,5 @@
 using Dalamud.Game.ClientState.Keys;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Rotations.Basic;
 using RotationSolver.Commands;
-using RotationSolver.Rotations.CustomRotation;
 using RotationSolver.Timeline;
 
 namespace RotationSolver.Localization;
diff --git a/RotationSolver/Localization/LocalizationManager.cs b/RotationSolver/Localization/LocalizationManager.cs
index cf4558886..1238e791b 100644
--- a/RotationSolver/Localization/LocalizationManager.cs
+++ b/RotationSolver/Localization/LocalizationManager.cs
@@ -1,10 +1,4 @@
 using Dalamud.Logging;
-using Newtonsoft.Json;
-using RotationSolver.Basic;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
 
 namespace RotationSolver.Localization;
 
diff --git a/RotationSolver/RotationHelper.cs b/RotationSolver/RotationHelper.cs
index 9f77c269f..b553a9c49 100644
--- a/RotationSolver/RotationHelper.cs
+++ b/RotationSolver/RotationHelper.cs
@@ -1,8 +1,5 @@
 using Dalamud.Interface.Colors;
-using RotationSolver.Basic.Rotations;
 using System.Diagnostics;
-using System.Numerics;
-using System.Reflection;
 
 namespace RotationSolver;
 
diff --git a/RotationSolver/RotationLoadContext.cs b/RotationSolver/RotationLoadContext.cs
index 847dc61a0..1379df986 100644
--- a/RotationSolver/RotationLoadContext.cs
+++ b/RotationSolver/RotationLoadContext.cs
@@ -1,8 +1,6 @@
 using Dalamud.Plugin;
 using FFXIVClientStructs.Interop;
 using Lumina.Excel;
-using RotationSolver.Basic;
-using System.Reflection;
 using System.Runtime.Loader;
 
 namespace RotationSolver;
diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs
index d0cf5723a..2229fea31 100644
--- a/RotationSolver/RotationSolverPlugin.cs
+++ b/RotationSolver/RotationSolverPlugin.cs
@@ -2,11 +2,7 @@
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin;
-using Newtonsoft.Json;
-using RotationSolver.Basic;
 using RotationSolver.Basic.Configuration;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
 using RotationSolver.Commands;
 using RotationSolver.Localization;
 using RotationSolver.UI;
diff --git a/RotationSolver/SpeechHelper.cs b/RotationSolver/SpeechHelper.cs
index 0615cfeb4..dedf7c937 100644
--- a/RotationSolver/SpeechHelper.cs
+++ b/RotationSolver/SpeechHelper.cs
@@ -1,5 +1,4 @@
 using Dalamud.Logging;
-using RotationSolver.Basic;
 using System.Diagnostics;
 using System.Speech.Synthesis;
 using System.Text;
diff --git a/RotationSolver/Timeline/ActionCondition.cs b/RotationSolver/Timeline/ActionCondition.cs
index 0f662c722..93626218d 100644
--- a/RotationSolver/Timeline/ActionCondition.cs
+++ b/RotationSolver/Timeline/ActionCondition.cs
@@ -1,11 +1,5 @@
-using ImGuiNET;
-using Newtonsoft.Json;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Rotations;
-using RotationSolver.Localization;
+using RotationSolver.Localization;
 using RotationSolver.UI;
-using System;
 
 namespace RotationSolver.Timeline;
 
diff --git a/RotationSolver/Timeline/BaseStatus.cs b/RotationSolver/Timeline/BaseStatus.cs
index 8d96ce628..30a0a0c18 100644
--- a/RotationSolver/Timeline/BaseStatus.cs
+++ b/RotationSolver/Timeline/BaseStatus.cs
@@ -1,6 +1,4 @@
 using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
 
 namespace RotationSolver.Timeline;
 
diff --git a/RotationSolver/Timeline/ConditionHelper.cs b/RotationSolver/Timeline/ConditionHelper.cs
index 9ddc3794d..cc31f8427 100644
--- a/RotationSolver/Timeline/ConditionHelper.cs
+++ b/RotationSolver/Timeline/ConditionHelper.cs
@@ -1,12 +1,4 @@
-using ImGuiNET;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Basic.Rotations;
-using System.Reflection;
-
-namespace RotationSolver.Timeline;
+namespace RotationSolver.Timeline;
 
 public class ConditionHelper
 {
diff --git a/RotationSolver/Timeline/ConditionSet.cs b/RotationSolver/Timeline/ConditionSet.cs
index 0287cd58b..fa020f2ca 100644
--- a/RotationSolver/Timeline/ConditionSet.cs
+++ b/RotationSolver/Timeline/ConditionSet.cs
@@ -1,12 +1,5 @@
-using Dalamud.Interface;
-using ImGuiNET;
-using Newtonsoft.Json;
-using RotationSolver.Basic.Rotations;
-using RotationSolver.Localization;
+using RotationSolver.Localization;
 using RotationSolver.UI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace RotationSolver.Timeline;
 
diff --git a/RotationSolver/Timeline/ICondition.cs b/RotationSolver/Timeline/ICondition.cs
index 5c2b12b23..8fad0da01 100644
--- a/RotationSolver/Timeline/ICondition.cs
+++ b/RotationSolver/Timeline/ICondition.cs
@@ -1,6 +1,4 @@
-using RotationSolver.Basic.Rotations;
-
-namespace RotationSolver.Timeline;
+namespace RotationSolver.Timeline;
 
 internal interface ICondition
 {
diff --git a/RotationSolver/Timeline/IConditionConverter.cs b/RotationSolver/Timeline/IConditionConverter.cs
index 09e7ea471..a6edc01de 100644
--- a/RotationSolver/Timeline/IConditionConverter.cs
+++ b/RotationSolver/Timeline/IConditionConverter.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+using Newtonsoft.Json.Linq;
 
 namespace RotationSolver.Timeline;
 
diff --git a/RotationSolver/Timeline/MajorConditionSet.cs b/RotationSolver/Timeline/MajorConditionSet.cs
index f0d8567ca..17be67faa 100644
--- a/RotationSolver/Timeline/MajorConditionSet.cs
+++ b/RotationSolver/Timeline/MajorConditionSet.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-
-namespace RotationSolver.Timeline;
+namespace RotationSolver.Timeline;
 
 internal class MajorConditionSet
 {
diff --git a/RotationSolver/Timeline/RotationCondition.cs b/RotationSolver/Timeline/RotationCondition.cs
index 7cdc66ca6..d1d15c3fd 100644
--- a/RotationSolver/Timeline/RotationCondition.cs
+++ b/RotationSolver/Timeline/RotationCondition.cs
@@ -1,13 +1,5 @@
-using ImGuiNET;
-using Newtonsoft.Json;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Rotations;
-using RotationSolver.Localization;
+using RotationSolver.Localization;
 using RotationSolver.UI;
-using System.Reflection;
 
 namespace RotationSolver.Timeline;
 
diff --git a/RotationSolver/Timeline/TargetCondition.cs b/RotationSolver/Timeline/TargetCondition.cs
index 52d688206..930ad4394 100644
--- a/RotationSolver/Timeline/TargetCondition.cs
+++ b/RotationSolver/Timeline/TargetCondition.cs
@@ -1,16 +1,5 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using ImGuiNET;
-using Lumina.Excel.GeneratedSheets;
-using Newtonsoft.Json;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Basic.Rotations;
-using RotationSolver.Localization;
+using RotationSolver.Localization;
 using RotationSolver.UI;
-using System;
-using System.Linq;
 
 namespace RotationSolver.Timeline;
 
diff --git a/RotationSolver/UI/ControlWindow.cs b/RotationSolver/UI/ControlWindow.cs
index 6e4f3f3f4..fff99cab7 100644
--- a/RotationSolver/UI/ControlWindow.cs
+++ b/RotationSolver/UI/ControlWindow.cs
@@ -1,14 +1,9 @@
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Windowing;
-using ImGuiNET;
 using ImGuiScene;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
 using RotationSolver.Commands;
 using RotationSolver.Localization;
 using RotationSolver.Updaters;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 
diff --git a/RotationSolver/UI/CooldownWindow.cs b/RotationSolver/UI/CooldownWindow.cs
index d7b3daed4..2059c8923 100644
--- a/RotationSolver/UI/CooldownWindow.cs
+++ b/RotationSolver/UI/CooldownWindow.cs
@@ -1,9 +1,5 @@
-using ImGuiNET;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Localization;
+using RotationSolver.Localization;
 using RotationSolver.Updaters;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 
diff --git a/RotationSolver/UI/ImGuiHelper.cs b/RotationSolver/UI/ImGuiHelper.cs
index 31ab2c936..0373093aa 100644
--- a/RotationSolver/UI/ImGuiHelper.cs
+++ b/RotationSolver/UI/ImGuiHelper.cs
@@ -1,25 +1,13 @@
-using Dalamud.Interface;
-using Dalamud.Interface.Colors;
+using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
 using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
-using ImGuiNET;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
 using RotationSolver.Basic.Configuration;
-using RotationSolver.Basic.Configuration.RotationConfig;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Basic.Rotations;
 using RotationSolver.Commands;
 using RotationSolver.Localization;
 using RotationSolver.Updaters;
 using System.ComponentModel;
-using System.Numerics;
-using System.Reflection;
 
 namespace RotationSolver.UI;
 
diff --git a/RotationSolver/UI/InfoWindow.cs b/RotationSolver/UI/InfoWindow.cs
index 9a06a7a34..1785a5e16 100644
--- a/RotationSolver/UI/InfoWindow.cs
+++ b/RotationSolver/UI/InfoWindow.cs
@@ -1,6 +1,4 @@
 using Dalamud.Interface.Windowing;
-using ImGuiNET;
-using RotationSolver.Basic;
 
 namespace RotationSolver.UI;
 
diff --git a/RotationSolver/UI/NextActionWindow.cs b/RotationSolver/UI/NextActionWindow.cs
index 3a8096b75..2a8902258 100644
--- a/RotationSolver/UI/NextActionWindow.cs
+++ b/RotationSolver/UI/NextActionWindow.cs
@@ -1,10 +1,6 @@
 using Dalamud.Interface.Colors;
 using FFXIVClientStructs.FFXIV.Client.Game;
-using ImGuiNET;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Helpers;
 using RotationSolver.Updaters;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 
diff --git a/RotationSolver/UI/OverlayWindow.cs b/RotationSolver/UI/OverlayWindow.cs
index cd14cf9f1..f52fa8425 100644
--- a/RotationSolver/UI/OverlayWindow.cs
+++ b/RotationSolver/UI/OverlayWindow.cs
@@ -1,13 +1,4 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Interface;
-using ImGuiNET;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Rotations.CustomRotation;
-using RotationSolver.Updaters;
-using System.Numerics;
+using RotationSolver.Updaters;
 
 namespace RotationSolver.UI;
 
diff --git a/RotationSolver/UI/RotationConfigWindow_Action.cs b/RotationSolver/UI/RotationConfigWindow_Action.cs
index e2eda0dc5..347e0debf 100644
--- a/RotationSolver/UI/RotationConfigWindow_Action.cs
+++ b/RotationSolver/UI/RotationConfigWindow_Action.cs
@@ -1,9 +1,5 @@
-using ImGuiNET;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Localization;
-using RotationSolver.UI;
+using RotationSolver.Localization;
 using RotationSolver.Updaters;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 internal partial class RotationConfigWindow
diff --git a/RotationSolver/UI/RotationConfigWindow_Control.cs b/RotationSolver/UI/RotationConfigWindow_Control.cs
index 280533b88..8bba3637f 100644
--- a/RotationSolver/UI/RotationConfigWindow_Control.cs
+++ b/RotationSolver/UI/RotationConfigWindow_Control.cs
@@ -1,7 +1,4 @@
-using ImGuiNET;
-using RotationSolver.Basic;
-using RotationSolver.Localization;
-using System.Numerics;
+using RotationSolver.Localization;
 
 namespace RotationSolver.UI;
 
diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
index dafbd46df..446b5c207 100644
--- a/RotationSolver/UI/RotationConfigWindow_Debug.cs
+++ b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -1,15 +1,5 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using FFXIVClientStructs.FFXIV.Client.Game.Fate;
-using FFXIVClientStructs.FFXIV.Client.UI;
-using ImGuiNET;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Default.Melee;
-using RotationSolver.Rotations.CustomRotation;
+using FFXIVClientStructs.FFXIV.Client.Game.Fate;
 using RotationSolver.Updaters;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 
diff --git a/RotationSolver/UI/RotationConfigWindow_Events.cs b/RotationSolver/UI/RotationConfigWindow_Events.cs
index c87bb12fb..e6135bccc 100644
--- a/RotationSolver/UI/RotationConfigWindow_Events.cs
+++ b/RotationSolver/UI/RotationConfigWindow_Events.cs
@@ -1,10 +1,5 @@
-using ImGuiNET;
-using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Configuration;
+using RotationSolver.Basic.Configuration;
 using RotationSolver.Localization;
-using RotationSolver.UI;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 internal partial class RotationConfigWindow
diff --git a/RotationSolver/UI/RotationConfigWindow_Help.cs b/RotationSolver/UI/RotationConfigWindow_Help.cs
index e60bad3eb..eb6a68b94 100644
--- a/RotationSolver/UI/RotationConfigWindow_Help.cs
+++ b/RotationSolver/UI/RotationConfigWindow_Help.cs
@@ -1,9 +1,5 @@
 using Dalamud.Utility;
-using ImGuiNET;
-using RotationSolver.Basic.Data;
 using RotationSolver.Localization;
-using RotationSolver.UI;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 internal partial class RotationConfigWindow
diff --git a/RotationSolver/UI/RotationConfigWindow_Major.cs b/RotationSolver/UI/RotationConfigWindow_Major.cs
index 4069df06a..764c0b15a 100644
--- a/RotationSolver/UI/RotationConfigWindow_Major.cs
+++ b/RotationSolver/UI/RotationConfigWindow_Major.cs
@@ -1,22 +1,5 @@
 using Dalamud.Interface.Windowing;
-using Dalamud.Plugin;
-using Dalamud.Utility;
-using FFXIVClientStructs.Interop;
-using ImGuiNET;
-using ImGuiScene;
-using Lumina.Excel;
-using RotationSolver.Actions.BaseAction;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Rotations;
-using RotationSolver.Basic.Rotations.Basic;
 using RotationSolver.Localization;
-using RotationSolver.Rotations.CustomRotation;
-using System.IO;
-using System.Net;
-using System.Numerics;
-using System.Reflection;
-using System.Runtime.Serialization;
 
 namespace RotationSolver.UI;
 internal partial class RotationConfigWindow : Window
diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs
index 4264498df..16dc98095 100644
--- a/RotationSolver/UI/RotationConfigWindow_Param.cs
+++ b/RotationSolver/UI/RotationConfigWindow_Param.cs
@@ -1,13 +1,5 @@
-using Dalamud.Interface.Colors;
-using ImGuiNET;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Commands;
+using RotationSolver.Commands;
 using RotationSolver.Localization;
-using RotationSolver.UI;
-using System;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 internal partial class RotationConfigWindow
diff --git a/RotationSolver/UI/RotationConfigWindow_Rotation.cs b/RotationSolver/UI/RotationConfigWindow_Rotation.cs
index 1c3220217..1333dbd35 100644
--- a/RotationSolver/UI/RotationConfigWindow_Rotation.cs
+++ b/RotationSolver/UI/RotationConfigWindow_Rotation.cs
@@ -1,12 +1,6 @@
 using Dalamud.Interface.Colors;
-using ImGuiNET;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using RotationSolver.Basic.Rotations;
 using RotationSolver.Localization;
 using RotationSolver.Updaters;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 internal partial class RotationConfigWindow
diff --git a/RotationSolver/UI/RotationConfigWindow_RotationDev.cs b/RotationSolver/UI/RotationConfigWindow_RotationDev.cs
index d622d0bdc..0d5684544 100644
--- a/RotationSolver/UI/RotationConfigWindow_RotationDev.cs
+++ b/RotationSolver/UI/RotationConfigWindow_RotationDev.cs
@@ -1,10 +1,6 @@
-using Dalamud.Interface.Colors;
-using Dalamud.Utility;
-using ImGuiNET;
-using RotationSolver.Basic;
+using Dalamud.Utility;
 using RotationSolver.Localization;
 using RotationSolver.Updaters;
-using System.Numerics;
 
 namespace RotationSolver.UI;
 internal partial class RotationConfigWindow
diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
index b744152ff..5ca2e51d7 100644
--- a/RotationSolver/Updaters/ActionUpdater.cs
+++ b/RotationSolver/Updaters/ActionUpdater.cs
@@ -1,10 +1,6 @@
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using FFXIVClientStructs.FFXIV.Client.Game;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
 using RotationSolver.Commands;
 using RotationSolver.Localization;
 
diff --git a/RotationSolver/Updaters/InputUpdater.cs b/RotationSolver/Updaters/InputUpdater.cs
index e23550dca..3939eaa21 100644
--- a/RotationSolver/Updaters/InputUpdater.cs
+++ b/RotationSolver/Updaters/InputUpdater.cs
@@ -1,7 +1,5 @@
 using Dalamud.Game.ClientState.GamePad;
 using Dalamud.Game.ClientState.Keys;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
 using RotationSolver.Commands;
 
 namespace RotationSolver.Updaters;
diff --git a/RotationSolver/Updaters/MacroUpdater.cs b/RotationSolver/Updaters/MacroUpdater.cs
index 5a7c0ea1b..1601284e3 100644
--- a/RotationSolver/Updaters/MacroUpdater.cs
+++ b/RotationSolver/Updaters/MacroUpdater.cs
@@ -1,7 +1,4 @@
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-
-namespace RotationSolver.Updaters;
+namespace RotationSolver.Updaters;
 
 internal static class MacroUpdater
 {
diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
index 92b780c46..0ee81b7e4 100644
--- a/RotationSolver/Updaters/MajorUpdater.cs
+++ b/RotationSolver/Updaters/MajorUpdater.cs
@@ -1,9 +1,6 @@
 using Dalamud.Game;
 using Dalamud.Logging;
-using FFXIVClientStructs.FFXIV.Client.UI;
-using RotationSolver.Basic;
 using RotationSolver.Commands;
-using System.Collections.Generic;
 
 namespace RotationSolver.Updaters;
 
diff --git a/RotationSolver/Updaters/MovingController.cs b/RotationSolver/Updaters/MovingController.cs
index d1591f3bb..79eac7bc6 100644
--- a/RotationSolver/Updaters/MovingController.cs
+++ b/RotationSolver/Updaters/MovingController.cs
@@ -1,8 +1,6 @@
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Hooking;
 using Dalamud.Utility.Signatures;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Helpers;
 
 namespace RotationSolver.Updaters;
 
diff --git a/RotationSolver/Updaters/PreviewUpdater.cs b/RotationSolver/Updaters/PreviewUpdater.cs
index 1cf15e411..1c1b85682 100644
--- a/RotationSolver/Updaters/PreviewUpdater.cs
+++ b/RotationSolver/Updaters/PreviewUpdater.cs
@@ -1,5 +1,4 @@
 using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.Gui.Dtr;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
@@ -10,9 +9,6 @@
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using FFXIVClientStructs.FFXIV.Component.GUI;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
 using RotationSolver.Commands;
 using System.Runtime.InteropServices;
 
diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs
index 56417516d..f1fd082a7 100644
--- a/RotationSolver/Updaters/RotationUpdater.cs
+++ b/RotationSolver/Updaters/RotationUpdater.cs
@@ -1,13 +1,5 @@
 using Dalamud.Logging;
-using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Actions;
-using RotationSolver.Basic.Attributes;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Rotations;
 using RotationSolver.Localization;
-using System.Reflection;
-using System.Runtime.Loader;
 
 namespace RotationSolver.Updaters;
 
diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
index 53c62533c..5fa57d635 100644
--- a/RotationSolver/Updaters/SocialUpdater.cs
+++ b/RotationSolver/Updaters/SocialUpdater.cs
@@ -4,9 +4,6 @@
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
 using RotationSolver.Commands;
 using RotationSolver.Localization;
 using System.Security.Cryptography;
diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
index 3cf867ea3..e1eb51850 100644
--- a/RotationSolver/Updaters/TargetUpdater.cs
+++ b/RotationSolver/Updaters/TargetUpdater.cs
@@ -1,12 +1,7 @@
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Game.ClientState.Objects.Types;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
-using System.Numerics;
 using Action = Lumina.Excel.GeneratedSheets.Action;
 
 namespace RotationSolver.Updaters;
diff --git a/RotationSolver/Updaters/TimeLineUpdater.cs b/RotationSolver/Updaters/TimeLineUpdater.cs
index d85ca770d..54b827fd9 100644
--- a/RotationSolver/Updaters/TimeLineUpdater.cs
+++ b/RotationSolver/Updaters/TimeLineUpdater.cs
@@ -1,6 +1,4 @@
-using ImGuiNET;
-using RotationSolver.Basic;
-using RotationSolver.Timeline;
+using RotationSolver.Timeline;
 using RotationSolver.UI;
 using System.Diagnostics;
 
diff --git a/RotationSolver/Watcher.cs b/RotationSolver/Watcher.cs
index 6852096b1..56e44b9f1 100644
--- a/RotationSolver/Watcher.cs
+++ b/RotationSolver/Watcher.cs
@@ -1,19 +1,9 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Hooking;
+using Dalamud.Hooking;
 using Dalamud.Interface.Colors;
 using Dalamud.Utility.Signatures;
 using FFXIVClientStructs.FFXIV.Client.Game;
-using ImGuiNET;
-using RotationSolver.Basic;
-using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
 using RotationSolver.Localization;
 using System.ComponentModel;
-using System.Diagnostics;
-using System.Numerics;
-using System.Runtime.InteropServices;
-using System.Speech.Synthesis;
-using System.Text;
 using System.Text.RegularExpressions;
 using Action = Lumina.Excel.GeneratedSheets.Action;