Moved utility class to the correct package.