Orm mapping

removed duplicate model by removing annotations and introducing orm.xml