diff --git a/moonwave.toml b/moonwave.toml
index 41ada49..3caf73e 100644
--- a/moonwave.toml
+++ b/moonwave.toml
@@ -1,4 +1,9 @@
-autoSectionPath = "src"
+[[classOrder]]
+classes = ["Utils"]
+
+[[classOrder]]
+section = "Components"
+classes = ["Base", "Button"]
 
 [docusaurus]
 title = "OnyxUI"
diff --git a/src/Utils/Themer/BitCave.lua b/src/Themer/BitCave.lua
similarity index 100%
rename from src/Utils/Themer/BitCave.lua
rename to src/Themer/BitCave.lua
diff --git a/src/Utils/Themer/OnyxNight.lua b/src/Themer/OnyxNight.lua
similarity index 100%
rename from src/Utils/Themer/OnyxNight.lua
rename to src/Themer/OnyxNight.lua
diff --git a/src/Utils/Themer/ThemeTemplate.lua b/src/Themer/ThemeTemplate.lua
similarity index 100%
rename from src/Utils/Themer/ThemeTemplate.lua
rename to src/Themer/ThemeTemplate.lua
diff --git a/src/Utils/Themer/init.lua b/src/Themer/init.lua
similarity index 100%
rename from src/Utils/Themer/init.lua
rename to src/Themer/init.lua
diff --git a/src/Utils/init.lua b/src/Utils/init.lua
index 2d4f172..8b4594e 100644
--- a/src/Utils/init.lua
+++ b/src/Utils/init.lua
@@ -1,7 +1,7 @@
 --[=[
 		@class Utils
 		
-		Important utilities
+		Important utilities for UI development.
 ]=]
 
 local Colors = require(script.Colors)