Moved some stuff around to reflect new classes