Rename some stuff, reorganize things
Clean up zshrc once and for all