Classes reorganization (planning)