Fixing file structures