diff --git a/after/plugin/tasks.lua b/after/plugin/tasks.lua
deleted file mode 100644
index 7fafa35..0000000
--- a/after/plugin/tasks.lua
+++ /dev/null
@@ -1 +0,0 @@
-local overseer = require("overseer")
diff --git a/lua/valeth/packer.lua b/lua/valeth/packer.lua
index a078239..a20a2d9 100644
--- a/lua/valeth/packer.lua
+++ b/lua/valeth/packer.lua
@@ -29,12 +29,14 @@ local function spec(use)
 
     use {
         "nvim-treesitter/nvim-treesitter",
+        requires = {
+            { "nvim-treesitter/nvim-treesitter-context" }
+        },
         run = function()
-            require("nvim-treesitter.install").update({ with_sync = true })()
+            require("valeth.packer.treesitter")
         end
     }
 
-    use "nvim-treesitter/nvim-treesitter-context"
 
     use "wakatime/vim-wakatime"
 
@@ -52,7 +54,10 @@ local function spec(use)
     }
 
     use {
-        "stevearc/resession.nvim"
+        "stevearc/resession.nvim",
+        config = function()
+            require("valeth.packer.session")
+        end
     }
 
 
@@ -66,16 +71,7 @@ local function spec(use)
             { "hrsh7th/nvim-cmp" },
         },
         config = function()
-            require("crates").setup()
-            local cmp = require("cmp")
-
-            vim.api.nvim_create_autocmd("BufRead", {
-                group = vim.api.nvim_create_augroup("CmpSourceCargo", { clear = true }),
-                pattern = "Cargo.toml",
-                callback = function()
-                    cmp.setup.buffer({ sources = { { name = "crates" } } })
-                end,
-            })
+            require("valeth.packer.crates")
         end
     }
 
@@ -99,7 +95,10 @@ local function spec(use)
             { "rafamadriz/friendly-snippets" },
             { "williamboman/mason.nvim" },
             { "williamboman/mason-lspconfig.nvim" },
-        }
+        },
+        config = function()
+            require("valeth.packer.lsp")
+        end
     }
 
     use "mhartington/formatter.nvim"
@@ -129,7 +128,10 @@ local function spec(use)
         requires = {
             { "nvim-tree/nvim-web-devicons" },
             { "stevearc/overseer.nvim" },
-        }
+        },
+        config = function()
+            require("valeth.packer.lualine")
+        end
     }
 
     use {
@@ -193,7 +195,7 @@ local function spec(use)
             { "nvim-treesitter/nvim-treesitter" },
         },
         config = function()
-            require("telescope").load_extension("harpoon")
+            require("valeth.packer.telescope")
         end
     }
 
@@ -210,7 +212,10 @@ local function spec(use)
         branch = "no-cwd-on-jobstart",
         requires = {
             { "nvim-telescope/telescope.nvim" },
-        }
+        },
+        config = function()
+            require("valeth.packer.sshfs")
+        end
     }
 
     use {
@@ -226,7 +231,7 @@ local function spec(use)
             "nvim-lua/plenary.nvim"
         },
         config = function()
-            require("undotree").setup()
+            require("valeth.packer.undotree")
         end
     }
 
@@ -234,7 +239,10 @@ local function spec(use)
         "nvim-tree/nvim-tree.lua",
         requires = {
             { "nvim-tree/nvim-web-devicons" },
-        }
+        },
+        config = function()
+            require("valeth.packer.nvim-tree")
+        end
     }
 
     use {
diff --git a/lua/valeth/packer/crates.lua b/lua/valeth/packer/crates.lua
new file mode 100644
index 0000000..d4e19df
--- /dev/null
+++ b/lua/valeth/packer/crates.lua
@@ -0,0 +1,10 @@
+require("crates").setup()
+local cmp = require("cmp")
+
+vim.api.nvim_create_autocmd("BufRead", {
+    group = vim.api.nvim_create_augroup("CmpSourceCargo", { clear = true }),
+    pattern = "Cargo.toml",
+    callback = function()
+        cmp.setup.buffer({ sources = { { name = "crates" } } })
+    end,
+})
diff --git a/after/plugin/lsp.lua b/lua/valeth/packer/lsp.lua
similarity index 100%
rename from after/plugin/lsp.lua
rename to lua/valeth/packer/lsp.lua
diff --git a/after/plugin/lualine.lua b/lua/valeth/packer/lualine.lua
similarity index 100%
rename from after/plugin/lualine.lua
rename to lua/valeth/packer/lualine.lua
diff --git a/lua/valeth/packer/nvim-tree.lua b/lua/valeth/packer/nvim-tree.lua
new file mode 100644
index 0000000..2e1858d
--- /dev/null
+++ b/lua/valeth/packer/nvim-tree.lua
@@ -0,0 +1,12 @@
+local nvim_tree = require("nvim-tree")
+local nvim_tree_api = require("nvim-tree.api")
+
+vim.keymap.set("n", "<Leader>ft", nvim_tree_api.tree.open)
+
+nvim_tree.setup({
+    view = {
+        float = {
+            enable = true
+        }
+    }
+})
diff --git a/after/plugin/session.lua b/lua/valeth/packer/session.lua
similarity index 100%
rename from after/plugin/session.lua
rename to lua/valeth/packer/session.lua
diff --git a/after/plugin/fs.lua b/lua/valeth/packer/sshfs.lua
similarity index 54%
rename from after/plugin/fs.lua
rename to lua/valeth/packer/sshfs.lua
index ca3035e..ca3d503 100644
--- a/after/plugin/fs.lua
+++ b/lua/valeth/packer/sshfs.lua
@@ -1,17 +1,3 @@
-local nvim_tree = require("nvim-tree")
-local nvim_tree_api = require("nvim-tree.api")
-
-vim.keymap.set("n", "<Leader>ft", nvim_tree_api.tree.open)
-
-nvim_tree.setup({
-    view = {
-        float = {
-            enable = true
-        }
-    }
-})
-
-
 local ssh_config = vim.fs.normalize((os.getenv("XDG_CONFIG_HOME") or "~/.config") .. "/ssh/config")
 
 require("remote-sshfs").setup({
diff --git a/after/plugin/telescope.lua b/lua/valeth/packer/telescope.lua
similarity index 96%
rename from after/plugin/telescope.lua
rename to lua/valeth/packer/telescope.lua
index cb4a2ef..3c6737d 100644
--- a/after/plugin/telescope.lua
+++ b/lua/valeth/packer/telescope.lua
@@ -1,6 +1,8 @@
 local telescope = require("telescope")
 local actions = require("telescope.actions")
 
+telescope.load_extension("harpoon")
+
 telescope.setup {
     pickers = {
         buffers = {
diff --git a/after/plugin/treesitter.lua b/lua/valeth/packer/treesitter.lua
similarity index 82%
rename from after/plugin/treesitter.lua
rename to lua/valeth/packer/treesitter.lua
index d7dab31..01830b8 100644
--- a/after/plugin/treesitter.lua
+++ b/lua/valeth/packer/treesitter.lua
@@ -7,10 +7,10 @@ require("nvim-treesitter.configs").setup {
         enable = true,
         additional_vim_regex_highlighting = false,
     },
+
+    endwise = { enable = true }
 }
 
 require("treesitter-context").setup()
 
-require("nvim-treesitter.configs").setup {
-    endwise = { enable = true }
-}
+require("nvim-treesitter.install").update({ with_sync = true })()
diff --git a/after/plugin/undotree.lua b/lua/valeth/packer/undotree.lua
similarity index 87%
rename from after/plugin/undotree.lua
rename to lua/valeth/packer/undotree.lua
index 7961a75..369ccb8 100644
--- a/after/plugin/undotree.lua
+++ b/lua/valeth/packer/undotree.lua
@@ -1,3 +1,5 @@
 local undotree = require("undotree")
 
 vim.keymap.set("n", "<Leader>u", undotree.toggle, { noremap = true, silent = true })
+
+undotree.setup()