refactored organization DTO entities