Moved the customized OSGi classes to a different package to make them more easily recognizable. Copied the same include resource mechanism the framework uses to ensure the customized classes get picked instead the ones in the compendium.