- Further refactorisation of the example-app
- Refs #26