diff --git a/init.lua b/init.lua
index 3e9f663..792d175 100644
--- a/init.lua
+++ b/init.lua
@@ -1,12 +1,6 @@
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
-require("zak.lazy")
-require("zak.options")
-require("zak.keymap")
-require("zak.treesitter")
-require("zak.lsp")
-require("zak.ale")
-require("zak.ocaml")
+require("zak")
 
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/zak/ale.lua b/lua/zak/configs/ale.lua
similarity index 100%
rename from lua/zak/ale.lua
rename to lua/zak/configs/ale.lua
diff --git a/lua/zak/configs/fugitive.lua b/lua/zak/configs/fugitive.lua
new file mode 100644
index 0000000..6e1b92d
--- /dev/null
+++ b/lua/zak/configs/fugitive.lua
@@ -0,0 +1 @@
+vim.keymap.set('n', '<leader>gs', vim.cmd.Git)
diff --git a/lua/zak/configs/harpoon.lua b/lua/zak/configs/harpoon.lua
new file mode 100644
index 0000000..9bfa3ef
--- /dev/null
+++ b/lua/zak/configs/harpoon.lua
@@ -0,0 +1,10 @@
+local mark = require('harpoon.mark')
+local ui = require('harpoon.ui')
+
+vim.keymap.set('n', '<leader>a', mark.add_file)
+vim.keymap.set('n', '<C-e>', ui.toggle_quick_menu)
+
+vim.keymap.set('n', '<C-h>', function () ui.nav_file(1) end)
+vim.keymap.set('n', '<C-t>', function () ui.nav_file(2) end)
+vim.keymap.set('n', '<C-n>', function () ui.nav_file(3) end)
+vim.keymap.set('n', '<C-s>', function () ui.nav_file(4) end)
diff --git a/lua/zak/lazy.lua b/lua/zak/configs/lazy.lua
similarity index 100%
rename from lua/zak/lazy.lua
rename to lua/zak/configs/lazy.lua
diff --git a/lua/zak/lsp.lua b/lua/zak/configs/lsp.lua
similarity index 100%
rename from lua/zak/lsp.lua
rename to lua/zak/configs/lsp.lua
diff --git a/lua/zak/ocaml.lua b/lua/zak/configs/ocaml.lua
similarity index 100%
rename from lua/zak/ocaml.lua
rename to lua/zak/configs/ocaml.lua
diff --git a/lua/zak/treesitter.lua b/lua/zak/configs/treesitter.lua
similarity index 100%
rename from lua/zak/treesitter.lua
rename to lua/zak/configs/treesitter.lua
diff --git a/lua/zak/configs/undotree.lua b/lua/zak/configs/undotree.lua
new file mode 100644
index 0000000..a346462
--- /dev/null
+++ b/lua/zak/configs/undotree.lua
@@ -0,0 +1 @@
+vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
diff --git a/lua/zak/init.lua b/lua/zak/init.lua
new file mode 100644
index 0000000..3162a70
--- /dev/null
+++ b/lua/zak/init.lua
@@ -0,0 +1,12 @@
+-- load options
+require('configs.lazy')
+require('options')
+require('keymap')
+
+-- load configs
+local config_path = vim.fn.stdpath("config") .. "/lua/zak/configs"
+for _, file in ipairs(vim.fn.readdir(config_path, [[v:val =~ '\.lua$']])) do
+  if file ~= "lazy.lua" then
+    require("configs."..file:gsub("%.lua$", ""))
+  end
+end
diff --git a/lua/zak/plugins/harpoon.lua b/lua/zak/plugins/harpoon.lua
new file mode 100644
index 0000000..a5e5ac9
--- /dev/null
+++ b/lua/zak/plugins/harpoon.lua
@@ -0,0 +1,3 @@
+return {
+  'theprimeagen/harpoon'
+}
diff --git a/lua/zak/plugins/init.lua b/lua/zak/plugins/init.lua
index 956483e..21c0a4e 100644
--- a/lua/zak/plugins/init.lua
+++ b/lua/zak/plugins/init.lua
@@ -123,4 +123,8 @@ return {
     'dense-analysis/ale'
   },
 
+  {
+    'mbbill/undotree'
+  },
+
 }