Finished refactor of API paths