Reorganize files in prep for zsh
Add ZSH