completed major refactoring
another refactoring: finished scoping routes