Refactor MainCollection
Refactor MainRouter