Intermediate checkin with code reorged.