expand structure of MD and ME
Merge pull request #524 from sijchen/me_refactor33

Expand structure of MD and ME