restructured DTOs, minor changes