Reorganize zsh setup