diff --git a/apex/appsearch/framework/java/android/app/TEST_MAPPING b/apex/appsearch/framework/java/TEST_MAPPING
similarity index 100%
rename from apex/appsearch/framework/java/android/app/TEST_MAPPING
rename to apex/appsearch/framework/java/TEST_MAPPING
diff --git a/apex/appsearch/framework/java/android/app/appsearch/AppSearchEmail.java b/apex/appsearch/framework/java/external/android/app/appsearch/AppSearchEmail.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/AppSearchEmail.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/AppSearchEmail.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/AppSearchSchema.java b/apex/appsearch/framework/java/external/android/app/appsearch/AppSearchSchema.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/AppSearchSchema.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/AppSearchSchema.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/GenericDocument.java b/apex/appsearch/framework/java/external/android/app/appsearch/GenericDocument.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/GenericDocument.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/GenericDocument.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/GetByUriRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/GetByUriRequest.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/GetByUriRequest.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/GetByUriRequest.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/PutDocumentsRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/PutDocumentsRequest.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/PutDocumentsRequest.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/PutDocumentsRequest.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/RemoveByUriRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/RemoveByUriRequest.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/RemoveByUriRequest.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/RemoveByUriRequest.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/SearchResult.java b/apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/SearchResult.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/SearchResultPage.java b/apex/appsearch/framework/java/external/android/app/appsearch/SearchResultPage.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/SearchResultPage.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/SearchResultPage.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/SearchSpec.java b/apex/appsearch/framework/java/external/android/app/appsearch/SearchSpec.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/SearchSpec.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/SearchSpec.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/SetSchemaRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaRequest.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/SetSchemaRequest.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaRequest.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/exceptions/AppSearchException.java b/apex/appsearch/framework/java/external/android/app/appsearch/exceptions/AppSearchException.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/exceptions/AppSearchException.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/exceptions/AppSearchException.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/exceptions/IllegalSchemaException.java b/apex/appsearch/framework/java/external/android/app/appsearch/exceptions/IllegalSchemaException.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/exceptions/IllegalSchemaException.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/exceptions/IllegalSchemaException.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/exceptions/IllegalSearchSpecException.java b/apex/appsearch/framework/java/external/android/app/appsearch/exceptions/IllegalSearchSpecException.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/exceptions/IllegalSearchSpecException.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/exceptions/IllegalSearchSpecException.java
diff --git a/apex/appsearch/framework/java/android/app/appsearch/util/BundleUtil.java b/apex/appsearch/framework/java/external/android/app/appsearch/util/BundleUtil.java
similarity index 100%
rename from apex/appsearch/framework/java/android/app/appsearch/util/BundleUtil.java
rename to apex/appsearch/framework/java/external/android/app/appsearch/util/BundleUtil.java