Merged Retrieve and Upload into a single task

This makes even more sense in context of implementing MMS
send which will require a task that both sends (M-Send.req)
and receives (M-Send.conf) data.