Refactored out all OSGi dependencies into separate project.