Add Resource Router
Refactor