- remove folders in model for easier work
- todo updated