Reorganize classes in packages/projects - cont.