diff --git a/zsh/.zshenv b/zsh/config/.zshenv
similarity index 100%
rename from zsh/.zshenv
rename to zsh/config/.zshenv
diff --git a/zsh/zsh/.zshrc b/zsh/config/.zshrc
similarity index 99%
rename from zsh/zsh/.zshrc
rename to zsh/config/.zshrc
index b05126b..feb4bc5 100644
--- a/zsh/zsh/.zshrc
+++ b/zsh/config/.zshrc
@@ -11,9 +11,6 @@
 
 _source_if() { test -r "$1" && source "$1" || return 0 }
 
-# Load Useful Functions
-_source_if "$ZDOTDIR/zsh-functions"
-
 #------------------------------ exports ------------------------------
 export ZDOTDIR="$HOME/.config/zsh"
 export SHELL="$(which zsh)"
@@ -129,6 +126,10 @@ setopt aliases
 # Enable vi mode
 bindkey -v
 
+# Load Useful Functions
+_source_if "${ZDOTDIR}/zsh-functions"
+
+
 # Plugins
 zsh_add_plugin "zsh-users/zsh-autosuggestions"
 zsh_add_plugin "zsh-users/zsh-syntax-highlighting"
diff --git a/zsh/zsh/zsh-aliases b/zsh/config/zsh-aliases
similarity index 100%
rename from zsh/zsh/zsh-aliases
rename to zsh/config/zsh-aliases
diff --git a/zsh/zsh/zsh-functions b/zsh/config/zsh-functions
similarity index 99%
rename from zsh/zsh/zsh-functions
rename to zsh/config/zsh-functions
index 6863e49..0470576 100644
--- a/zsh/zsh/zsh-functions
+++ b/zsh/config/zsh-functions
@@ -1,3 +1,4 @@
+#!/bin/zsh
 # Function to source files if they exist
 function zsh_add_file() {
     [ -f "$ZDOTDIR/$1" ] && source "$ZDOTDIR/$1"
diff --git a/zsh/setup b/zsh/setup
index f2c62f4..7aec1c4 100755
--- a/zsh/setup
+++ b/zsh/setup
@@ -1,6 +1,21 @@
 #!/bin/sh
 
-mkdir "${HOME}/.config" >/dev/null 2>&1
+config="${HOME}/.config"
+local_rc="${PWD}/config/.zshrc"
+local_env="${PWD}/config/.zshenv"
+local_funcs="${PWD}/config/zsh-functions"
 
-ln -sfv "${PWD}/.zshenv" "${HOME}"
-ln -sfv "${PWD}/zsh" "${HOME}/.config/zsh"
+_make_dirs() {
+ mkdir "${config}"
+ mkdir "${config}/zsh"
+}
+
+_make_links() {
+  ln -sfv "${local_env}" "${HOME}"
+  ln -sfv "${local_rc}" "${config}/zsh"
+  ln -sfv "${local_funcs}" "${config}/zsh"
+}
+
+# -------------- main -------------------
+_make_dirs
+_make_links
diff --git a/zsh/zsh/zsh b/zsh/zsh/zsh
deleted file mode 120000
index dc1a025..0000000
--- a/zsh/zsh/zsh
+++ /dev/null
@@ -1 +0,0 @@
-/Users/michael/.dotfiles/zsh/zsh
\ No newline at end of file