Sort classes into different packages