-remove model classes, there are only serve for creating templates
+convert class, domain2Dto, dto2Domain
*small text changes, renames classes in test