- Lots of refactoring
- Moved sections
- Deleted deprecated TODOs
- REnamed some sections