Moved classes to the domain model.