diff --git a/Framework.Definition.lua b/Definitions/CoreFramework.lua
similarity index 100%
rename from Framework.Definition.lua
rename to Definitions/CoreFramework.lua
diff --git a/Themes/_Theme.Definition.lua b/Definitions/Theme.lua
similarity index 100%
rename from Themes/_Theme.Definition.lua
rename to Definitions/Theme.lua
diff --git a/Modules/UnitFrames/Handlers/_Auras.Definition.lua b/Definitions/UnitFrames/Auras.lua
similarity index 100%
rename from Modules/UnitFrames/Handlers/_Auras.Definition.lua
rename to Definitions/UnitFrames/Auras.lua
diff --git a/Modules/UnitFrames/Handlers/_Elements.Definition.lua b/Definitions/UnitFrames/Elements.lua
similarity index 95%
rename from Modules/UnitFrames/Handlers/_Elements.Definition.lua
rename to Definitions/UnitFrames/Elements.lua
index d9474c02..0cb51c68 100644
--- a/Modules/UnitFrames/Handlers/_Elements.Definition.lua
+++ b/Definitions/UnitFrames/Elements.lua
@@ -44,9 +44,9 @@ local ElementSettings = {
 }
 
 ---@class SUI.UF.Elements.Positioning
----@field anchor AnchorPoint
+---@field anchor FramePoint
 ---@field relativeTo SUI.UF.Elements.list
----@field relativePoint AnchorPoint
+---@field relativePoint FramePoint
 local ElementPositioning = {
 	anchor = 'CENTER',
 	relativeTo = 'Frame',
@@ -59,8 +59,8 @@ local ElementPositioning = {
 local FramePositioning = {}
 
 ---@class ElementTextData
----@field SetJustifyH JustifyH
----@field SetJustifyV JustifyV
+---@field SetJustifyH JustifyHorizontal
+---@field SetJustifyV JustifyVertical
 ---@field position SUI.UF.Elements.Positioning
 local ElementTextData = {
 	enabled = false,
diff --git a/Definitions/UnitFrames/Style.lua b/Definitions/UnitFrames/Style.lua
new file mode 100644
index 00000000..33d7b7cd
--- /dev/null
+++ b/Definitions/UnitFrames/Style.lua
@@ -0,0 +1,40 @@
+---@class SUI.Style.Settings.UnitFrames
+---@field displayName? string
+---@field setup? UFStyleSetupSettings
+---@field positions? SUI.UF.FramePositions
+---@field artwork? SUI.Style.Settings.UnitFrames.Art.Positions
+local UFStyleSettings = {}
+
+---@class UFStyleSetupSettings
+---@field image string
+---@field imageCoords? table
+local UFStyleSetupSettings = {}
+
+---@class SUI.Style.Settings.UnitFrames.Art.Positions
+---@field top? SUI.Style.Settings.UnitFrames.Art.Settings
+---@field bg? SUI.Style.Settings.UnitFrames.Art.Settings
+---@field bottom? SUI.Style.Settings.UnitFrames.Art.Settings
+---@field full? SUI.Style.Settings.UnitFrames.Art.Settings
+local SUIUFArtworkSettings = {}
+
+---@class SUI.Style.Settings.UnitFrames.Art.Settings
+---@field perUnit? boolean
+---@field UnitFrameCallback? function
+---@field path? function|string
+---@field TexCoord? function|table
+---@field heightScale? integer
+---@field yScale? integer
+---@field PVPAlpha? integer
+---@field height? integer
+---@field y? integer
+---@field alpha? integer
+---@field VertexColor? table
+---@field position? SUI.Style.Settings.UnitFrames.Art.PositionTable
+---@field scale? integer
+local artSettings = {}
+
+---@class SUI.Style.Settings.UnitFrames.Art.PositionTable
+---@field anchor FramePoint
+---@field x integer
+---@field y integer
+local oUFSpartanArtPositionTable = {}
diff --git a/Modules/UnitFrames/Handlers/_Units.Definition.lua b/Definitions/UnitFrames/Units.lua
similarity index 95%
rename from Modules/UnitFrames/Handlers/_Units.Definition.lua
rename to Definitions/UnitFrames/Units.lua
index 8bf75f98..f237ff20 100644
--- a/Modules/UnitFrames/Handlers/_Units.Definition.lua
+++ b/Definitions/UnitFrames/Units.lua
@@ -1,6 +1,6 @@
 ---@class FramePositioning
----@field point AnchorPoint
----@field relativePoint AnchorPoint
+---@field point FramePoint
+---@field relativePoint FramePoint
 ---@field xOfs integer
 ---@field yOfs integer
 local FramePositioning = {}
diff --git a/Modules/UnitFrames/Handlers/_Style.Definition.lua b/Modules/UnitFrames/Handlers/_Style.Definition.lua
deleted file mode 100644
index 4f4e0432..00000000
--- a/Modules/UnitFrames/Handlers/_Style.Definition.lua
+++ /dev/null
@@ -1,38 +0,0 @@
----@class SUI.Style.Settings.UnitFrames
----@field displayName? string
----@field setup? UFStyleSetupSettings
----@field positions? SUI.UF.FramePositions
----@field artwork? SUIUFArtworkSettings
-local UFStyleSettings = {}
-
----@class UFStyleSetupSettings
----@field image string
----@field imageCoords? table
-local UFStyleSetupSettings = {}
-
----@class SUIUFArtworkSettings
----@field top? oUFSpartanArtSettings
----@field bg? oUFSpartanArtSettings
----@field bottom? oUFSpartanArtSettings
----@field full? oUFSpartanArtSettings
-local SUIUFArtworkSettings = {}
-
----@class oUFSpartanArtSettings
----@field path function|string
----@field TexCoord function|table
----@field heightScale? integer
----@field yScale? integer
----@field PVPAlpha? integer
----@field height? integer
----@field y? integer
----@field alpha? integer
----@field VertexColor? table
----@field position? oUFSpartanArtPositionTable
----@field scale? integer
-local artSettings = {}
-
----@class oUFSpartanArtPositionTable
----@field anchor AnchorPoint
----@field x integer
----@field y integer
-local oUFSpartanArtPositionTable = {}