Restructuring the folders

Restructuring the folders