Main class changed to reflect restructure.