Get rid of .mq.util package, move those classes into .mq and make them
package-private.