[update:] code-refactor moving DTO to core