Restructured the File Layout