Changed the structure

Tested
Deleted as old structure

deleted