diff --git a/shell/.Xresources b/home/.Xresources
similarity index 100%
rename from shell/.Xresources
rename to home/.Xresources
diff --git a/shell/.aliases b/home/.aliases
similarity index 100%
rename from shell/.aliases
rename to home/.aliases
diff --git a/shell/.bashrc b/home/.bashrc
similarity index 100%
rename from shell/.bashrc
rename to home/.bashrc
diff --git a/.config/.rofi/config.rasi b/home/.config/.rofi/config.rasi
similarity index 100%
rename from .config/.rofi/config.rasi
rename to home/.config/.rofi/config.rasi
diff --git a/.config/.rofi/themes/iceberg-dark.rasi b/home/.config/.rofi/themes/iceberg-dark.rasi
similarity index 100%
rename from .config/.rofi/themes/iceberg-dark.rasi
rename to home/.config/.rofi/themes/iceberg-dark.rasi
diff --git a/.config/compton/compton.conf b/home/.config/compton/compton.conf
similarity index 100%
rename from .config/compton/compton.conf
rename to home/.config/compton/compton.conf
diff --git a/.config/dunst/dunstrc b/home/.config/dunst/dunstrc
similarity index 100%
rename from .config/dunst/dunstrc
rename to home/.config/dunst/dunstrc
diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/home/.config/gtk-2.0/gtkfilechooser.ini
similarity index 100%
rename from .config/gtk-2.0/gtkfilechooser.ini
rename to home/.config/gtk-2.0/gtkfilechooser.ini
diff --git a/.config/gtk-3.0/bookmarks b/home/.config/gtk-3.0/bookmarks
similarity index 100%
rename from .config/gtk-3.0/bookmarks
rename to home/.config/gtk-3.0/bookmarks
diff --git a/.config/gtk-3.0/gtk.css b/home/.config/gtk-3.0/gtk.css
similarity index 100%
rename from .config/gtk-3.0/gtk.css
rename to home/.config/gtk-3.0/gtk.css
diff --git a/.config/gtk-3.0/settings.ini b/home/.config/gtk-3.0/settings.ini
similarity index 100%
rename from .config/gtk-3.0/settings.ini
rename to home/.config/gtk-3.0/settings.ini
diff --git a/.config/htop/htoprc b/home/.config/htop/htoprc
similarity index 100%
rename from .config/htop/htoprc
rename to home/.config/htop/htoprc
diff --git a/.config/i3/conf.d/autostart.conf b/home/.config/i3/conf.d/autostart.conf
similarity index 100%
rename from .config/i3/conf.d/autostart.conf
rename to home/.config/i3/conf.d/autostart.conf
diff --git a/.config/i3/conf.d/base.conf b/home/.config/i3/conf.d/base.conf
similarity index 100%
rename from .config/i3/conf.d/base.conf
rename to home/.config/i3/conf.d/base.conf
diff --git a/.config/i3/conf.d/gaps.conf b/home/.config/i3/conf.d/gaps.conf
similarity index 100%
rename from .config/i3/conf.d/gaps.conf
rename to home/.config/i3/conf.d/gaps.conf
diff --git a/.config/i3/conf.d/i3bar.conf b/home/.config/i3/conf.d/i3bar.conf
similarity index 100%
rename from .config/i3/conf.d/i3bar.conf
rename to home/.config/i3/conf.d/i3bar.conf
diff --git a/.config/i3/conf.d/keybinds.conf b/home/.config/i3/conf.d/keybinds.conf
similarity index 100%
rename from .config/i3/conf.d/keybinds.conf
rename to home/.config/i3/conf.d/keybinds.conf
diff --git a/.config/i3/conf.d/layout-keybinds.conf b/home/.config/i3/conf.d/layout-keybinds.conf
similarity index 100%
rename from .config/i3/conf.d/layout-keybinds.conf
rename to home/.config/i3/conf.d/layout-keybinds.conf
diff --git a/.config/i3/conf.d/window-classes.conf b/home/.config/i3/conf.d/window-classes.conf
similarity index 100%
rename from .config/i3/conf.d/window-classes.conf
rename to home/.config/i3/conf.d/window-classes.conf
diff --git a/.config/i3/conf.d/workspace.conf b/home/.config/i3/conf.d/workspace.conf
similarity index 100%
rename from .config/i3/conf.d/workspace.conf
rename to home/.config/i3/conf.d/workspace.conf
diff --git a/.config/i3/config b/home/.config/i3/config
similarity index 100%
rename from .config/i3/config
rename to home/.config/i3/config
diff --git a/.config/i3/i3-dstatus.conf b/home/.config/i3/i3-dstatus.conf
similarity index 100%
rename from .config/i3/i3-dstatus.conf
rename to home/.config/i3/i3-dstatus.conf
diff --git a/.config/i3/i3blocks.conf b/home/.config/i3/i3blocks.conf
similarity index 100%
rename from .config/i3/i3blocks.conf
rename to home/.config/i3/i3blocks.conf
diff --git a/.config/mimeapps.list b/home/.config/mimeapps.list
similarity index 100%
rename from .config/mimeapps.list
rename to home/.config/mimeapps.list
diff --git a/.config/morc_menu/morc_menu_v1.conf b/home/.config/morc_menu/morc_menu_v1.conf
similarity index 100%
rename from .config/morc_menu/morc_menu_v1.conf
rename to home/.config/morc_menu/morc_menu_v1.conf
diff --git a/.config/nitrogen/bg-saved.cfg b/home/.config/nitrogen/bg-saved.cfg
similarity index 100%
rename from .config/nitrogen/bg-saved.cfg
rename to home/.config/nitrogen/bg-saved.cfg
diff --git a/.config/nitrogen/nitrogen.cfg b/home/.config/nitrogen/nitrogen.cfg
similarity index 100%
rename from .config/nitrogen/nitrogen.cfg
rename to home/.config/nitrogen/nitrogen.cfg
diff --git a/.config/ranger/commands.py b/home/.config/ranger/commands.py
similarity index 100%
rename from .config/ranger/commands.py
rename to home/.config/ranger/commands.py
diff --git a/.config/ranger/devicons.py b/home/.config/ranger/devicons.py
similarity index 100%
rename from .config/ranger/devicons.py
rename to home/.config/ranger/devicons.py
diff --git a/.config/ranger/plugins/devicons_linemode.py b/home/.config/ranger/plugins/devicons_linemode.py
similarity index 100%
rename from .config/ranger/plugins/devicons_linemode.py
rename to home/.config/ranger/plugins/devicons_linemode.py
diff --git a/.config/ranger/rc.conf b/home/.config/ranger/rc.conf
similarity index 100%
rename from .config/ranger/rc.conf
rename to home/.config/ranger/rc.conf
diff --git a/.config/ranger/scope.sh b/home/.config/ranger/scope.sh
similarity index 100%
rename from .config/ranger/scope.sh
rename to home/.config/ranger/scope.sh
diff --git a/.config/terminator/config b/home/.config/terminator/config
similarity index 100%
rename from .config/terminator/config
rename to home/.config/terminator/config
diff --git a/.config/viewnior/viewnior.conf b/home/.config/viewnior/viewnior.conf
similarity index 100%
rename from .config/viewnior/viewnior.conf
rename to home/.config/viewnior/viewnior.conf
diff --git a/.config/volumeicon/volumeicon b/home/.config/volumeicon/volumeicon
similarity index 100%
rename from .config/volumeicon/volumeicon
rename to home/.config/volumeicon/volumeicon
diff --git a/shell/.dmenurc b/home/.dmenurc
similarity index 100%
rename from shell/.dmenurc
rename to home/.dmenurc
diff --git a/shell/.dmrc b/home/.dmrc
similarity index 100%
rename from shell/.dmrc
rename to home/.dmrc
diff --git a/shell/.environment b/home/.environment
similarity index 100%
rename from shell/.environment
rename to home/.environment
diff --git a/shell/.functions b/home/.functions
similarity index 100%
rename from shell/.functions
rename to home/.functions
diff --git a/shell/.gitconfig b/home/.gitconfig
similarity index 100%
rename from shell/.gitconfig
rename to home/.gitconfig
diff --git a/shell/.stalonetrayrc b/home/.stalonetrayrc
similarity index 100%
rename from shell/.stalonetrayrc
rename to home/.stalonetrayrc
diff --git a/shell/.tmux.conf b/home/.tmux.conf
similarity index 100%
rename from shell/.tmux.conf
rename to home/.tmux.conf
diff --git a/shell/.vimrc b/home/.vimrc
similarity index 100%
rename from shell/.vimrc
rename to home/.vimrc
diff --git a/shell/.zshrc b/home/.zshrc
similarity index 100%
rename from shell/.zshrc
rename to home/.zshrc
diff --git a/bin/build-i3-config b/home/bin/build-i3-config
similarity index 100%
rename from bin/build-i3-config
rename to home/bin/build-i3-config
diff --git a/bin/cert_expiry b/home/bin/cert_expiry
similarity index 100%
rename from bin/cert_expiry
rename to home/bin/cert_expiry
diff --git a/bin/git-freeze b/home/bin/git-freeze
similarity index 100%
rename from bin/git-freeze
rename to home/bin/git-freeze
diff --git a/bin/i3blocks/bandwidth b/home/bin/i3blocks/bandwidth
similarity index 100%
rename from bin/i3blocks/bandwidth
rename to home/bin/i3blocks/bandwidth
diff --git a/bin/i3blocks/clock b/home/bin/i3blocks/clock
similarity index 100%
rename from bin/i3blocks/clock
rename to home/bin/i3blocks/clock
diff --git a/bin/i3blocks/cpu b/home/bin/i3blocks/cpu
similarity index 100%
rename from bin/i3blocks/cpu
rename to home/bin/i3blocks/cpu
diff --git a/bin/i3blocks/cpu_usage b/home/bin/i3blocks/cpu_usage
similarity index 100%
rename from bin/i3blocks/cpu_usage
rename to home/bin/i3blocks/cpu_usage
diff --git a/bin/i3blocks/disk b/home/bin/i3blocks/disk
similarity index 100%
rename from bin/i3blocks/disk
rename to home/bin/i3blocks/disk
diff --git a/bin/i3blocks/gpu-load b/home/bin/i3blocks/gpu-load
similarity index 100%
rename from bin/i3blocks/gpu-load
rename to home/bin/i3blocks/gpu-load
diff --git a/bin/i3blocks/internet b/home/bin/i3blocks/internet
similarity index 100%
rename from bin/i3blocks/internet
rename to home/bin/i3blocks/internet
diff --git a/bin/i3blocks/load_average b/home/bin/i3blocks/load_average
similarity index 100%
rename from bin/i3blocks/load_average
rename to home/bin/i3blocks/load_average
diff --git a/bin/i3blocks/memory b/home/bin/i3blocks/memory
similarity index 100%
rename from bin/i3blocks/memory
rename to home/bin/i3blocks/memory
diff --git a/bin/i3blocks/scratchpad b/home/bin/i3blocks/scratchpad
similarity index 100%
rename from bin/i3blocks/scratchpad
rename to home/bin/i3blocks/scratchpad
diff --git a/bin/i3blocks/spotify b/home/bin/i3blocks/spotify
similarity index 100%
rename from bin/i3blocks/spotify
rename to home/bin/i3blocks/spotify
diff --git a/bin/i3blocks/window b/home/bin/i3blocks/window
similarity index 100%
rename from bin/i3blocks/window
rename to home/bin/i3blocks/window
diff --git a/bin/music_player b/home/bin/music_player
similarity index 100%
rename from bin/music_player
rename to home/bin/music_player
diff --git a/bin/screenshotter.sh b/home/bin/screenshotter.sh
similarity index 100%
rename from bin/screenshotter.sh
rename to home/bin/screenshotter.sh
diff --git a/bin/wallpaper.sh b/home/bin/wallpaper.sh
similarity index 100%
rename from bin/wallpaper.sh
rename to home/bin/wallpaper.sh
diff --git a/install.sh b/install.sh
index ad8c943..65e5f9f 100755
--- a/install.sh
+++ b/install.sh
@@ -15,6 +15,8 @@ fi
 GIT_REPO="git://github.com/alopexc0de/dotfiles.git"
 
 DOTFILES=${HOME}/dotfiles
+DF_HOME=${DOTFILES}/home
+DF_CONFIG=${DF_HOME}/.config
 POSTINSTALL_SCRIPT=${HOME}/.dotfiles.postinst
 
 if [ ! -e "${POSTINSTALL_SCRIPT}" ]; then
@@ -50,8 +52,8 @@ read -p "Press enter to install dotfiles " WAIT_FOR_INPUT
 
 # If the update script exists, try to do a normal update
 if [ -x "${DOTFILES}/check_for_upgrade.sh" ]; then
-    source "${DOTFILES}/shell/.environment"
-    env DOTFILES="${DOTFILES}" DISABLE_UPDATE_PROMPT=false zsh -f "${DOTFILES}/check_for_upgrade.sh"
+    source "${DF_HOME}/.environment"
+    env _DOTFILES="${DOTFILES}" DISABLE_UPDATE_PROMPT=false zsh -f "${DOTFILES}/check_for_upgrade.sh"
 else
     echo "Cloning to ${DOTFILES}"
     rm -rf "${DOTFILES}"
@@ -59,42 +61,42 @@ else
 fi
 
 echo "Installing user binary directory to ~/bin"
-symlink "${DOTFILES}/bin" "${HOME}/bin"
+symlink "${DF_HOME}/bin" "${HOME}/bin"
 
 echo "Linking Configuration files..."
 
 # All the dotfiles that live in the home dir directly
-symlink "${DOTFILES}/shell/.aliases"          "${HOME}/.aliases"
-symlink "${DOTFILES}/shell/.bashrc"           "${HOME}/.bashrc"
-symlink "${DOTFILES}/shell/.dmenurc"          "${HOME}/.dmenurc"
-symlink "${DOTFILES}/shell/.dmrc"             "${HOME}/.dmrc"
-symlink "${DOTFILES}/shell/.editorconfig"     "${HOME}/.editorconfig"
-symlink "${DOTFILES}/shell/.environment"      "${HOME}/.environment"
-symlink "${DOTFILES}/shell/.functions"        "${HOME}/.functions"
-symlink "${DOTFILES}/shell/.gitconfig"        "${HOME}/.gitconfig"
-symlink "${DOTFILES}/shell/.stalonetrayrc"    "${HOME}/.stalonetrayrc"
-symlink "${DOTFILES}/shell/.tmux.conf"        "${HOME}/.tmux.conf"
-symlink "${DOTFILES}/shell/.vimrc"            "${HOME}/.vimrc"
-symlink "${DOTFILES}/shell/.zshrc"            "${HOME}/.zshrc"
+symlink "${DOTFILES}/.editorconfig"     "${HOME}/.editorconfig"
+symlink "${DF_HOME}/.aliases"           "${HOME}/.aliases"
+symlink "${DF_HOME}/.bashrc"            "${HOME}/.bashrc"
+symlink "${DF_HOME}/.dmenurc"           "${HOME}/.dmenurc"
+symlink "${DF_HOME}/.dmrc"              "${HOME}/.dmrc"
+symlink "${DF_HOME}/.environment"       "${HOME}/.environment"
+symlink "${DF_HOME}/.functions"         "${HOME}/.functions"
+symlink "${DF_HOME}/.gitconfig"         "${HOME}/.gitconfig"
+symlink "${DF_HOME}/.stalonetrayrc"     "${HOME}/.stalonetrayrc"
+symlink "${DF_HOME}/.tmux.conf"         "${HOME}/.tmux.conf"
+symlink "${DF_HOME}/.vimrc"             "${HOME}/.vimrc"
+symlink "${DF_HOME}/.zshrc"             "${HOME}/.zshrc"
 
 # Install ~/.config stuff
-symlink "${DOTFILES}/.config/.rofi"           "${HOME}/.config/.rofi"
-symlink "${DOTFILES}/.config/compton"         "${HOME}/.config/compton"
-symlink "${DOTFILES}/.config/dunst"           "${HOME}/.config/dunst"
-symlink "${DOTFILES}/.config/gtk-2.0"         "${HOME}/.config/gtk-2.0"
-symlink "${DOTFILES}/.config/gtk-3.0"         "${HOME}/.config/gtk-3.0"
-symlink "${DOTFILES}/.config/htop"            "${HOME}/.config/htop"
-symlink "${DOTFILES}/.config/i3"              "${HOME}/.config/i3"
-symlink "${DOTFILES}/.config/morc_menu"       "${HOME}/.config/morc_menu"
-symlink "${DOTFILES}/.config/nitrogen"        "${HOME}/.config/nitrogen"
-symlink "${DOTFILES}/.config/terminator"      "${HOME}/.config/terminator"
-symlink "${DOTFILES}/.config/ranger"          "${HOME}/.config/ranger"
-symlink "${DOTFILES}/.config/viewnior"        "${HOME}/.config/viewnior"
-symlink "${DOTFILES}/.config/volumeicon"      "${HOME}/.config/volumeicon"
-symlink "${DOTFILES}/.config/mimeapps.list"   "${HOME}/.config/mimeapps.list"
+symlink "${DF_CONFIG}/.rofi"            "${HOME}/.config/.rofi"
+symlink "${DF_CONFIG}/compton"          "${HOME}/.config/compton"
+symlink "${DF_CONFIG}/dunst"            "${HOME}/.config/dunst"
+symlink "${DF_CONFIG}/gtk-2.0"          "${HOME}/.config/gtk-2.0"
+symlink "${DF_CONFIG}/gtk-3.0"          "${HOME}/.config/gtk-3.0"
+symlink "${DF_CONFIG}/htop"             "${HOME}/.config/htop"
+symlink "${DF_CONFIG}/i3"               "${HOME}/.config/i3"
+symlink "${DF_CONFIG}/morc_menu"        "${HOME}/.config/morc_menu"
+symlink "${DF_CONFIG}/nitrogen"         "${HOME}/.config/nitrogen"
+symlink "${DF_CONFIG}/terminator"       "${HOME}/.config/terminator"
+symlink "${DF_CONFIG}/ranger"           "${HOME}/.config/ranger"
+symlink "${DF_CONFIG}/viewnior"         "${HOME}/.config/viewnior"
+symlink "${DF_CONFIG}/volumeicon"       "${HOME}/.config/volumeicon"
+symlink "${DF_CONFIG}/mimeapps.list"    "${HOME}/.config/mimeapps.list"
 
 echo "Building i3 configuration..."
-"${DOTFILES}/bin/build-i3-config"
+"${DF_HOME}/bin/build-i3-config"
 
 echo "Changing default shell to ZSH..."
 chsh -s /usr/bin/zsh