diff --git a/bashrc b/bashrc
new file mode 100644
index 0000000..2627c25
--- /dev/null
+++ b/bashrc
@@ -0,0 +1,6 @@
+WORKSPACE=$(dirname "$0")
+
+for rc_file in $WORKSPACE/rc/*.rc; do
+  echo "source $rc_file"
+done
+
diff --git a/rc/aliases.rc b/rc/aliases.rc
new file mode 100644
index 0000000..e69de29
diff --git a/env b/rc/env.rc
similarity index 100%
rename from env
rename to rc/env.rc
diff --git a/rc/git-prompt.rc b/rc/git-prompt.rc
new file mode 100755
index 0000000..950d05a
--- /dev/null
+++ b/rc/git-prompt.rc
@@ -0,0 +1,4 @@
+if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
+  GIT_PROMPT_ONLY_IN_REPO=1
+  source $HOME/.bash-git-prompt/gitprompt.sh
+fi