Moved some utility classes into the correct new package names.