Folder structure change

Folder structure change