Moving toward a cleaner app structure