Additional changes from renaming folders.