first trial in re-structuring the extending MATSim part