cleanup&refactor
Remove a level or router abstraction but remove the idea of a pluggable router