Rename the app folders, step 2 of #8