Adding TOTO list
Changing file structure