cleaned todos
refactored folders structure