Split classes into different packages