Some changes to MATE and cleaned the way fs packages are choosen

Some changes to MATE and cleaned the way fs packages are choosen