Intermediate commit of refactored classes