removed OSGI-INF, various build updates