Refactoring API services, switching to node classes