Reorganisation
Updated to mam-pre3
Updated glue code and documentation