Restructured the files