ReStructuring the files

Restructuring the files