Add APIClient and rename routes