Update Collection container
Update Dispatcher class
Update Collection
Create Router class
Update Router class
Update Router
Create Router tests
Create helper classes