small changes before directory rename