refactored packages, made osgi bundle