Refactoring OSGIProtocol package structure.