Migrating the app source to include recent changes