Minor cleanup of app structure.