diff --git a/soundtrigger/3/Android.bp b/soundtrigger/aidl/Android.bp
similarity index 67%
rename from soundtrigger/3/Android.bp
rename to soundtrigger/aidl/Android.bp
index e56c5ad311..6c084da740 100644
--- a/soundtrigger/3/Android.bp
+++ b/soundtrigger/aidl/Android.bp
@@ -1,12 +1,11 @@
 aidl_interface {
     name: "android.hardware.soundtrigger3",
     vendor_available: true,
-    local_include_dir: "aidl",
     flags: ["-Werror", "-Weverything", ],
     srcs: [
-        "aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl",
-        "aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl",
-        "aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl",
+        "android/hardware/soundtrigger3/ISoundTriggerHw.aidl",
+        "android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl",
+        "android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl",
     ],
     stability: "vintf",
     imports: [
diff --git a/soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHw.aidl b/soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
similarity index 100%
rename from soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
rename to soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
diff --git a/soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl b/soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
similarity index 100%
rename from soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
rename to soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
diff --git a/soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl b/soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
similarity index 100%
rename from soundtrigger/3/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
rename to soundtrigger/aidl/aidl_api/android.hardware.soundtrigger3/current/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
diff --git a/soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl b/soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
similarity index 100%
rename from soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
rename to soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHw.aidl
diff --git a/soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl b/soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
similarity index 100%
rename from soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
rename to soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHwCallback.aidl
diff --git a/soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl b/soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
similarity index 100%
rename from soundtrigger/3/aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
rename to soundtrigger/aidl/android/hardware/soundtrigger3/ISoundTriggerHwGlobalCallback.aidl
diff --git a/soundtrigger/3/cli/Android.bp b/soundtrigger/aidl/cli/Android.bp
similarity index 100%
rename from soundtrigger/3/cli/Android.bp
rename to soundtrigger/aidl/cli/Android.bp
diff --git a/soundtrigger/3/cli/OWNERS b/soundtrigger/aidl/cli/OWNERS
similarity index 100%
rename from soundtrigger/3/cli/OWNERS
rename to soundtrigger/aidl/cli/OWNERS
diff --git a/soundtrigger/3/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java b/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
similarity index 100%
rename from soundtrigger/3/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
rename to soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
diff --git a/soundtrigger/3/cli/sthal_cli_3 b/soundtrigger/aidl/cli/sthal_cli_3
similarity index 100%
rename from soundtrigger/3/cli/sthal_cli_3
rename to soundtrigger/aidl/cli/sthal_cli_3