Factor helper method implemented
Code beautified and some modifications
Rename application package, lots of refactoring. #160 fix
#159 fix
XML refactor fix