Changed common-utils structure.