Removed obsolete model
Removed getters/setters for entity model for now
Renamed model properties to more sensible names
Changed model properties to more sensible names and removed useless getters/setters