migrating to MPS 3.0 

I've updated the project to work with MPS 3.0
In case you'd like you can diff this version with the version you have now in master just to compare these two projects...