refactored Media/Moap/MoapModule.cs