Moved entities and enums to model package.
To prevent cycle between packages the enums should reside with the entities. Moved the entities to the model package with the enums.