refactoring
refactoring
added osgi components
Merge pull request #1 from georgievm7/master

merge