Merged router components.
Removed DI container dependency from routing context and fixed unit
tests.