minor refactoring to organize the DTOs.