Move and change all classes to DTO