revised files
Changed folder structure
FIxed merge onflicts.