Moved shapes into classes