Simplify app structure.