new class reorganization