Initial split into api, embedded, osgi