diff --git a/.gitignore b/.gitignore
index ab7f207..645e6a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-nvim-old/plugged
-nvim-old/.netrwhist
-nvim/.config/nvim/plugin
-nvim/.config/nvim/spell
-zsh/.config/zsh/plugins/*
-zsh/.config/zsh/.zcompdump
-tmux/.config/tmux/plugins/*
-
+*.old
diff --git a/nvim/.config/nvim/.stylua.toml b/.stylua.toml
similarity index 100%
rename from nvim/.config/nvim/.stylua.toml
rename to .stylua.toml
diff --git a/README.md b/README.md
index d390c1f..f8d6644 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-# config_files
+# nvim
 
-My dotfiles used for configuring Linux dev machines. Uses Gnu stow for management.
+My neovim config
diff --git a/nvim/.config/nvim/after/ftplugin/python.lua b/after/ftplugin/python.lua
similarity index 100%
rename from nvim/.config/nvim/after/ftplugin/python.lua
rename to after/ftplugin/python.lua
diff --git a/nvim/.config/nvim/ftdetect/github_workflows.lua b/ftdetect/github_workflows.lua
similarity index 100%
rename from nvim/.config/nvim/ftdetect/github_workflows.lua
rename to ftdetect/github_workflows.lua
diff --git a/nvim/.config/nvim/ftdetect/superhtml.lua b/ftdetect/superhtml.lua
similarity index 100%
rename from nvim/.config/nvim/ftdetect/superhtml.lua
rename to ftdetect/superhtml.lua
diff --git a/nvim/.config/nvim/init.lua b/init.lua
similarity index 100%
rename from nvim/.config/nvim/init.lua
rename to init.lua
diff --git a/nvim/.config/nvim/lazy-lock.json b/lazy-lock.json
similarity index 100%
rename from nvim/.config/nvim/lazy-lock.json
rename to lazy-lock.json
diff --git a/nvim/.config/nvim/lsp/biome-custom.lua b/lsp/biome-custom.lua
similarity index 100%
rename from nvim/.config/nvim/lsp/biome-custom.lua
rename to lsp/biome-custom.lua
diff --git a/nvim/.config/nvim/lsp/gopls.lua b/lsp/gopls.lua
similarity index 100%
rename from nvim/.config/nvim/lsp/gopls.lua
rename to lsp/gopls.lua
diff --git a/nvim/.config/nvim/lsp/ltex.lua b/lsp/ltex.lua
similarity index 100%
rename from nvim/.config/nvim/lsp/ltex.lua
rename to lsp/ltex.lua
diff --git a/nvim/.config/nvim/lsp/lua_ls.lua b/lsp/lua_ls.lua
similarity index 100%
rename from nvim/.config/nvim/lsp/lua_ls.lua
rename to lsp/lua_ls.lua
diff --git a/nvim/.config/nvim/lsp/nil_ls.lua b/lsp/nil_ls.lua
similarity index 100%
rename from nvim/.config/nvim/lsp/nil_ls.lua
rename to lsp/nil_ls.lua
diff --git a/nvim/.config/nvim/lsp/pyright.lua b/lsp/pyright.lua
similarity index 100%
rename from nvim/.config/nvim/lsp/pyright.lua
rename to lsp/pyright.lua
diff --git a/nvim/.config/nvim/lsp/superhtml.lua b/lsp/superhtml.lua
similarity index 100%
rename from nvim/.config/nvim/lsp/superhtml.lua
rename to lsp/superhtml.lua
diff --git a/nvim/.config/nvim/lsp/terraformls.lua b/lsp/terraformls.lua
similarity index 100%
rename from nvim/.config/nvim/lsp/terraformls.lua
rename to lsp/terraformls.lua
diff --git a/nvim/.config/nvim/lsp/yamlls.lua b/lsp/yamlls.lua
similarity index 100%
rename from nvim/.config/nvim/lsp/yamlls.lua
rename to lsp/yamlls.lua
diff --git a/nvim/.config/nvim/lua/.luarc.json b/lua/.luarc.json
similarity index 100%
rename from nvim/.config/nvim/lua/.luarc.json
rename to lua/.luarc.json
diff --git a/nvim/.config/nvim/lua/lsp.lua b/lua/lsp.lua
similarity index 100%
rename from nvim/.config/nvim/lua/lsp.lua
rename to lua/lsp.lua
diff --git a/nvim/.config/nvim/lua/mappings.lua b/lua/mappings.lua
similarity index 100%
rename from nvim/.config/nvim/lua/mappings.lua
rename to lua/mappings.lua
diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/lua/plugins/conform.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/conform.lua
rename to lua/plugins/conform.lua
diff --git a/nvim/.config/nvim/lua/plugins/coverage.lua b/lua/plugins/coverage.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/coverage.lua
rename to lua/plugins/coverage.lua
diff --git a/nvim/.config/nvim/lua/plugins/freeze.lua b/lua/plugins/freeze.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/freeze.lua
rename to lua/plugins/freeze.lua
diff --git a/nvim/.config/nvim/lua/plugins/git.lua b/lua/plugins/git.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/git.lua
rename to lua/plugins/git.lua
diff --git a/nvim/.config/nvim/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/harpoon.lua
rename to lua/plugins/harpoon.lua
diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/lua/plugins/init.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/init.lua
rename to lua/plugins/init.lua
diff --git a/nvim/.config/nvim/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/lualine.lua
rename to lua/plugins/lualine.lua
diff --git a/nvim/.config/nvim/lua/plugins/mini.lua b/lua/plugins/mini.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/mini.lua
rename to lua/plugins/mini.lua
diff --git a/nvim/.config/nvim/lua/plugins/oil.lua b/lua/plugins/oil.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/oil.lua
rename to lua/plugins/oil.lua
diff --git a/nvim/.config/nvim/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/snacks.lua
rename to lua/plugins/snacks.lua
diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/telescope.lua
rename to lua/plugins/telescope.lua
diff --git a/nvim/.config/nvim/lua/plugins/trouble.lua b/lua/plugins/trouble.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins/trouble.lua
rename to lua/plugins/trouble.lua
diff --git a/nvim/.config/nvim/.gitignore b/nvim/.config/nvim/.gitignore
deleted file mode 100644
index 645e6a2..0000000
--- a/nvim/.config/nvim/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.old
diff --git a/nvim/.config/nvim/queries/superhtml/highlights.scm b/queries/superhtml/highlights.scm
similarity index 100%
rename from nvim/.config/nvim/queries/superhtml/highlights.scm
rename to queries/superhtml/highlights.scm
diff --git a/nvim/.config/nvim/queries/superhtml/injections.scm b/queries/superhtml/injections.scm
similarity index 100%
rename from nvim/.config/nvim/queries/superhtml/injections.scm
rename to queries/superhtml/injections.scm
diff --git a/nvim/.config/nvim/snippets/package.json b/snippets/package.json
similarity index 100%
rename from nvim/.config/nvim/snippets/package.json
rename to snippets/package.json
diff --git a/nvim/.config/nvim/snippets/yaml.json b/snippets/yaml.json
similarity index 100%
rename from nvim/.config/nvim/snippets/yaml.json
rename to snippets/yaml.json