Moved FactoryImpl out of impl package for osgi use