Moved new classes into classes package