diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index dab6123..4e819b8 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -65,22 +65,3 @@
     ],
     init_rc: ["keystore2.rc"],
 }
-
-aidl_interface {
-    name: "android.security.attestationmanager",
-    srcs: [
-        "aidl/android/security/ByteArray.aidl",
-        "aidl/android/security/IAttestationManager.aidl",
-    ],
-    local_include_dir: "aidl",
-    imports: [ "android.hardware.keymint" ],
-    unstable: true,
-    backend: {
-        java: {
-            sdk_version: "module_current",
-        },
-        rust: {
-            enabled: true,
-        },
-    },
-}
diff --git a/keystore2/aidl/Android.bp b/keystore2/aidl/Android.bp
new file mode 100644
index 0000000..00f38aa
--- /dev/null
+++ b/keystore2/aidl/Android.bp
@@ -0,0 +1,30 @@
+// Copyright 2020, The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aidl_interface {
+    name: "android.security.attestationmanager",
+    srcs: [
+        "android/security/attestationmanager/*.aidl",
+    ],
+    imports: [ "android.hardware.keymint" ],
+    unstable: true,
+    backend: {
+        java: {
+            sdk_version: "module_current",
+        },
+        rust: {
+            enabled: true,
+        },
+    },
+}
diff --git a/keystore2/aidl/android/security/ByteArray.aidl b/keystore2/aidl/android/security/attestationmanager/ByteArray.aidl
similarity index 94%
rename from keystore2/aidl/android/security/ByteArray.aidl
rename to keystore2/aidl/android/security/attestationmanager/ByteArray.aidl
index db2e18c..a1592ec 100644
--- a/keystore2/aidl/android/security/ByteArray.aidl
+++ b/keystore2/aidl/android/security/attestationmanager/ByteArray.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.security;
+package android.security.attestationmanager;
 
 /**
  * Simple data holder for a byte array, allowing for multidimensional arrays in AIDL.
diff --git a/keystore2/aidl/android/security/IAttestationManager.aidl b/keystore2/aidl/android/security/attestationmanager/IAttestationManager.aidl
similarity index 91%
rename from keystore2/aidl/android/security/IAttestationManager.aidl
rename to keystore2/aidl/android/security/attestationmanager/IAttestationManager.aidl
index 1953cca..d88a298 100644
--- a/keystore2/aidl/android/security/IAttestationManager.aidl
+++ b/keystore2/aidl/android/security/attestationmanager/IAttestationManager.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package android.security;
+package android.security.attestationmanager;
 
-import android.security.ByteArray;
+import android.security.attestationmanager.ByteArray;
 import android.hardware.keymint.KeyParameter;
 
 /**