Make zsh faster
Code organization changes in zrc