Refactoring -- removing the folders M6, M5, etc.