continue refactor of DTO/Facades