Change to new app structure