changed datamodel api to a regular JAR osgi-fied