Big restructure--break everything out of init.el