Move subfolder index files to folders