11 app structure refactoring