diff --git a/nearby/apex/com.android.nearby/Android.bp b/nearby/apex/Android.bp
similarity index 100%
rename from nearby/apex/com.android.nearby/Android.bp
rename to nearby/apex/Android.bp
diff --git a/nearby/apex/com.android.nearby/com.android.nearby.avbpubkey b/nearby/apex/com.android.nearby.avbpubkey
similarity index 100%
rename from nearby/apex/com.android.nearby/com.android.nearby.avbpubkey
rename to nearby/apex/com.android.nearby.avbpubkey
Binary files differ
diff --git a/nearby/apex/com.android.nearby/com.android.nearby.pem b/nearby/apex/com.android.nearby.pem
similarity index 100%
rename from nearby/apex/com.android.nearby/com.android.nearby.pem
rename to nearby/apex/com.android.nearby.pem
diff --git a/nearby/apex/com.android.nearby/com.android.nearby.pk8 b/nearby/apex/com.android.nearby.pk8
similarity index 100%
rename from nearby/apex/com.android.nearby/com.android.nearby.pk8
rename to nearby/apex/com.android.nearby.pk8
Binary files differ
diff --git a/nearby/apex/com.android.nearby/com.android.nearby.x509.pem b/nearby/apex/com.android.nearby.x509.pem
similarity index 100%
rename from nearby/apex/com.android.nearby/com.android.nearby.x509.pem
rename to nearby/apex/com.android.nearby.x509.pem
diff --git a/nearby/apex/com.android.nearby/manifest.json b/nearby/apex/manifest.json
similarity index 100%
rename from nearby/apex/com.android.nearby/manifest.json
rename to nearby/apex/manifest.json