MARS Workshop_MARS code reorganisation