Small app structure change