Moved classes into util package.