Split classes into classes and traits