diff --git a/_cli/astronvim/lua/user/highlights/init.lua b/astronvim/highlights/init.lua
similarity index 100%
rename from _cli/astronvim/lua/user/highlights/init.lua
rename to astronvim/highlights/init.lua
diff --git a/_cli/astronvim/lua/user/init.lua b/astronvim/init.lua
similarity index 100%
rename from _cli/astronvim/lua/user/init.lua
rename to astronvim/init.lua
diff --git a/_cli/astronvim/lua/user/mappings.lua b/astronvim/mappings.lua
similarity index 100%
rename from _cli/astronvim/lua/user/mappings.lua
rename to astronvim/mappings.lua
diff --git a/_cli/astronvim/lua/user/options.lua b/astronvim/options.lua
similarity index 100%
rename from _cli/astronvim/lua/user/options.lua
rename to astronvim/options.lua
diff --git a/_cli/astronvim/lua/user/plugins/init.lua b/astronvim/plugins/init.lua
similarity index 100%
rename from _cli/astronvim/lua/user/plugins/init.lua
rename to astronvim/plugins/init.lua
diff --git a/_cli/astronvim/lua/user/plugins/lualine.lua b/astronvim/plugins/lualine.lua
similarity index 100%
rename from _cli/astronvim/lua/user/plugins/lualine.lua
rename to astronvim/plugins/lualine.lua
diff --git a/_cli/astronvim/lua/user/plugins/monokai.lua b/astronvim/plugins/monokai.lua
similarity index 100%
rename from _cli/astronvim/lua/user/plugins/monokai.lua
rename to astronvim/plugins/monokai.lua
diff --git a/_cli/astronvim/lua/user/plugins/neotree.lua b/astronvim/plugins/neotree.lua
similarity index 100%
rename from _cli/astronvim/lua/user/plugins/neotree.lua
rename to astronvim/plugins/neotree.lua
diff --git a/_cli/astronvim/lua/user/plugins/notify.lua b/astronvim/plugins/notify.lua
similarity index 100%
rename from _cli/astronvim/lua/user/plugins/notify.lua
rename to astronvim/plugins/notify.lua
diff --git a/_cli/astronvim/lua/user/plugins/treesitter.lua b/astronvim/plugins/treesitter.lua
similarity index 100%
rename from _cli/astronvim/lua/user/plugins/treesitter.lua
rename to astronvim/plugins/treesitter.lua
diff --git a/_cli/astronvim/lua/user/plugins/whitespace.lua b/astronvim/plugins/whitespace.lua
similarity index 100%
rename from _cli/astronvim/lua/user/plugins/whitespace.lua
rename to astronvim/plugins/whitespace.lua
diff --git a/install.sh b/install.sh
index 6d0eb05..1d12ee1 100644
--- a/install.sh
+++ b/install.sh
@@ -19,7 +19,8 @@ git clone https://git.insomniac.pl/ftpd/dotfiles ~/.local/git/dotfiles
 
 # nvim
 rm -rf ~/.config/nvim ~/.local/share/nvim ~/.local/state/nvim 
-git clone --depth 1 https://github.com/AstroNvim/AstroNvim ~/.config/nvim
+git clone --depth 1 https://github.com/AstroNvim/AstroNvim $XDG_CONFIG_HOME/nvim
+ln -sf ~/.local/git/dotfiles/astronvim $XDG_CONFIG_HOME/nvim/lua/user
 
 # zsh modules
 mkdir -p ~/.local/git/zsh_modules