Move DescriptorUtils to parent package