Adding folders

Organizing and cleaning