Refactor zsh layout