Reorganization of the classes in packages