Fixed naming conventions issues for model classes. Added new model classes to persistence.xml. Removed auto generated _ model classes.