Refactoring

* Using nested routes more explicitly