Cleaning up and updating index files with phase2-en layout