just change ordering of dtos for nicer json output