Added zsh and rearranged some stuff