zsh reorganization