diff --git a/user/config/nvim/default.nix b/user/config/nvim/default.nix
index 61b4461..0e7ef9b 100644
--- a/user/config/nvim/default.nix
+++ b/user/config/nvim/default.nix
@@ -21,6 +21,8 @@
       catppuccin-nvim
       tokyonight-nvim
       gitsigns-nvim
+      neo-tree-nvim
+      undotree
     ];
     extraPackages = with pkgs; [
       python3Packages.jedi-language-server
diff --git a/user/config/nvim/lua/init.lua b/user/config/nvim/lua/init.lua
index d037cf7..1e1e54e 100644
--- a/user/config/nvim/lua/init.lua
+++ b/user/config/nvim/lua/init.lua
@@ -1,4 +1,3 @@
-require('u.bindings')
 require('u.options')
-require('u.lsp')
-require('u.cmp')
+require('u.bindings')
+require('u.plugins')
diff --git a/user/config/nvim/lua/u/bindings.lua b/user/config/nvim/lua/u/bindings.lua
index 9c8e3fb..6775356 100644
--- a/user/config/nvim/lua/u/bindings.lua
+++ b/user/config/nvim/lua/u/bindings.lua
@@ -1,4 +1,3 @@
-vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
-
-require('mini.move').setup()
-require('mini.ai').setup()
+vim.keymap.set('n', '<esc>', '<cmd>nohlsearch<cr>')
+vim.keymap.set('n', '<leader>t', '<cmd>Neotree toggle<cr>')
+vim.keymap.set('n', '<leader>u', '<cmd>UndotreeToggle<cr>')
diff --git a/user/config/nvim/lua/u/options.lua b/user/config/nvim/lua/u/options.lua
index a2e0ea6..40238e7 100644
--- a/user/config/nvim/lua/u/options.lua
+++ b/user/config/nvim/lua/u/options.lua
@@ -50,23 +50,7 @@ vim.api.nvim_create_autocmd('TextYankPost', {
     vim.highlight.on_yank()
   end,
 })
-
-local statusline = require('mini.statusline')
-statusline.setup()
-statusline.section_location = function()
-  return '%2l:%-2v'
-end
 vim.cmd.colorscheme 'tokyonight-storm'
 
-require('gitsigns').setup({
-  signs = {
-    add = { text = '+' },
-    change = { text = '*' },
-  },
-})
-
-require('nvim-treesitter.configs').setup({
-  highlight = {
-    enable = true
-  }
-})
+vim.g.loaded_netrwPlugin = 1
+vim.g.loaded_netrw = 1
diff --git a/user/config/nvim/lua/u/cmp.lua b/user/config/nvim/lua/u/plugins/cmp.lua
similarity index 100%
rename from user/config/nvim/lua/u/cmp.lua
rename to user/config/nvim/lua/u/plugins/cmp.lua
diff --git a/user/config/nvim/lua/u/plugins/init.lua b/user/config/nvim/lua/u/plugins/init.lua
new file mode 100644
index 0000000..3cac9d8
--- /dev/null
+++ b/user/config/nvim/lua/u/plugins/init.lua
@@ -0,0 +1,29 @@
+require('u.plugins.lsp')
+require('u.plugins.cmp')
+
+local statusline = require('mini.statusline')
+statusline.setup()
+statusline.section_location = function()
+  return '%2l:%-2v'
+end
+
+require('gitsigns').setup({
+  signs = {
+    add = { text = '+' },
+    change = { text = '*' },
+  },
+})
+
+require('nvim-treesitter.configs').setup({
+  highlight = {
+    enable = true
+  }
+})
+require('neo-tree').setup({
+  close_if_last_window = true,
+})
+
+require('mini.move').setup()
+require('mini.ai').setup()
+require('mini.jump2d').setup()
+require('mini.comment').setup()
diff --git a/user/config/nvim/lua/u/lsp.lua b/user/config/nvim/lua/u/plugins/lsp.lua
similarity index 100%
rename from user/config/nvim/lua/u/lsp.lua
rename to user/config/nvim/lua/u/plugins/lsp.lua