Move commandwrap to mpdCommand object