Moved some classes to the util package.