commit prior to reorganization of classes