Add requests specs and refactor routes