Fix file structures