diff --git a/deploy.sh b/deploy.sh
index 45d0800..d21eae8 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,6 +1,6 @@
 # Neovim
-ln -fs $PWD/init.lua $HOME/.config/nvim/init.lua
-ln -fs $PWD/lua $HOME/.config/nvim/lua
+ln -fs $PWD/nvim/init.lua $HOME/.config/nvim/init.lua
+ln -fs $PWD/nvim/lua $HOME/.config/nvim/lua
 
 # Tmux
 ln -fs $PWD/tmux.conf $HOME/.tmux.conf
diff --git a/init.lua b/nvim/init.lua
similarity index 100%
rename from init.lua
rename to nvim/init.lua
diff --git a/lua/autocmds.lua b/nvim/lua/autocmds.lua
similarity index 100%
rename from lua/autocmds.lua
rename to nvim/lua/autocmds.lua
diff --git a/lua/custom_functions.lua b/nvim/lua/custom_functions.lua
similarity index 100%
rename from lua/custom_functions.lua
rename to nvim/lua/custom_functions.lua
diff --git a/lua/keymappings.lua b/nvim/lua/keymappings.lua
similarity index 100%
rename from lua/keymappings.lua
rename to nvim/lua/keymappings.lua
diff --git a/lua/lsp.lua b/nvim/lua/lsp.lua
similarity index 100%
rename from lua/lsp.lua
rename to nvim/lua/lsp.lua
diff --git a/lua/plugins.lua b/nvim/lua/plugins.lua
similarity index 100%
rename from lua/plugins.lua
rename to nvim/lua/plugins.lua
diff --git a/lua/plugins/comment.lua b/nvim/lua/plugins/comment.lua
similarity index 100%
rename from lua/plugins/comment.lua
rename to nvim/lua/plugins/comment.lua
diff --git a/lua/plugins/floaterm.lua b/nvim/lua/plugins/floaterm.lua
similarity index 100%
rename from lua/plugins/floaterm.lua
rename to nvim/lua/plugins/floaterm.lua
diff --git a/lua/plugins/gruvbox.lua b/nvim/lua/plugins/gruvbox.lua
similarity index 100%
rename from lua/plugins/gruvbox.lua
rename to nvim/lua/plugins/gruvbox.lua
diff --git a/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
similarity index 100%
rename from lua/plugins/lspconfig.lua
rename to nvim/lua/plugins/lspconfig.lua
diff --git a/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua
similarity index 100%
rename from lua/plugins/lualine.lua
rename to nvim/lua/plugins/lualine.lua
diff --git a/lua/plugins/luasnip.lua b/nvim/lua/plugins/luasnip.lua
similarity index 100%
rename from lua/plugins/luasnip.lua
rename to nvim/lua/plugins/luasnip.lua
diff --git a/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua
similarity index 100%
rename from lua/plugins/mason.lua
rename to nvim/lua/plugins/mason.lua
diff --git a/lua/plugins/nvim-cmp.lua b/nvim/lua/plugins/nvim-cmp.lua
similarity index 100%
rename from lua/plugins/nvim-cmp.lua
rename to nvim/lua/plugins/nvim-cmp.lua
diff --git a/lua/plugins/telekasten.lua b/nvim/lua/plugins/telekasten.lua
similarity index 100%
rename from lua/plugins/telekasten.lua
rename to nvim/lua/plugins/telekasten.lua
diff --git a/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
similarity index 100%
rename from lua/plugins/telescope.lua
rename to nvim/lua/plugins/telescope.lua
diff --git a/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from lua/plugins/treesitter.lua
rename to nvim/lua/plugins/treesitter.lua
diff --git a/lua/plugins/vim-gitgutter.lua b/nvim/lua/plugins/vim-gitgutter.lua
similarity index 100%
rename from lua/plugins/vim-gitgutter.lua
rename to nvim/lua/plugins/vim-gitgutter.lua
diff --git a/lua/plugins/vim-godot.lua b/nvim/lua/plugins/vim-godot.lua
similarity index 100%
rename from lua/plugins/vim-godot.lua
rename to nvim/lua/plugins/vim-godot.lua
diff --git a/lua/settings.lua b/nvim/lua/settings.lua
similarity index 100%
rename from lua/settings.lua
rename to nvim/lua/settings.lua