diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua
index 0b215c1..04d8480 100755
--- a/after/plugin/colors.lua
+++ b/after/plugin/colors.lua
@@ -1,9 +1,6 @@
 function Color(color)
     local catppuccin_colors = require('catppuccin.palettes').get_palette('mocha')
 
-	color = color or "catppuccin-mocha"
-	vim.cmd.colorscheme(color)
-
 	vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
 	vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" })
 	vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
diff --git a/after/plugin/fugitive.lua b/after/plugin/fugitive.lua
deleted file mode 100755
index 6e1b92d..0000000
--- a/after/plugin/fugitive.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.keymap.set('n', '<leader>gs', vim.cmd.Git)
diff --git a/after/plugin/init.lua b/after/plugin/init.lua
deleted file mode 100644
index cf323a9..0000000
--- a/after/plugin/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-print('Test')
-
diff --git a/lua/409/lazy.lua b/lua/409/lazy.lua
index 28d5327..94be71b 100644
--- a/lua/409/lazy.lua
+++ b/lua/409/lazy.lua
@@ -12,84 +12,4 @@ end
 
 vim.opt.rtp:prepend(lazypath)
 
-require("lazy").setup({
-	{ "nvim-lua/plenary.nvim", priority = 100 },
-	{
-		"christoomey/vim-tmux-navigator",
-		lazy = false,
-	},
-	{
-		"nvim-telescope/telescope.nvim",
-		dependencies = { "nvim-lua/plenary.nvim" },
-	},
-	{
-		"catppuccin/nvim",
-		name = "catppuccin",
-        priority = 90
-	},
-    {
-        "nvim-treesitter/nvim-treesitter",
-        dependencies = {
-            "nvim-treesitter/nvim-tree-docs",
-            "JoosepAlviste/nvim-ts-context-commentstring",
-        }
-    },
-	{
-		"ThePrimeagen/harpoon",
-		branch = "harpoon2",
-		dependencies = { "nvim-lua/plenary.nvim" },
-	},
-	"onsails/lspkind.nvim",
-	"mbbill/undotree",
-	"tpope/vim-fugitive",
-	{
-		"nvim-lualine/lualine.nvim",
-		dependencies = { "nvim-tree/nvim-web-devicons" },
-	},
-    { "williamboman/mason.nvim" },
-	"williamboman/mason-lspconfig.nvim",
-	-- LSP Support
-	"neovim/nvim-lspconfig",
-	-- Autocompletion
-	"hrsh7th/nvim-cmp",
-	"hrsh7th/cmp-nvim-lsp",
-	"hrsh7th/cmp-nvim-lsp-signature-help",
-	"hrsh7th/cmp-nvim-lua",
-	"hrsh7th/cmp-buffer",
-	"hrsh7th/cmp-path",
-	"hrsh7th/cmp-cmdline",
-	"L3MON4D3/LuaSnip",
-	"nvim-tree/nvim-web-devicons",
-	{
-		"danymat/neogen",
-		dependencies = { "nvim-treesitter/nvim-treesitter" },
-	},
-    {
-		"folke/todo-comments.nvim",
-		dependencies = { "nvim-lua/plenary.nvim" },
-	},
-	{
-		"folke/trouble.nvim",
-		dependencies = { "nvim-tree/nvim-web-devicons" },
-	},
-	{
-		"stevearc/conform.nvim",
-	},
-	{
-		"akinsho/flutter-tools.nvim",
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-			"stevearc/dressing.nvim", -- optional for vim.ui.select
-		},
-	},
-	"RRethy/vim-illuminate",
-	"numToStr/Comment.nvim",
-	{
-		"utilyre/barbecue.nvim",
-		version = "*",
-		dependencies = {
-			"SmiteshP/nvim-navic",
-			"nvim-tree/nvim-web-devicons", -- optional dependency
-		},
-	},
-})
+require("lazy").setup("409.plugins")
diff --git a/lua/409/plugins/comments.lua b/lua/409/plugins/comments.lua
new file mode 100644
index 0000000..6f2d50c
--- /dev/null
+++ b/lua/409/plugins/comments.lua
@@ -0,0 +1,11 @@
+return {
+	"numToStr/Comment.nvim",
+	{
+		"danymat/neogen",
+		dependencies = { "nvim-treesitter/nvim-treesitter" },
+	},
+    {
+		"folke/todo-comments.nvim",
+		dependencies = { "nvim-lua/plenary.nvim" },
+	},
+}
diff --git a/lua/409/plugins/completion.lua b/lua/409/plugins/completion.lua
new file mode 100644
index 0000000..17fa135
--- /dev/null
+++ b/lua/409/plugins/completion.lua
@@ -0,0 +1,10 @@
+return {
+	"hrsh7th/nvim-cmp",
+	"hrsh7th/cmp-nvim-lsp",
+	"hrsh7th/cmp-nvim-lsp-signature-help",
+	"hrsh7th/cmp-nvim-lua",
+	"hrsh7th/cmp-buffer",
+	"hrsh7th/cmp-path",
+	"hrsh7th/cmp-cmdline",
+	"L3MON4D3/LuaSnip",
+}
diff --git a/lua/409/plugins/diagnostics.lua b/lua/409/plugins/diagnostics.lua
new file mode 100644
index 0000000..4d0538d
--- /dev/null
+++ b/lua/409/plugins/diagnostics.lua
@@ -0,0 +1,6 @@
+return {
+	{
+		"folke/trouble.nvim",
+		dependencies = { "nvim-tree/nvim-web-devicons" },
+	},
+}
diff --git a/lua/409/plugins/extras/init.lua b/lua/409/plugins/extras/init.lua
new file mode 100644
index 0000000..ffdf152
--- /dev/null
+++ b/lua/409/plugins/extras/init.lua
@@ -0,0 +1,9 @@
+return {
+    {
+        "akinsho/flutter-tools.nvim",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+            "stevearc/dressing.nvim", -- optional for vim.ui.select
+        },
+    },
+}
diff --git a/lua/409/plugins/formatting.lua b/lua/409/plugins/formatting.lua
new file mode 100644
index 0000000..13131b5
--- /dev/null
+++ b/lua/409/plugins/formatting.lua
@@ -0,0 +1,5 @@
+return {
+	{
+		"stevearc/conform.nvim",
+	},
+}
diff --git a/lua/409/plugins/git.lua b/lua/409/plugins/git.lua
new file mode 100644
index 0000000..23a8c64
--- /dev/null
+++ b/lua/409/plugins/git.lua
@@ -0,0 +1,13 @@
+return {
+    {
+        "tpope/vim-fugitive",
+        keys = {
+            {
+                "<leader>gs",
+                vim.cmd.Git,
+                mode = "n",
+                desc = "Open Fugitive"
+            }
+        }
+    },
+}
diff --git a/lua/409/plugins/lsp.lua b/lua/409/plugins/lsp.lua
new file mode 100644
index 0000000..6bebf5f
--- /dev/null
+++ b/lua/409/plugins/lsp.lua
@@ -0,0 +1,6 @@
+return {
+	"onsails/lspkind.nvim",
+    { "williamboman/mason.nvim" },
+	"williamboman/mason-lspconfig.nvim",
+	"neovim/nvim-lspconfig",
+}
diff --git a/lua/409/plugins/navigation.lua b/lua/409/plugins/navigation.lua
new file mode 100644
index 0000000..86753bb
--- /dev/null
+++ b/lua/409/plugins/navigation.lua
@@ -0,0 +1,11 @@
+return {
+	{
+		"nvim-telescope/telescope.nvim",
+		dependencies = { "nvim-lua/plenary.nvim" },
+	},
+	{
+		"ThePrimeagen/harpoon",
+		branch = "harpoon2",
+		dependencies = { "nvim-lua/plenary.nvim" },
+	},
+}
diff --git a/lua/409/plugins/statusline.lua b/lua/409/plugins/statusline.lua
new file mode 100644
index 0000000..0bb77fc
--- /dev/null
+++ b/lua/409/plugins/statusline.lua
@@ -0,0 +1,14 @@
+return {
+	{
+		"nvim-lualine/lualine.nvim",
+		dependencies = { "nvim-tree/nvim-web-devicons" },
+	},
+	{
+		"utilyre/barbecue.nvim",
+		version = "*",
+		dependencies = {
+			"SmiteshP/nvim-navic",
+			"nvim-tree/nvim-web-devicons", -- optional dependency
+		},
+	},
+}
diff --git a/lua/409/plugins/theme.lua b/lua/409/plugins/theme.lua
new file mode 100644
index 0000000..0a2a85a
--- /dev/null
+++ b/lua/409/plugins/theme.lua
@@ -0,0 +1,11 @@
+return {
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        lazy = false,
+        priority = 1000,
+        config = function()
+            vim.cmd.colorscheme('catppuccin-mocha')
+        end
+    },
+}
diff --git a/lua/409/plugins/treesitter.lua b/lua/409/plugins/treesitter.lua
new file mode 100644
index 0000000..5be6326
--- /dev/null
+++ b/lua/409/plugins/treesitter.lua
@@ -0,0 +1,9 @@
+return {
+    {
+        "nvim-treesitter/nvim-treesitter",
+        dependencies = {
+            "nvim-treesitter/nvim-tree-docs",
+            "JoosepAlviste/nvim-ts-context-commentstring",
+        }
+    },
+}
diff --git a/lua/409/plugins/util.lua b/lua/409/plugins/util.lua
new file mode 100644
index 0000000..6ce86fd
--- /dev/null
+++ b/lua/409/plugins/util.lua
@@ -0,0 +1,13 @@
+return {
+    {
+        "nvim-lua/plenary.nvim",
+        lazy = true,
+    },
+	{
+		"christoomey/vim-tmux-navigator",
+		lazy = false,
+	},
+	"mbbill/undotree",
+	"nvim-tree/nvim-web-devicons",
+	"RRethy/vim-illuminate",
+}