Modules - Mpd update for core integration and clean up