diff --git a/core/data-items/common/ClientIndex.h b/utils/LocListMap.h similarity index 100% rename from core/data-items/common/ClientIndex.h rename to utils/LocListMap.h diff --git a/core/data-items/common/DataItemIndex.h b/utils/LocUnorderedSetMap.h similarity index 100% rename from core/data-items/common/DataItemIndex.h rename to utils/LocUnorderedSetMap.h