Reorganised the ModuleMechanical a bit