Fix file structure