2.x Reorganize classes in packages/projects.