Refactored DTOs into own model package
Refactoring duplicate DTOs