Refactoring application structure
Refactoring application structure