File structure changes and links