changed class name
added OR-Mapping for all classes