fix: structure

lua/catppuccino/init.lua

@@ -1,18 +1,7 @@
 local M = {}
 
 function M.load()
-
-	local catppuccino = require("catppuccino")
-
-    if (catppuccino.before_loading ~= nil) then
-        catppuccino.before_loading()
-    end
-
     require("catppuccino.main").main("load")
-
-    if (catppuccino.after_loading ~= nil) then
-        catppuccino.after_loading()
-    end
 end
 
 function M.setup(custom_opts, remaps)

lua/catppuccino/main.lua

@@ -2,13 +2,27 @@ local M = {}
 
 local utils = require("catppuccino.utils.util")
 
+local function load(args)
+	local catppuccino = require("catppuccino")
+
+    if (catppuccino.before_loading ~= nil) then
+        catppuccino.before_loading()
+    end
+
+	utils.load(require("catppuccino.core.mapper").apply(args))
+
+    if (catppuccino.after_loading ~= nil) then
+        catppuccino.after_loading()
+    end
+end
+
 function M.main(option, args)
     option = option or "load"
 
 	if (option == "load") then
-		utils.load(require("catppuccino.core.mapper").apply(args))
+		load(args)
     else
-        print("Catppuccino: Command was not recognized")
+        print("Catppuccino: command was not recognized")
     end
 end