Moving mq-class over to fedup