Restructured the file