diff --git a/git/setup b/git/setup
index 9f5a951..ce81e0d 100755
--- a/git/setup
+++ b/git/setup
@@ -1,4 +1,18 @@
 #!/bin/sh
 
-mkdir "${HOME}/.config" >/dev/null 2>&1
-ln -sfv "${PWD}/git" "${HOME}/.config"
+config="${HOME}/.config"
+
+_make_dirs() {
+  test ! -d "${config}" && mkdir "${config}"
+}
+
+_remove_git() {
+  test -d "${config}/git" && rm "${config}/git"
+}
+
+_link_git() {
+  ln -sfv "${PWD}/git" "${config}"
+}
+
+#------------------------------- main -------------------------------
+_make_dirs && _link_git
diff --git a/nvim/.config/nvim/init.lua b/nvim/init.lua
similarity index 100%
rename from nvim/.config/nvim/init.lua
rename to nvim/init.lua
diff --git a/nvim/.config/nvim/lua/autocmd.lua b/nvim/lua/autocmd.lua
similarity index 100%
rename from nvim/.config/nvim/lua/autocmd.lua
rename to nvim/lua/autocmd.lua
diff --git a/nvim/.config/nvim/lua/config/cmp.lua b/nvim/lua/config/cmp.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/cmp.lua
rename to nvim/lua/config/cmp.lua
diff --git a/nvim/.config/nvim/lua/config/colorizer.lua b/nvim/lua/config/colorizer.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/colorizer.lua
rename to nvim/lua/config/colorizer.lua
diff --git a/nvim/.config/nvim/lua/config/diffview.lua b/nvim/lua/config/diffview.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/diffview.lua
rename to nvim/lua/config/diffview.lua
diff --git a/nvim/.config/nvim/lua/config/lsp-installer.lua b/nvim/lua/config/lsp-installer.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/lsp-installer.lua
rename to nvim/lua/config/lsp-installer.lua
diff --git a/nvim/.config/nvim/lua/config/lsp.lua b/nvim/lua/config/lsp.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/lsp.lua
rename to nvim/lua/config/lsp.lua
diff --git a/nvim/.config/nvim/lua/config/lualine.lua b/nvim/lua/config/lualine.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/lualine.lua
rename to nvim/lua/config/lualine.lua
diff --git a/nvim/.config/nvim/lua/config/neogit.lua b/nvim/lua/config/neogit.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/neogit.lua
rename to nvim/lua/config/neogit.lua
diff --git a/nvim/.config/nvim/lua/config/nightfox.lua b/nvim/lua/config/nightfox.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/nightfox.lua
rename to nvim/lua/config/nightfox.lua
diff --git a/nvim/.config/nvim/lua/config/nvim-tree.lua b/nvim/lua/config/nvim-tree.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/nvim-tree.lua
rename to nvim/lua/config/nvim-tree.lua
diff --git a/nvim/.config/nvim/lua/config/telescope.lua b/nvim/lua/config/telescope.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/telescope.lua
rename to nvim/lua/config/telescope.lua
diff --git a/nvim/.config/nvim/lua/config/treesitter.lua b/nvim/lua/config/treesitter.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/treesitter.lua
rename to nvim/lua/config/treesitter.lua
diff --git a/nvim/.config/nvim/lua/config/vsnip.lua b/nvim/lua/config/vsnip.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/vsnip.lua
rename to nvim/lua/config/vsnip.lua
diff --git a/nvim/.config/nvim/lua/config/which.lua b/nvim/lua/config/which.lua
similarity index 100%
rename from nvim/.config/nvim/lua/config/which.lua
rename to nvim/lua/config/which.lua
diff --git a/nvim/.config/nvim/lua/mappings.lua b/nvim/lua/mappings.lua
similarity index 100%
rename from nvim/.config/nvim/lua/mappings.lua
rename to nvim/lua/mappings.lua
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
similarity index 100%
rename from nvim/.config/nvim/lua/plugins.lua
rename to nvim/lua/plugins.lua
diff --git a/nvim/.config/nvim/lua/settings.lua b/nvim/lua/settings.lua
similarity index 100%
rename from nvim/.config/nvim/lua/settings.lua
rename to nvim/lua/settings.lua
diff --git a/nvim/.config/nvim/lua/theme.lua b/nvim/lua/theme.lua
similarity index 100%
rename from nvim/.config/nvim/lua/theme.lua
rename to nvim/lua/theme.lua
diff --git a/nvim/setup b/nvim/setup
new file mode 100755
index 0000000..3419bcc
--- /dev/null
+++ b/nvim/setup
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+config="${HOME}/.config"
+
+_make_dirs() {
+  test ! -d "${config}" && mkdir "${config}"
+  test ! -d "${config}/nvim" && mkdir "${config}/nvim"
+}
+
+_remove_nvim() {
+  test -d "${config}/nvim" && rm -r "${config}/nvim"
+}
+
+_link_nvim() {
+  ln -sfv "${PWD}/init.lua" "${config}/nvim"
+  ln -sfv "${PWD}/lua" "${config}/nvim"
+}
+
+#------------------------------- main ------------------------------ 
+_make_dirs && _link_nvim
diff --git a/tmux/setup b/tmux/setup
index cb71ff2..1653f87 100755
--- a/tmux/setup
+++ b/tmux/setup
@@ -1,3 +1,12 @@
 #!/bin/sh
 
-ln -sfv "${PWD}/.tmux.conf" "${HOME}"
+_remove_tmux() {
+  rm "${HOME}/.tmux.conf"
+}
+
+_link_tmux() {
+  ln -sfv "${PWD}/.tmux.conf" "${HOME}"
+}
+
+#------------------------------- main -------------------------------
+_link_tmux