Skip to content

Refactor router

Refactor router #682