diff --git a/health/2.0/libhealthhalutils/Android.bp b/health/2.0/utils/libhealthhalutils/Android.bp
similarity index 100%
rename from health/2.0/libhealthhalutils/Android.bp
rename to health/2.0/utils/libhealthhalutils/Android.bp
diff --git a/health/2.0/libhealthhalutils/HealthHalUtils.cpp b/health/2.0/utils/libhealthhalutils/HealthHalUtils.cpp
similarity index 100%
rename from health/2.0/libhealthhalutils/HealthHalUtils.cpp
rename to health/2.0/utils/libhealthhalutils/HealthHalUtils.cpp
diff --git a/health/2.0/libhealthhalutils/include/healthhalutils/HealthHalUtils.h b/health/2.0/utils/libhealthhalutils/include/healthhalutils/HealthHalUtils.h
similarity index 100%
rename from health/2.0/libhealthhalutils/include/healthhalutils/HealthHalUtils.h
rename to health/2.0/utils/libhealthhalutils/include/healthhalutils/HealthHalUtils.h
diff --git a/health/2.0/libstoragehealthdefault/Android.bp b/health/2.0/utils/libhealthstoragedefault/Android.bp
similarity index 100%
rename from health/2.0/libstoragehealthdefault/Android.bp
rename to health/2.0/utils/libhealthstoragedefault/Android.bp
diff --git a/health/2.0/libstoragehealthdefault/StorageHealthDefault.cpp b/health/2.0/utils/libhealthstoragedefault/StorageHealthDefault.cpp
similarity index 100%
rename from health/2.0/libstoragehealthdefault/StorageHealthDefault.cpp
rename to health/2.0/utils/libhealthstoragedefault/StorageHealthDefault.cpp
diff --git a/health/2.0/libstoragehealthdefault/include/StorageHealthDefault.h b/health/2.0/utils/libhealthstoragedefault/include/StorageHealthDefault.h
similarity index 100%
rename from health/2.0/libstoragehealthdefault/include/StorageHealthDefault.h
rename to health/2.0/utils/libhealthstoragedefault/include/StorageHealthDefault.h