Remove EULA and fix manifest application package
code refactoring and test coverage
code refactoring and test coverage