diff --git a/lua/dot013/options.lua b/lua/dot013/options.lua
index 9844f29..0372589 100644
--- a/lua/dot013/options.lua
+++ b/lua/dot013/options.lua
@@ -1,4 +1,3 @@
-
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
diff --git a/lua/dot013/plugins/init.lua b/lua/dot013/plugins/init.lua
index 3374c99..e6b1512 100644
--- a/lua/dot013/plugins/init.lua
+++ b/lua/dot013/plugins/init.lua
@@ -1,41 +1,6 @@
 return {
-	{
-		"plenary.nvim",
-		dep_of = {
-			"telescope.nvim",
-		},
-	},
-	{
-		"telescope-fzf-native.nvim",
-		dep_of = {
-			"telescope.nvim"
-		},
-	},
-	{
-		"telescope.nvim",
-		cmd = {
-			"Telescope",
-		},
-		keys = {
-			{ "<leader><space>", function() return require("telescope.builtin").buffers end, "Find existing buffers" },
-			{
-				"/",
-				function() return require("telescope.builtin").current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({
-					windblend = 10,
-					previewer = false,
-				})) end,
-				"Find in current buffer"
-			},
-			{ "fr", ":lua require('telescope.builtin').oldfiles()<cr>", "Find recent files" },
-			{ "ff", "<cmd>Telescope find_files<cr>", "Find files" },
-			{ "fw", ":lua require('telescope.builtin').grep_string()<cr>", "Find word" },
-			{ "<leader>fw", "<cmd>Telescope live_grep<cr>","Find word in all files" },
-			{ "gf", ":lua require('telescope.builtin').git_files()<cr>", "Git files" },
-			{ "fs", ":lua require('telescope.builtin').resume()<cr>", "Resume search" },
-		},
-		after = function ()
-			require("telescope").setup()
-			require("telescope").load_extension("fzf")
-		end,
-	}
+	{ import = "dot013.plugins.navigation" },
+
+	-- Global Dependencies
+	{ "plenary.nvim", dep_of = { "telescope.nvim", "harpoon" } },
 }
diff --git a/lua/dot013/plugins/navigation.lua b/lua/dot013/plugins/navigation.lua
new file mode 100644
index 0000000..47b9552
--- /dev/null
+++ b/lua/dot013/plugins/navigation.lua
@@ -0,0 +1,36 @@
+return {
+	{
+		"telescope.nvim",
+		cmd = {
+			"Telescope",
+		},
+		keys = {
+			{ "<leader><space>", ":lua require('telescope.builtin').buffers<cr>", "[Telescope] Find existing buffers" },
+			{
+				"/",
+				function()
+					return require("telescope.builtin").current_buffer_fuzzy_find(
+						require("telescope.themes").get_dropdown({
+							windblend = 10,
+							previewer = false,
+						})
+					)
+				end,
+				"[Telescope] Find in current buffer",
+			},
+			{ "fr", ":lua require('telescope.builtin').oldfiles()<cr>", "[Telescope] Find recent files" },
+			{ "ff", "<cmd>Telescope find_files<cr>", "[Telescope] Find files" },
+			{ "fw", ":lua require('telescope.builtin').grep_string()<cr>", "[Telescope] Find word" },
+			{ "<leader>fw", "<cmd>Telescope live_grep<cr>", "[Telescope] Find word in all files" },
+			{ "gf", ":lua require('telescope.builtin').git_files()<cr>", "[Telescope] Git files" },
+			{ "fs", ":lua require('telescope.builtin').resume()<cr>", "[Telescope] Resume search" },
+		},
+		after = function()
+			require("telescope").setup()
+			require("telescope").load_extension("fzf")
+		end,
+	},
+	-- Telescope dependencies
+	{ "telescope-fzf-native.nvim", dep_of = { "telescope.nvim" } },
+
+}