Reorganizing PMM directory structure