Reorganize classes (entity, validation).