Refactor of api URL's
Merge branch 'feature/rest' into develop