Move uniqueId to the adt.util namespace
Simpler export