diff --git a/bash_it.sh b/bash_it.sh
index b52ff97f..68f3884d 100644
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -17,8 +17,14 @@ do
   source $config_file
 done
 
+# TODO: reduce the repetition here by combining these three into a loop
 # Tab Completion
-COMPLETION="${BASH}/completion/*.bash"
+if [ ! -d "${BASH}/completion/enabled" ]
+then
+  mkdir "${BASH}/completion/enabled"
+  ln -s ${BASH}/completion/available/* "${BASH}/completion/enabled"
+fi
+COMPLETION="${BASH}/completion/enabled/*.bash"
 for config_file in $COMPLETION
 do
   source $config_file
diff --git a/completion/brew.completion.bash b/completion/available/brew.completion.bash
similarity index 100%
rename from completion/brew.completion.bash
rename to completion/available/brew.completion.bash
diff --git a/completion/git.completion.bash b/completion/available/git.completion.bash
similarity index 100%
rename from completion/git.completion.bash
rename to completion/available/git.completion.bash
diff --git a/completion/git_flow.completion.bash b/completion/available/git_flow.completion.bash
similarity index 100%
rename from completion/git_flow.completion.bash
rename to completion/available/git_flow.completion.bash
diff --git a/completion/rake.completion.bash b/completion/available/rake.completion.bash
similarity index 100%
rename from completion/rake.completion.bash
rename to completion/available/rake.completion.bash
diff --git a/completion/ssh.completion.bash b/completion/available/ssh.completion.bash
similarity index 100%
rename from completion/ssh.completion.bash
rename to completion/available/ssh.completion.bash
diff --git a/completion/todo.completion.bash b/completion/available/todo.completion.bash
similarity index 100%
rename from completion/todo.completion.bash
rename to completion/available/todo.completion.bash