Even more massive refactor, splitting out of projects, current dependencies