Migrating some demos to app bundle