Fixed MPS folder structure