Updated ZSH config, and rearranged ZSH config file structure