restructured the folder