Update UI & moved DTOs