Small file structure changes only.