diff --git a/hw/util/bit_set/include/bit_set/bit_set.h b/util/bit_set/include/bit_set/bit_set.h similarity index 100% rename from hw/util/bit_set/include/bit_set/bit_set.h rename to util/bit_set/include/bit_set/bit_set.h diff --git a/hw/util/bit_set/pkg.yml b/util/bit_set/pkg.yml similarity index 100% rename from hw/util/bit_set/pkg.yml rename to util/bit_set/pkg.yml diff --git a/hw/util/bit_set/src/bit_set.c b/util/bit_set/src/bit_set.c similarity index 100% rename from hw/util/bit_set/src/bit_set.c rename to util/bit_set/src/bit_set.c