update the structure and added new data
- code structure changed
- added new data