Sort classes into subpackages