Changes to file structures