Finishing file structure changes