diff --git a/env/sh/bashrc b/env/sh/bashrc
index c3f2e41..38e1f8b 100644
--- a/env/sh/bashrc
+++ b/env/sh/bashrc
@@ -133,7 +133,7 @@ if [ -t 0 ]; then
 		if [[ -n $1 ]]; then
 			addon="-$1"
 		fi
-		echo "$PWD" > "$DOTFILES_PATH/cwd$addon.tmp"
+		echo "$PWD" > "$DOTFILES_PATH/env/sh/cwd$addon.tmp"
 	}
 	export -f scwd
 	bind '"\C-s"':"\"scwd\C-m\""
diff --git a/chat/irc/link.bash b/misc/irc/link.bash
similarity index 100%
rename from chat/irc/link.bash
rename to misc/irc/link.bash
diff --git a/chat/irc/weechat.conf b/misc/irc/weechat.conf
similarity index 100%
rename from chat/irc/weechat.conf
rename to misc/irc/weechat.conf
diff --git a/os/arch_linux_init/bar.bash b/os/arch_linux/bar.bash
similarity index 100%
rename from os/arch_linux_init/bar.bash
rename to os/arch_linux/bar.bash
diff --git a/os/arch_linux_init/fonts.bash b/os/arch_linux/fonts.bash
similarity index 100%
rename from os/arch_linux_init/fonts.bash
rename to os/arch_linux/fonts.bash
diff --git a/os/arch_linux_init/git.bash b/os/arch_linux/git.bash
similarity index 100%
rename from os/arch_linux_init/git.bash
rename to os/arch_linux/git.bash
diff --git a/os/arch_linux_init/gmusic.bash b/os/arch_linux/gmusic.bash
similarity index 100%
rename from os/arch_linux_init/gmusic.bash
rename to os/arch_linux/gmusic.bash
diff --git a/os/arch_linux_init/neovim.bash b/os/arch_linux/neovim.bash
similarity index 100%
rename from os/arch_linux_init/neovim.bash
rename to os/arch_linux/neovim.bash
diff --git a/os/arch_linux_init/pacaur.bash b/os/arch_linux/pacaur.bash
similarity index 100%
rename from os/arch_linux_init/pacaur.bash
rename to os/arch_linux/pacaur.bash
diff --git a/os/arch_linux_init/shell.bash b/os/arch_linux/shell.bash
similarity index 100%
rename from os/arch_linux_init/shell.bash
rename to os/arch_linux/shell.bash
diff --git a/os/arch_linux_init/urxvt.bash b/os/arch_linux/urxvt.bash
similarity index 100%
rename from os/arch_linux_init/urxvt.bash
rename to os/arch_linux/urxvt.bash
diff --git a/os/arch_linux_init/utils.bash b/os/arch_linux/utils.bash
similarity index 100%
rename from os/arch_linux_init/utils.bash
rename to os/arch_linux/utils.bash
diff --git a/os/arch_linux_init/wm.bash b/os/arch_linux/wm.bash
similarity index 100%
rename from os/arch_linux_init/wm.bash
rename to os/arch_linux/wm.bash
diff --git a/os/arch_linux_init/xorg.bash b/os/arch_linux/xorg.bash
similarity index 100%
rename from os/arch_linux_init/xorg.bash
rename to os/arch_linux/xorg.bash
diff --git a/variables.bash b/variables.bash
index 3a3a9fd..bf8a2d5 100755
--- a/variables.bash
+++ b/variables.bash
@@ -7,14 +7,15 @@ export DOTFILES_PATH="$HOME/.dotfiles"
 export REPOSITORY_PATH="$HOME/Documents/open-source"
 export BORDER_WIDTH=1
 export WINDOW_GAP=5
-export BAR_PID_FILE="$DOTFILES_PATH/wm_bar.pid"
+export BAR_PATH="$DOTFILES_PATH/env/wm/extras/bar"
+export BAR_PID_FILE="$BAR_PATH/wm_bar.pid"
 
 source "$DOTFILES_PATH/scripts/get_x_fonts.sh"
 source "$DOTFILES_PATH/scripts/get_color.sh"
 
 export BAR_ON_XINIT=0
-export BAR_FIFO="$DOTFILES_PATH/wm_bar_fifo.lock"
-export BAR_LOG="$DOTFILES_PATH/wm_bar.log"
+export BAR_FIFO="$BAR_PATH/wm_bar_fifo.lock"
+export BAR_LOG="$BAR_PATH/wm_bar.log"
 export BAR_TOP=0
 export BAR_HEIGHT=20
 export BAR_BORDER_WIDTH=1
@@ -39,7 +40,3 @@ export WINDOW_GAP=$(expr $WINDOW_GAP - $BORDER_WIDTH)
 if [ -a "$HOME/.bashrc_env" ]; then
   . "$HOME/.bashrc_env"
 fi
-
-# various paths that are used in the dotfiles
-BAR_PATH="$DOTFILES_PATH/env/wm/extras/bar"
-