Folder structure clean up
Folder structure clean up