API-69 Refactor and leave classes for remote calls