- restructure
- merge