Folder refactoring

Folder refactoring
Removed Folders

Removed Folders