Factoring out crap in config that shouldn't be in config. Dependencies and utils added. Fun!