diff --git a/shell/+bash/.bash_profile b/shell/+bash/.bash_profile
index 4c965e86..078f7eb9 100644
--- a/shell/+bash/.bash_profile
+++ b/shell/+bash/.bash_profile
@@ -1,3 +1,7 @@
+#
+# ~/.bash_profile
+#
+
 # set 256 color profile where possible
 if [[ $COLORTERM == gnome-* && $TERM == xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
     export TERM=gnome-256color
@@ -8,7 +12,7 @@ fi
 
 ## Bash rcfiles ###########################
 
-source $HOME/.dotfiles/common.sh
+source $HOME/.dotfiles/shell/common.sh
 
 PATH="$DOTFILES/bin:/usr/local/{bin,sbin}:$PATH"
 for bin in "$ENABLED_DIR"/*/bin; do
@@ -19,13 +23,14 @@ export PATH
 
 ## Bash rcfiles ###########################
 
-source ~/.bash/config
+load shell/+bash/config.bash
 
 cache rbenv init - --no-rehash
 cache pyenv init - --no-rehash
 if is-interactive; then
     cache fasd --init posix-alias bash-hook bash-ccomp bash-ccomp-install
     cache tmuxifier init -
-    source ~/.bash/prompt
+    load shell/+bash/prompt.bash
 fi
 
+# Done!
diff --git a/shell/+bash/.bashrc b/shell/+bash/.bashrc
index 12570026..fffbc5f2 100644
--- a/shell/+bash/.bashrc
+++ b/shell/+bash/.bashrc
@@ -1 +1,6 @@
-[ -n "$PS1" ] && source ~/.bash_profile;
+#
+# ~/.bashrc
+#
+
+# If not running interactively, don't do anything
+[[ $- != *i* ]] || source ~/.bash_profile;