some project refactorings
some project refactorings
some project refactorings
some minor refactorings
code reformat
added main-class definition to the jar manifest
project refactorings
merge from refactor