Rename dot files and add deploy dotfiles script.
Move those git submodules.

http://stackoverflow.com/questions/4604486/how-do-i-move-an-existing-git-submodule-within-a-git-repository