Moved classes to a Util directory.