- reorganised packages
- optimised context configuration