Updated and moved zsh files

Trying to clean up .zshrc and move away from oh-my-zsh