Updating MACPO module to the new modules infra...

It does not include the new version of MACPO yet.