Rename files and reorganize init code in prep for moving to ohmyzsh.
Make the switch to zsh.