Corr: Structure error

Correction of some structural error and remove some unwanted files.