Merge pull request #29 from tkrille/OSNG-209

Osng 209
[cleanup] improved javadoc
[cleanup] fixing sonar violations
[test-cleanup] improved package structure