[Issue #92] First pass at refactoring routes