[AutoBouquetsMaker] some file renames/deletionsand edits.