feat: APP structure refactoring and improvement #4