class reorganization