diff --git a/config/.bash_profile b/config/.bash_profile.vahagn
similarity index 100%
rename from config/.bash_profile
rename to config/.bash_profile.vahagn
diff --git a/config/.bashrc b/config/.bashrc.vahagn
similarity index 82%
rename from config/.bashrc
rename to config/.bashrc.vahagn
index f2fc459..d7ab27a 100755
--- a/config/.bashrc
+++ b/config/.bashrc.vahagn
@@ -80,22 +80,22 @@ export LESS=-R
 
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 # Set command prompt
-[ -x ${MYCFG}/.profile.prompt ] && source ${MYCFG}/.profile.prompt
-[ -x ${MYCFG}/.profile.dircolor ] && source ${MYCFG}/.profile.dircolor
-[ -x ${MYCFG}/.profile.completion ] && source ${MYCFG}/.profile.completion
-[ -x ${MYCFG}/.profile.dev ] && source ${MYCFG}/.profile.dev
-[ -x ${MYCFG}/.profile.aliases ] && source ${MYCFG}/.profile.aliases
+[ -x ${HOME}/.profile.prompt ] && source ${HOME}/.profile.prompt
+[ -x ${HOME}/.profile.dircolor ] && source ${HOME}/.profile.dircolor
+[ -x ${HOME}/.profile.completion ] && source ${HOME}/.profile.completion
+[ -x ${HOME}/.profile.dev ] && source ${HOME}/.profile.dev
+[ -x ${HOME}/.profile.aliases ] && source ${HOME}/.profile.aliases
 
 # Haskell
-if [ -e $HOME/.ghcup/bin ]; then
-    export PATH=$HOME/.ghcup/bin:$PATH
+if [ -f $HOME/.ghcup/env ]; then
+    export PATH=$HOME/.ghcup/env:$PATH
 fi
 
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #
 #   Run local settings.
 #
-[ -x $HOME/.bashrc.local ] && . $HOME/.bashrc.local
+[ -x ${HOME}/.bashrc.local ] && . ${HOME}/.bashrc.local
 
 #
 #   Clean error level.
diff --git a/vim/vimrc b/config/.vimrc
similarity index 100%
rename from vim/vimrc
rename to config/.vimrc