diff --git a/zsh/zshenv b/zsh/zshenv
index ea824eb..40eb051 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -68,15 +68,16 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=7"
 # This will load the specified zsh files if they exist in the $ZDIR/environment directory.
 # It will load based on hostname & uname.
 env_loader(){
-  [ -e ${ZDIR}/environment/$OSTYPE/$1 ] && source ${ZDIR}/environment/$OSTYPE/$1
-  [ -e ${ZDIR}/environment/$HOST/$1 ] && source ${ZDIR}/environment/$HOST/$1
+  [ -e ${ZDIR}/environment/os/$OSTYPE/$1 ] && source ${ZDIR}/environment/os/$OSTYPE/$1
+  [ -e ${ZDIR}/environment/host/$HOST/$1 ] && source ${ZDIR}/environment/host/$HOST/$1
 }
 
-user_script_dir="~/.scripts"
+user_script_dir=~/.scripts
 if [ -d $user_script_dir ] ; then
   PATH="$user_script_dir:$PATH"
 fi
 
+
 env_loader zshenv
 
 # Dedup path.