refactoring Application package