Restructured the folder