restructured zsh stuff