OPSINT-783 refactoring routes