reorganize classes in packages