Some zsh config restructuring