refactor API URIs