Complete repackaging under core.api and core.impl