Moved routing into BARRouter.
Updated demo app with new routing.