Code reassignment

Correction of folder structure and some others :)