Fix file arrangement foulup