Routes refactoring
Following the excellent project https://github.com/hseeberger/reactive-flows