Class reorganization