updated entities
updated service
mappers and hydrators initial refactor