Move dto methods to according classes