Extract mapping logic to separate classes
Change all API calls to use mappers and the REST connector