Large refactoring towards usage of the new App facade.
All tests are passing now.