diff --git a/Android.bp b/Android.bp
index 251bb87..7aef46b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,50 +1,3 @@
 subdirs = [
     "*"
 ]
-hidl_package_root {
-    name: "vendor.qti.hardware.camera",
-    path: "vendor/qcom/opensource/interfaces/camera",
-}
-
-hidl_package_root {
-    name: "vendor.qti.hardware.display",
-    path: "vendor/qcom/opensource/interfaces/display",
-}
-
-hidl_package_root {
-    name: "vendor.qti.hardware.wifi",
-    path: "vendor/qcom/opensource/interfaces/wifi",
-}
-
-hidl_package_root {
-    name: "vendor.display",
-    path: "vendor/qcom/opensource/interfaces/display",
-}
-
-hidl_package_root {
-    name: "vendor.qti.hardware.servicetracker",
-    path: "vendor/qcom/opensource/interfaces/servicetracker",
-}
-
-hidl_package_root {
-    name: "vendor.qti.hardware.bluetooth_audio",
-    path: "vendor/qcom/opensource/interfaces/bluetooth_audio",
-}
-hidl_package_root {
-    name: "vendor.qti.hardware.systemhelper",
-    path: "vendor/qcom/opensource/interfaces/systemhelper",
-}
-
-hidl_package_root {
-    name: "vendor.qti.hardware.bluetooth_dun",
-    path: "vendor/qcom/opensource/interfaces/bluetooth_dun",
-}
-
-hidl_package_root {
-    name: "vendor.qti.hardware.fstman",
-    path: "vendor/qcom/opensource/interfaces/fstman",
-}
-hidl_package_root {
-    name:"vendor.qti.hardware.debugutils",
-    path:"vendor/qcom/opensource/interfaces/debugutils"
-}
diff --git a/bluetooth_audio/Android.bp b/bluetooth_audio/Android.bp
new file mode 100644
index 0000000..1ad26f1
--- /dev/null
+++ b/bluetooth_audio/Android.bp
@@ -0,0 +1,4 @@
+hidl_package_root {
+    name: "vendor.qti.hardware.bluetooth_audio",
+    use_current: true,
+}
diff --git a/bluetooth_dun/Android.bp b/bluetooth_dun/Android.bp
new file mode 100644
index 0000000..3dee575
--- /dev/null
+++ b/bluetooth_dun/Android.bp
@@ -0,0 +1,4 @@
+hidl_package_root {
+    name: "vendor.qti.hardware.bluetooth_dun",
+    use_current: true,
+}
diff --git a/camera/Android.bp b/camera/Android.bp
new file mode 100644
index 0000000..d7cafff
--- /dev/null
+++ b/camera/Android.bp
@@ -0,0 +1,4 @@
+hidl_package_root {
+    name: "vendor.qti.hardware.camera",
+    use_current: true,
+}
diff --git a/debugutils/Android.bp b/debugutils/Android.bp
new file mode 100644
index 0000000..5a1386e
--- /dev/null
+++ b/debugutils/Android.bp
@@ -0,0 +1,4 @@
+hidl_package_root {
+    name: "vendor.qti.hardware.debugutils",
+    use_current: true,
+}
diff --git a/display/Android.bp b/display/Android.bp
new file mode 100644
index 0000000..72b9cb9
--- /dev/null
+++ b/display/Android.bp
@@ -0,0 +1,9 @@
+hidl_package_root {
+    name: "vendor.qti.hardware.display",
+    use_current: true,
+}
+
+hidl_package_root {
+    name: "vendor.display",
+    use_current: true,
+}
diff --git a/fstman/Android.bp b/fstman/Android.bp
new file mode 100644
index 0000000..8a89f0f
--- /dev/null
+++ b/fstman/Android.bp
@@ -0,0 +1,4 @@
+hidl_package_root {
+    name: "vendor.qti.hardware.fstman",
+    use_current: true,
+}
diff --git a/servicetracker/Android.bp b/servicetracker/Android.bp
new file mode 100644
index 0000000..0519361
--- /dev/null
+++ b/servicetracker/Android.bp
@@ -0,0 +1,4 @@
+hidl_package_root {
+    name: "vendor.qti.hardware.servicetracker",
+    use_current: true,
+}
diff --git a/systemhelper/Android.bp b/systemhelper/Android.bp
new file mode 100644
index 0000000..19c539c
--- /dev/null
+++ b/systemhelper/Android.bp
@@ -0,0 +1,4 @@
+hidl_package_root {
+    name: "vendor.qti.hardware.systemhelper",
+    use_current: true,
+}
diff --git a/systemhelper/current.txt b/systemhelper/current.txt
new file mode 100644
index 0000000..ab632c9
--- /dev/null
+++ b/systemhelper/current.txt
@@ -0,0 +1,4 @@
+0edcd9296043bf6c11d9fa63573c16da2ab2c89459f9f48b7c4125b8c67b311c vendor.qti.hardware.systemhelper@1.0::types
+40cd1de76b9d3ca23f4c8197b1da75c818fdf891ecc56ed04220f6ca4645b1b8 vendor.qti.hardware.systemhelper@1.0::ISystemEvent
+a75908e4d4f357ac281f47e16312e05d0bcfb1a11ca42ce20306cf2170cec0af vendor.qti.hardware.systemhelper@1.0::ISystemEventCallback
+7b0def6f56ef8b7a02923ea26def3101002594cfdc8209baf66743ac408171c0 vendor.qti.hardware.systemhelper@1.0::ISystemResource
diff --git a/wifi/Android.bp b/wifi/Android.bp
new file mode 100644
index 0000000..3bd94af
--- /dev/null
+++ b/wifi/Android.bp
@@ -0,0 +1,4 @@
+hidl_package_root {
+    name: "vendor.qti.hardware.wifi",
+    use_current: true,
+}