Massive refactor to put all the systems into one package.