Class reorganization + data after