refactor Application package