diff --git a/.aliases b/.dotfiles/tag-dev-setup/aliases
similarity index 100%
rename from .aliases
rename to .dotfiles/tag-dev-setup/aliases
diff --git a/.aws/config b/.dotfiles/tag-dev-setup/aws/config
similarity index 100%
rename from .aws/config
rename to .dotfiles/tag-dev-setup/aws/config
diff --git a/.aws/credentials b/.dotfiles/tag-dev-setup/aws/credentials
similarity index 100%
rename from .aws/credentials
rename to .dotfiles/tag-dev-setup/aws/credentials
diff --git a/.bash_profile b/.dotfiles/tag-dev-setup/bash_profile
similarity index 100%
rename from .bash_profile
rename to .dotfiles/tag-dev-setup/bash_profile
diff --git a/.bash_prompt b/.dotfiles/tag-dev-setup/bash_prompt
similarity index 100%
rename from .bash_prompt
rename to .dotfiles/tag-dev-setup/bash_prompt
diff --git a/.bashrc b/.dotfiles/tag-dev-setup/bashrc
similarity index 100%
rename from .bashrc
rename to .dotfiles/tag-dev-setup/bashrc
diff --git a/bin/bash b/.dotfiles/tag-dev-setup/bin/bash
similarity index 100%
rename from bin/bash
rename to .dotfiles/tag-dev-setup/bin/bash
diff --git a/bin/httpcompression b/.dotfiles/tag-dev-setup/bin/httpcompression
similarity index 100%
rename from bin/httpcompression
rename to .dotfiles/tag-dev-setup/bin/httpcompression
diff --git a/bin/subl b/.dotfiles/tag-dev-setup/bin/subl
similarity index 100%
rename from bin/subl
rename to .dotfiles/tag-dev-setup/bin/subl
diff --git a/.curlrc b/.dotfiles/tag-dev-setup/curlrc
similarity index 100%
rename from .curlrc
rename to .dotfiles/tag-dev-setup/curlrc
diff --git a/init/Preferences.sublime-settings b/.dotfiles/tag-dev-setup/dev-setup/themes/Preferences.sublime-settings
similarity index 100%
rename from init/Preferences.sublime-settings
rename to .dotfiles/tag-dev-setup/dev-setup/themes/Preferences.sublime-settings
diff --git a/init/Solarized Dark xterm-256color.terminal b/.dotfiles/tag-dev-setup/dev-setup/themes/Solarized Dark xterm-256color.terminal
similarity index 100%
rename from init/Solarized Dark xterm-256color.terminal
rename to .dotfiles/tag-dev-setup/dev-setup/themes/Solarized Dark xterm-256color.terminal
diff --git a/init/Solarized Dark.itermcolors b/.dotfiles/tag-dev-setup/dev-setup/themes/Solarized Dark.itermcolors
similarity index 100%
rename from init/Solarized Dark.itermcolors
rename to .dotfiles/tag-dev-setup/dev-setup/themes/Solarized Dark.itermcolors
diff --git a/.editorconfig b/.dotfiles/tag-dev-setup/editorconfig
similarity index 100%
rename from .editorconfig
rename to .dotfiles/tag-dev-setup/editorconfig
diff --git a/.exports b/.dotfiles/tag-dev-setup/exports
similarity index 100%
rename from .exports
rename to .dotfiles/tag-dev-setup/exports
diff --git a/.functions b/.dotfiles/tag-dev-setup/functions
similarity index 100%
rename from .functions
rename to .dotfiles/tag-dev-setup/functions
diff --git a/.gdbinit b/.dotfiles/tag-dev-setup/gdbinit
similarity index 100%
rename from .gdbinit
rename to .dotfiles/tag-dev-setup/gdbinit
diff --git a/.gitattributes b/.dotfiles/tag-dev-setup/gitattributes
similarity index 100%
rename from .gitattributes
rename to .dotfiles/tag-dev-setup/gitattributes
diff --git a/.gitconfig b/.dotfiles/tag-dev-setup/gitconfig
similarity index 100%
rename from .gitconfig
rename to .dotfiles/tag-dev-setup/gitconfig
diff --git a/.gitignore b/.dotfiles/tag-dev-setup/gitignore
similarity index 100%
rename from .gitignore
rename to .dotfiles/tag-dev-setup/gitignore
diff --git a/.gvimrc b/.dotfiles/tag-dev-setup/gvimrc
similarity index 100%
rename from .gvimrc
rename to .dotfiles/tag-dev-setup/gvimrc
diff --git a/.hgignore b/.dotfiles/tag-dev-setup/hgignore
similarity index 100%
rename from .hgignore
rename to .dotfiles/tag-dev-setup/hgignore
diff --git a/.hushlogin b/.dotfiles/tag-dev-setup/hushlogin
similarity index 100%
rename from .hushlogin
rename to .dotfiles/tag-dev-setup/hushlogin
diff --git a/.inputrc b/.dotfiles/tag-dev-setup/inputrc
similarity index 100%
rename from .inputrc
rename to .dotfiles/tag-dev-setup/inputrc
diff --git a/init/profile_default/startup/README b/.dotfiles/tag-dev-setup/ipython/profile_default/startup/README
similarity index 100%
rename from init/profile_default/startup/README
rename to .dotfiles/tag-dev-setup/ipython/profile_default/startup/README
diff --git a/init/profile_default/static/custom/custom.css b/.dotfiles/tag-dev-setup/ipython/profile_default/static/custom/custom.css
similarity index 100%
rename from init/profile_default/static/custom/custom.css
rename to .dotfiles/tag-dev-setup/ipython/profile_default/static/custom/custom.css
diff --git a/init/profile_default/static/custom/custom.js b/.dotfiles/tag-dev-setup/ipython/profile_default/static/custom/custom.js
similarity index 100%
rename from init/profile_default/static/custom/custom.js
rename to .dotfiles/tag-dev-setup/ipython/profile_default/static/custom/custom.js
diff --git a/init/profile_pyspark/history.sqlite b/.dotfiles/tag-dev-setup/ipython/profile_pyspark/history.sqlite
similarity index 100%
rename from init/profile_pyspark/history.sqlite
rename to .dotfiles/tag-dev-setup/ipython/profile_pyspark/history.sqlite
diff --git a/init/profile_pyspark/ipython_config.py b/.dotfiles/tag-dev-setup/ipython/profile_pyspark/ipython_config.py
similarity index 100%
rename from init/profile_pyspark/ipython_config.py
rename to .dotfiles/tag-dev-setup/ipython/profile_pyspark/ipython_config.py
diff --git a/init/profile_pyspark/ipython_nbconvert_config.py b/.dotfiles/tag-dev-setup/ipython/profile_pyspark/ipython_nbconvert_config.py
similarity index 100%
rename from init/profile_pyspark/ipython_nbconvert_config.py
rename to .dotfiles/tag-dev-setup/ipython/profile_pyspark/ipython_nbconvert_config.py
diff --git a/init/profile_pyspark/ipython_notebook_config.py b/.dotfiles/tag-dev-setup/ipython/profile_pyspark/ipython_notebook_config.py
similarity index 100%
rename from init/profile_pyspark/ipython_notebook_config.py
rename to .dotfiles/tag-dev-setup/ipython/profile_pyspark/ipython_notebook_config.py
diff --git a/init/profile_pyspark/ipython_qtconsole_config.py b/.dotfiles/tag-dev-setup/ipython/profile_pyspark/ipython_qtconsole_config.py
similarity index 100%
rename from init/profile_pyspark/ipython_qtconsole_config.py
rename to .dotfiles/tag-dev-setup/ipython/profile_pyspark/ipython_qtconsole_config.py
diff --git a/init/profile_pyspark/startup/00-pyspark-setup.py b/.dotfiles/tag-dev-setup/ipython/profile_pyspark/startup/00-pyspark-setup.py
similarity index 100%
rename from init/profile_pyspark/startup/00-pyspark-setup.py
rename to .dotfiles/tag-dev-setup/ipython/profile_pyspark/startup/00-pyspark-setup.py
diff --git a/init/profile_pyspark/startup/README b/.dotfiles/tag-dev-setup/ipython/profile_pyspark/startup/README
similarity index 100%
rename from init/profile_pyspark/startup/README
rename to .dotfiles/tag-dev-setup/ipython/profile_pyspark/startup/README
diff --git a/init/profile_pyspark/static/custom/custom.css b/.dotfiles/tag-dev-setup/ipython/profile_pyspark/static/custom/custom.css
similarity index 100%
rename from init/profile_pyspark/static/custom/custom.css
rename to .dotfiles/tag-dev-setup/ipython/profile_pyspark/static/custom/custom.css
diff --git a/init/profile_pyspark/static/custom/custom.js b/.dotfiles/tag-dev-setup/ipython/profile_pyspark/static/custom/custom.js
similarity index 100%
rename from init/profile_pyspark/static/custom/custom.js
rename to .dotfiles/tag-dev-setup/ipython/profile_pyspark/static/custom/custom.js
diff --git a/.mrjob.conf b/.dotfiles/tag-dev-setup/mrjob.conf
similarity index 96%
rename from .mrjob.conf
rename to .dotfiles/tag-dev-setup/mrjob.conf
index ee89d3595..813897b31 100755
--- a/.mrjob.conf
+++ b/.dotfiles/tag-dev-setup/mrjob.conf
@@ -1,17 +1,17 @@
-runners:
-  emr:
-    aws_access_key_id: YOURACCESSKEY
-    aws_secret_access_key: YOURSECRETKEY
-    aws_region: us-east-1
-    ec2_key_pair: YOURKEYPAIR
-    ec2_key_pair_file: ~/.ssh/YOURKEYPAIR.pem
-    ssh_tunnel_to_job_tracker: true
-    ec2_master_instance_type: m1.small
-    ec2_instance_type: m1.small
-    num_ec2_instances: 5
-    s3_scratch_uri: s3://YOURBUCKETSCRATCH
-    s3_log_uri: s3://YOURBUCKETLOG
-    enable_emr_debugging: True
-    bootstrap:
-    - sudo apt-get install -y python-pip
-    - sudo pip install --upgrade simplejson
+runners:
+  emr:
+    aws_access_key_id: YOURACCESSKEY
+    aws_secret_access_key: YOURSECRETKEY
+    aws_region: us-east-1
+    ec2_key_pair: YOURKEYPAIR
+    ec2_key_pair_file: ~/.ssh/YOURKEYPAIR.pem
+    ssh_tunnel_to_job_tracker: true
+    ec2_master_instance_type: m1.small
+    ec2_instance_type: m1.small
+    num_ec2_instances: 5
+    s3_scratch_uri: s3://YOURBUCKETSCRATCH
+    s3_log_uri: s3://YOURBUCKETLOG
+    enable_emr_debugging: True
+    bootstrap:
+    - sudo apt-get install -y python-pip
+    - sudo pip install --upgrade simplejson
diff --git a/.s3cfg b/.dotfiles/tag-dev-setup/s3cfg
similarity index 100%
rename from .s3cfg
rename to .dotfiles/tag-dev-setup/s3cfg
diff --git a/.screenrc b/.dotfiles/tag-dev-setup/screenrc
similarity index 100%
rename from .screenrc
rename to .dotfiles/tag-dev-setup/screenrc
diff --git a/.vim/backups/.gitignore b/.dotfiles/tag-dev-setup/vim/backups/.gitignore
similarity index 100%
rename from .vim/backups/.gitignore
rename to .dotfiles/tag-dev-setup/vim/backups/.gitignore
diff --git a/.vim/colors/solarized.vim b/.dotfiles/tag-dev-setup/vim/colors/solarized.vim
similarity index 100%
rename from .vim/colors/solarized.vim
rename to .dotfiles/tag-dev-setup/vim/colors/solarized.vim
diff --git a/.vim/swaps/.gitignore b/.dotfiles/tag-dev-setup/vim/swaps/.gitignore
similarity index 100%
rename from .vim/swaps/.gitignore
rename to .dotfiles/tag-dev-setup/vim/swaps/.gitignore
diff --git a/.vim/syntax/json.vim b/.dotfiles/tag-dev-setup/vim/syntax/json.vim
similarity index 100%
rename from .vim/syntax/json.vim
rename to .dotfiles/tag-dev-setup/vim/syntax/json.vim
diff --git a/.vim/undo/.gitignore b/.dotfiles/tag-dev-setup/vim/undo/.gitignore
similarity index 100%
rename from .vim/undo/.gitignore
rename to .dotfiles/tag-dev-setup/vim/undo/.gitignore
diff --git a/.vimrc b/.dotfiles/tag-dev-setup/vimrc
similarity index 100%
rename from .vimrc
rename to .dotfiles/tag-dev-setup/vimrc
diff --git a/.wgetrc b/.dotfiles/tag-dev-setup/wgetrc
similarity index 100%
rename from .wgetrc
rename to .dotfiles/tag-dev-setup/wgetrc
diff --git a/.dots b/.dots
index 61103a9cd..3d2b69484 100755
--- a/.dots
+++ b/.dots
@@ -17,6 +17,12 @@ function runDots() {
             echo "------------------------------"
             echo ""
             cd ~ && curl -#L https://github.com/donnemartin/dev-setup/tarball/master | tar -xzv --strip-components 1 --exclude={README.md,LICENSE}
+
+            echo "------------------------------"
+            echo "Installing rcm via homebrew to setup all dotfiles."
+            echo "------------------------------"
+            echo ""
+            ./rcm.sh
         fi
         if [ $ARG == "osxprep" ] || [ $ARG == "all" ]; then
             # Run the osxprep.sh Script
@@ -40,6 +46,7 @@ function runDots() {
             echo ""
             ./brew.sh
         fi
+
         if [ $ARG == "osx" ] || [ $ARG == "all" ]; then
             # Run the osx.sh Script
             # I strongly suggest you read through the commented osx.sh
diff --git a/.rcrc b/.rcrc
new file mode 100644
index 000000000..040f67d05
--- /dev/null
+++ b/.rcrc
@@ -0,0 +1,4 @@
+DOTFILES_DIRS=".dotfiles"
+TAGS="dev-setup"
+SYMLINK_DIRS="dev-setup"
+UNDOTTED="bin"
diff --git a/aws.sh b/aws.sh
index e8b6fefa9..0ffad52be 100755
--- a/aws.sh
+++ b/aws.sh
@@ -91,9 +91,6 @@ brew install apache-spark
 echo "------------------------------"
 echo "Installing IPython Notebook Spark integration"
 
-# Add the pyspark IPython profile
-cp -r init/profile_pyspark/ ~/.ipython/profile_pyspark
-
 BASH_PROFILE_PATH=~/.bash_profile
 echo $BASH_PROFILE_PATH
 echo "" >> $BASH_PROFILE_PATH
@@ -110,4 +107,4 @@ echo "------------------------------"
 echo "TODO: Update .aws/ with your AWS credentials and region, or run aws --configure."
 echo "TODO: Update .mrjob.conf with your credentials, keypair, keypair location, region, and bucket info."
 echo "TODO: Update .s3cfg with your credentials, location, and passphrase or run s3cmd --configure."
-echo "Script completed."
\ No newline at end of file
+echo "Script completed."
diff --git a/bootstrap.sh b/bootstrap.sh
index abe1aeeb2..98f119535 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,8 +5,9 @@ cd "$(dirname "${BASH_SOURCE}")";
 git pull origin master;
 
 function doIt() {
-    rsync --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" \
-        --exclude "README.md" --exclude "LICENSE" -avh --no-perms . ~;
+    ./rcm.sh
+
+
     source ~/.bash_profile;
 }
 
diff --git a/osx.sh b/osx.sh
index 14cdfba54..20ee75e2d 100755
--- a/osx.sh
+++ b/osx.sh
@@ -586,7 +586,7 @@ tell application "Terminal"
     (* Open the custom theme so that it gets added to the list
        of available terminal themes (note: this will open two
        additional terminal windows). *)
-    do shell script "open '$HOME/init/" & themeName & ".terminal'"
+    do shell script "open '$HOME/.dev-setup/themes/" & themeName & ".terminal'"
 
     (* Wait a little bit to ensure that the custom theme is added. *)
     delay 1
@@ -640,7 +640,7 @@ start_if_needed() {
 
 # Install the Solarized Dark theme for iTerm
 start_if_needed iTerm
-open "${HOME}/init/Solarized Dark.itermcolors"
+open "${HOME}/.dev-setup/themes/Solarized Dark.itermcolors"
 
 # Don’t display the annoying prompt when quitting iTerm
 defaults write com.googlecode.iterm2 PromptOnQuit -bool false
@@ -774,7 +774,7 @@ defaults write com.irradiatedsoftware.SizeUp ShowPrefsOnNextStart -bool false
 ###############################################################################
 
 # Install Sublime Text settings
-cp -r init/Preferences.sublime-settings ~/Library/Application\ Support/Sublime\ Text*/Packages/User/Preferences.sublime-settings 2> /dev/null
+cp -r ${HOME}/.dev-setup/themes/Preferences.sublime-settings ~/Library/Application\ Support/Sublime\ Text*/Packages/User/Preferences.sublime-settings 2> /dev/null
 
 ###############################################################################
 # Transmission.app                                                            #
diff --git a/pydata.sh b/pydata.sh
index ebdb710d4..f1922aac5 100755
--- a/pydata.sh
+++ b/pydata.sh
@@ -97,14 +97,8 @@ pip install mysqlclient
 # Install IPython Profile
 ###############################################################################
 
-echo "------------------------------"
-echo "Installing IPython Notebook Default Profile"
-
-# Add the IPython profile
-mkdir -p ~/.ipython
-cp -r init/profile_default/ ~/.ipython/profile_default
 
 echo "------------------------------"
 echo "Script completed."
 echo "Usage: workon py2-data for Python2"
-echo "Usage: workon py3-data for Python3"
\ No newline at end of file
+echo "Usage: workon py3-data for Python3"
diff --git a/rcm.sh b/rcm.sh
new file mode 100755
index 000000000..00f43109d
--- /dev/null
+++ b/rcm.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Install command-line tools using Homebrew.
+
+# Ask for the administrator password upfront.
+sudo -v
+
+# Keep-alive: update existing `sudo` time stamp until the script has finished.
+while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null &
+
+# Check for Homebrew,
+# Install if we don't have it
+if test ! $(which brew); then
+  echo "Installing homebrew..."
+  ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+fi
+
+# Make sure we’re using the latest Homebrew.
+brew update
+
+brew tap thoughtbot/formulae
+brew install rcm
+
+# setup dotfiles
+env RCRC=".rcrc" rcup