Simplify the app structure