Folder structure changes

Folder structure changes