Reverting "Moved UUID classes to UUID package" as it broke stuff.