diff --git a/.config/nvim b/.config/nvim
deleted file mode 120000
index d81299c7..00000000
--- a/.config/nvim
+++ /dev/null
@@ -1 +0,0 @@
-/Users/alpha/.dotfiles/nvim/config
\ No newline at end of file
diff --git a/nvim/config/fnl/ftplugin/fennel.fnl b/.config/nvim/fnl/ftplugin/fennel.fnl
similarity index 100%
rename from nvim/config/fnl/ftplugin/fennel.fnl
rename to .config/nvim/fnl/ftplugin/fennel.fnl
diff --git a/nvim/config/fnl/ftplugin/rust.fnl b/.config/nvim/fnl/ftplugin/rust.fnl
similarity index 100%
rename from nvim/config/fnl/ftplugin/rust.fnl
rename to .config/nvim/fnl/ftplugin/rust.fnl
diff --git a/nvim/config/fnl/fzf.fnl b/.config/nvim/fnl/fzf.fnl
similarity index 100%
rename from nvim/config/fnl/fzf.fnl
rename to .config/nvim/fnl/fzf.fnl
diff --git a/nvim/config/fnl/init.fnl b/.config/nvim/fnl/init.fnl
similarity index 100%
rename from nvim/config/fnl/init.fnl
rename to .config/nvim/fnl/init.fnl
diff --git a/nvim/config/fnl/lsp.fnl b/.config/nvim/fnl/lsp.fnl
similarity index 100%
rename from nvim/config/fnl/lsp.fnl
rename to .config/nvim/fnl/lsp.fnl
diff --git a/nvim/config/init.lua b/.config/nvim/init.lua
similarity index 100%
rename from nvim/config/init.lua
rename to .config/nvim/init.lua
diff --git a/.gitmodules b/.gitmodules
index 60484541..2ca1f896 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -161,72 +161,93 @@
 [submodule "src/frink.alfredworkflow"]
 	path = src/frink.alfredworkflow
 	url = https://github.com/kejadlen/frink.alfredworkflow
-[submodule ".local/share/nvim/site/pack/hotpot.nvim"]
-	path = nvim/pack/kejadlen/start/hotpot
+[submodule "hotpot.nvim"]
+	path = .local/share/nvim/site/pack/kejadlen/start/hotpot
 	url = https://github.com/rktjmp/hotpot.nvim
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/paramount"]
+[submodule "paramount"]
+	path = .local/share/nvim/site/pack/kejadlen/start/paramount
 	url = https://git.kejadlen.dev/alpha/vim-colors-paramount.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/vim-tmux-navigator"]
-	path = nvim/pack/kejadlen/start/tmux-navigator
+[submodule "vim-tmux-navigator"]
+	path = .local/share/nvim/site/pack/kejadlen/start/vim-tmux-navigator
 	url = https://github.com/christoomey/vim-tmux-navigator.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/lightline"]
-	path = nvim/pack/kejadlen/start/lightline
+[submodule "lightline"]
+	path = .local/share/nvim/site/pack/kejadlen/start/lightline
 	url = https://github.com/itchyny/lightline.vim.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/unimpaired"]
-	path = nvim/pack/kejadlen/start/unimpaired
+[submodule "unimpaired"]
+	path = .local/share/nvim/site/pack/kejadlen/start/unimpaired
 	url = https://github.com/tpope/vim-unimpaired.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/sleuth"]
-	path = nvim/pack/kejadlen/start/sleuth
+[submodule "sleuth"]
+	path = .local/share/nvim/site/pack/kejadlen/start/sleuth
 	url = https://github.com/tpope/vim-sleuth.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/fennel"]
-	path = nvim/pack/kejadlen/start/fennel
+[submodule "fennel"]
+	path = .local/share/nvim/site/pack/kejadlen/start/fennel
 	url = https://github.com/jaawerth/fennel.vim.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/commentary"]
-	path = nvim/pack/kejadlen/start/commentary
+[submodule "commentary"]
+	path = .local/share/nvim/site/pack/kejadlen/start/commentary
 	url = https://github.com/tpope/vim-commentary.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/lspconfig"]
-	path = nvim/pack/kejadlen/start/lspconfig
+[submodule "lspconfig"]
+	path = .local/share/nvim/site/pack/kejadlen/start/lspconfig
 	url = https://github.com/neovim/nvim-lspconfig.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/sensible"]
-	path = nvim/pack/kejadlen/start/sensible
+[submodule "sensible"]
+	path = .local/share/nvim/site/pack/kejadlen/start/sensible
 	url = https://github.com/tpope/vim-sensible.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/vinegar"]
-	path = nvim/pack/kejadlen/start/vinegar
+[submodule "vinegar"]
+	path = .local/share/nvim/site/pack/kejadlen/start/vinegar
 	url = https://github.com/tpope/vim-vinegar.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/surround"]
-	path = nvim/pack/kejadlen/start/surround
+[submodule "surround"]
+	path = .local/share/nvim/site/pack/kejadlen/start/surround
 	url = https://github.com/tpope/vim-surround.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/fzf"]
-	path = nvim/pack/kejadlen/start/fzf
+[submodule "fzf"]
+	path = .local/share/nvim/site/pack/kejadlen/start/fzf
 	url = https://github.com/junegunn/fzf.vim.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/repeat"]
-	path = nvim/pack/kejadlen/start/repeat
+[submodule "repeat"]
+	path = .local/share/nvim/site/pack/kejadlen/start/repeat
 	url = https://github.com/tpope/vim-repeat.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/tabular"]
-	path = nvim/pack/kejadlen/start/tabular
+[submodule "tabular"]
+	path = .local/share/nvim/site/pack/kejadlen/start/tabular
 	url = https://github.com/godlygeek/tabular.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/treesitter"]
-	path = nvim/pack/kejadlen/start/treesitter
+[submodule "treesitter"]
+	path = .local/share/nvim/site/pack/kejadlen/start/treesitter
 	url = https://github.com/nvim-treesitter/nvim-treesitter.git
+	branch = master
 	shallow = true
-[submodule ".local/share/nvim/site/pack/kejadlen/start/treesitter-textobjects"]
-	path = nvim/pack/kejadlen/start/treesitter-textobjects
+[submodule "treesitter-textobjects"]
+	path = .local/share/nvim/site/pack/kejadlen/start/treesitter-textobjects
 	url = https://github.com/nvim-treesitter/nvim-treesitter-textobjects.git
-[submodule ".local/share/nvim/site/pack/kejadlen/start/navic"]
-	path = nvim/pack/kejadlen/start/navic
+	branch = master
+	shallow = true
+[submodule "navic"]
+	path = .local/share/nvim/site/pack/kejadlen/start/navic
 	url = https://github.com/SmiteshP/nvim-navic.git
+	branch = master
+	shallow = true
diff --git a/nvim/pack/kejadlen/start/commentary b/.local/share/nvim/site/pack/kejadlen/start/commentary
similarity index 100%
rename from nvim/pack/kejadlen/start/commentary
rename to .local/share/nvim/site/pack/kejadlen/start/commentary
diff --git a/nvim/pack/kejadlen/start/fennel b/.local/share/nvim/site/pack/kejadlen/start/fennel
similarity index 100%
rename from nvim/pack/kejadlen/start/fennel
rename to .local/share/nvim/site/pack/kejadlen/start/fennel
diff --git a/nvim/pack/kejadlen/start/fzf b/.local/share/nvim/site/pack/kejadlen/start/fzf
similarity index 100%
rename from nvim/pack/kejadlen/start/fzf
rename to .local/share/nvim/site/pack/kejadlen/start/fzf
diff --git a/nvim/pack/kejadlen/start/hotpot b/.local/share/nvim/site/pack/kejadlen/start/hotpot
similarity index 100%
rename from nvim/pack/kejadlen/start/hotpot
rename to .local/share/nvim/site/pack/kejadlen/start/hotpot
diff --git a/nvim/pack/kejadlen/start/lightline b/.local/share/nvim/site/pack/kejadlen/start/lightline
similarity index 100%
rename from nvim/pack/kejadlen/start/lightline
rename to .local/share/nvim/site/pack/kejadlen/start/lightline
diff --git a/nvim/pack/kejadlen/start/lspconfig b/.local/share/nvim/site/pack/kejadlen/start/lspconfig
similarity index 100%
rename from nvim/pack/kejadlen/start/lspconfig
rename to .local/share/nvim/site/pack/kejadlen/start/lspconfig
diff --git a/nvim/pack/kejadlen/start/navic b/.local/share/nvim/site/pack/kejadlen/start/navic
similarity index 100%
rename from nvim/pack/kejadlen/start/navic
rename to .local/share/nvim/site/pack/kejadlen/start/navic
diff --git a/nvim/pack/kejadlen/start/paramount b/.local/share/nvim/site/pack/kejadlen/start/paramount
similarity index 100%
rename from nvim/pack/kejadlen/start/paramount
rename to .local/share/nvim/site/pack/kejadlen/start/paramount
diff --git a/nvim/pack/kejadlen/start/repeat b/.local/share/nvim/site/pack/kejadlen/start/repeat
similarity index 100%
rename from nvim/pack/kejadlen/start/repeat
rename to .local/share/nvim/site/pack/kejadlen/start/repeat
diff --git a/nvim/pack/kejadlen/start/sensible b/.local/share/nvim/site/pack/kejadlen/start/sensible
similarity index 100%
rename from nvim/pack/kejadlen/start/sensible
rename to .local/share/nvim/site/pack/kejadlen/start/sensible
diff --git a/nvim/pack/kejadlen/start/sleuth b/.local/share/nvim/site/pack/kejadlen/start/sleuth
similarity index 100%
rename from nvim/pack/kejadlen/start/sleuth
rename to .local/share/nvim/site/pack/kejadlen/start/sleuth
diff --git a/nvim/pack/kejadlen/start/surround b/.local/share/nvim/site/pack/kejadlen/start/surround
similarity index 100%
rename from nvim/pack/kejadlen/start/surround
rename to .local/share/nvim/site/pack/kejadlen/start/surround
diff --git a/nvim/pack/kejadlen/start/tabular b/.local/share/nvim/site/pack/kejadlen/start/tabular
similarity index 100%
rename from nvim/pack/kejadlen/start/tabular
rename to .local/share/nvim/site/pack/kejadlen/start/tabular
diff --git a/nvim/pack/kejadlen/start/treesitter b/.local/share/nvim/site/pack/kejadlen/start/treesitter
similarity index 100%
rename from nvim/pack/kejadlen/start/treesitter
rename to .local/share/nvim/site/pack/kejadlen/start/treesitter
diff --git a/nvim/pack/kejadlen/start/treesitter-textobjects b/.local/share/nvim/site/pack/kejadlen/start/treesitter-textobjects
similarity index 100%
rename from nvim/pack/kejadlen/start/treesitter-textobjects
rename to .local/share/nvim/site/pack/kejadlen/start/treesitter-textobjects
diff --git a/nvim/pack/kejadlen/start/unimpaired b/.local/share/nvim/site/pack/kejadlen/start/unimpaired
similarity index 100%
rename from nvim/pack/kejadlen/start/unimpaired
rename to .local/share/nvim/site/pack/kejadlen/start/unimpaired
diff --git a/nvim/pack/kejadlen/start/tmux-navigator b/.local/share/nvim/site/pack/kejadlen/start/vim-tmux-navigator
similarity index 100%
rename from nvim/pack/kejadlen/start/tmux-navigator
rename to .local/share/nvim/site/pack/kejadlen/start/vim-tmux-navigator
diff --git a/nvim/pack/kejadlen/start/vinegar b/.local/share/nvim/site/pack/kejadlen/start/vinegar
similarity index 100%
rename from nvim/pack/kejadlen/start/vinegar
rename to .local/share/nvim/site/pack/kejadlen/start/vinegar