Refactoring layout and code

Some minor refactors to bring it inline with some of the new 2.10 features

- String Interpolation
- Reintroduction of `App`

Fixed the layout to run as a single app so we can use console.