Merge commit '0ccdd90e6916f52dbf9d69b0afa7ecea398ad130' into manual_merge_0ccdd90e6916f52dbf9d69b0afa7ecea398ad130

Bug: 193833051
Test: ./gradlew bOS
Change-Id: Idb2e82d38d8ef236c1ce8ba165ce598371309c20

diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
index 916699e..79c2da8c 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt

@@ -405,7 +405,9 @@
         // AndroidXExtension.mavenGroup is not readable until afterEvaluate.
         afterEvaluate {
             validateProjectStructure.configure { task ->
-                task.enabled = extension.mavenGroup != null
+                val type = extension.type
+                task.enabled = extension.mavenGroup != null &&
+                    (type == LibraryType.PUBLISHED_LIBRARY || type == LibraryType.UNSET)
                 task.libraryGroup.set(extension.mavenGroup)
             }
         }

diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle
index d1157c4..6feb049 100644
--- a/camera/camera-extensions/build.gradle
+++ b/camera/camera-extensions/build.gradle

@@ -57,7 +57,7 @@
     androidTestImplementation(project(":camera:camera-lifecycle"))
     androidTestImplementation(project(":camera:camera-testing"))
     androidTestImplementation(project(":internal-testutils-truth"))
-    androidTestImplementation(project(":camera:integration-tests:camera-testlib-extensions"))
+    androidTestImplementation(project(":camera:camera-testlib-extensions"))
     // To use the testlib to have the implementation of the extensions-stub interface.
 }
 

diff --git a/camera/integration-tests/extensionstestlib/build.gradle b/camera/camera-testlib-extensions/build.gradle
similarity index 100%
rename from camera/integration-tests/extensionstestlib/build.gradle
rename to camera/camera-testlib-extensions/build.gradle

diff --git a/camera/integration-tests/extensionstestlib/lint-baseline.xml b/camera/camera-testlib-extensions/lint-baseline.xml
similarity index 100%
rename from camera/integration-tests/extensionstestlib/lint-baseline.xml
rename to camera/camera-testlib-extensions/lint-baseline.xml

diff --git a/camera/integration-tests/extensionstestlib/src/main/AndroidManifest.xml b/camera/camera-testlib-extensions/src/main/AndroidManifest.xml
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/AndroidManifest.xml
rename to camera/camera-testlib-extensions/src/main/AndroidManifest.xml

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CameraCharacteristicAvailability.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CameraCharacteristicAvailability.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CameraCharacteristicAvailability.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CameraCharacteristicAvailability.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/GLImage2SurfaceRenderer.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/GLImage2SurfaceRenderer.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/GLImage2SurfaceRenderer.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/GLImage2SurfaceRenderer.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/InitializerImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/InitializerImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/InitializerImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/InitializerImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpls.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpls.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpls.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpls.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/SettableCaptureStage.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/SettableCaptureStage.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/SettableCaptureStage.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/SettableCaptureStage.java

diff --git a/camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/package-info.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/package-info.java
similarity index 100%
rename from camera/integration-tests/extensionstestlib/src/main/java/androidx/camera/extensions/impl/package-info.java
rename to camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/package-info.java

diff --git a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle b/compose/material/material-icons-extended-filled/build.gradle
similarity index 91%
rename from compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
rename to compose/material/material-icons-extended-filled/build.gradle
index 710a37a..95df6bf 100644
--- a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
+++ b/compose/material/material-icons-extended-filled/build.gradle

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-apply from: "../generate.gradle"
+apply from: "../material-icons-extended/generate.gradle"

diff --git a/compose/material/material-icons-extended/material-icons-extended-filled/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-filled/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from compose/material/material-icons-extended/material-icons-extended-filled/src/androidMain/AndroidManifest.xml
rename to compose/material/material-icons-extended-filled/src/androidMain/AndroidManifest.xml

diff --git a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle b/compose/material/material-icons-extended-outlined/build.gradle
similarity index 91%
copy from compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
copy to compose/material/material-icons-extended-outlined/build.gradle
index 710a37a..95df6bf 100644
--- a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
+++ b/compose/material/material-icons-extended-outlined/build.gradle

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-apply from: "../generate.gradle"
+apply from: "../material-icons-extended/generate.gradle"

diff --git a/compose/material/material-icons-extended/material-icons-extended-outlined/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-outlined/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from compose/material/material-icons-extended/material-icons-extended-outlined/src/androidMain/AndroidManifest.xml
rename to compose/material/material-icons-extended-outlined/src/androidMain/AndroidManifest.xml

diff --git a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle b/compose/material/material-icons-extended-rounded/build.gradle
similarity index 91%
copy from compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
copy to compose/material/material-icons-extended-rounded/build.gradle
index 710a37a..95df6bf 100644
--- a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
+++ b/compose/material/material-icons-extended-rounded/build.gradle

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-apply from: "../generate.gradle"
+apply from: "../material-icons-extended/generate.gradle"

diff --git a/compose/material/material-icons-extended/material-icons-extended-rounded/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-rounded/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from compose/material/material-icons-extended/material-icons-extended-rounded/src/androidMain/AndroidManifest.xml
rename to compose/material/material-icons-extended-rounded/src/androidMain/AndroidManifest.xml

diff --git a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle b/compose/material/material-icons-extended-sharp/build.gradle
similarity index 91%
copy from compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
copy to compose/material/material-icons-extended-sharp/build.gradle
index 710a37a..95df6bf 100644
--- a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
+++ b/compose/material/material-icons-extended-sharp/build.gradle

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-apply from: "../generate.gradle"
+apply from: "../material-icons-extended/generate.gradle"

diff --git a/compose/material/material-icons-extended/material-icons-extended-sharp/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-sharp/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from compose/material/material-icons-extended/material-icons-extended-sharp/src/androidMain/AndroidManifest.xml
rename to compose/material/material-icons-extended-sharp/src/androidMain/AndroidManifest.xml

diff --git a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle b/compose/material/material-icons-extended-twotone/build.gradle
similarity index 91%
copy from compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
copy to compose/material/material-icons-extended-twotone/build.gradle
index 710a37a..95df6bf 100644
--- a/compose/material/material-icons-extended/material-icons-extended-filled/build.gradle
+++ b/compose/material/material-icons-extended-twotone/build.gradle

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-apply from: "../generate.gradle"
+apply from: "../material-icons-extended/generate.gradle"

diff --git a/compose/material/material-icons-extended/material-icons-extended-twotone/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-twotone/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from compose/material/material-icons-extended/material-icons-extended-twotone/src/androidMain/AndroidManifest.xml
rename to compose/material/material-icons-extended-twotone/src/androidMain/AndroidManifest.xml

diff --git a/compose/material/material-icons-extended/material-icons-extended-outlined/build.gradle b/compose/material/material-icons-extended/material-icons-extended-outlined/build.gradle
deleted file mode 100644
index 710a37a..0000000
--- a/compose/material/material-icons-extended/material-icons-extended-outlined/build.gradle
+++ /dev/null

@@ -1,17 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-apply from: "../generate.gradle"

diff --git a/compose/material/material-icons-extended/material-icons-extended-rounded/build.gradle b/compose/material/material-icons-extended/material-icons-extended-rounded/build.gradle
deleted file mode 100644
index 710a37a..0000000
--- a/compose/material/material-icons-extended/material-icons-extended-rounded/build.gradle
+++ /dev/null

@@ -1,17 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-apply from: "../generate.gradle"

diff --git a/compose/material/material-icons-extended/material-icons-extended-sharp/build.gradle b/compose/material/material-icons-extended/material-icons-extended-sharp/build.gradle
deleted file mode 100644
index 710a37a..0000000
--- a/compose/material/material-icons-extended/material-icons-extended-sharp/build.gradle
+++ /dev/null

@@ -1,17 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-apply from: "../generate.gradle"

diff --git a/compose/material/material-icons-extended/material-icons-extended-twotone/build.gradle b/compose/material/material-icons-extended/material-icons-extended-twotone/build.gradle
deleted file mode 100644
index 710a37a..0000000
--- a/compose/material/material-icons-extended/material-icons-extended-twotone/build.gradle
+++ /dev/null

@@ -1,17 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-apply from: "../generate.gradle"

diff --git a/concurrent/futures-ktx/api/1.1.0-beta01.txt b/concurrent/concurrent-futures-ktx/api/1.1.0-beta01.txt
similarity index 100%
rename from concurrent/futures-ktx/api/1.1.0-beta01.txt
rename to concurrent/concurrent-futures-ktx/api/1.1.0-beta01.txt

diff --git a/concurrent/futures-ktx/api/1.1.0-rc01.txt b/concurrent/concurrent-futures-ktx/api/1.1.0-rc01.txt
similarity index 100%
rename from concurrent/futures-ktx/api/1.1.0-rc01.txt
rename to concurrent/concurrent-futures-ktx/api/1.1.0-rc01.txt

diff --git a/concurrent/futures-ktx/api/api_lint.ignore b/concurrent/concurrent-futures-ktx/api/api_lint.ignore
similarity index 100%
rename from concurrent/futures-ktx/api/api_lint.ignore
rename to concurrent/concurrent-futures-ktx/api/api_lint.ignore

diff --git a/concurrent/futures-ktx/api/current.txt b/concurrent/concurrent-futures-ktx/api/current.txt
similarity index 100%
rename from concurrent/futures-ktx/api/current.txt
rename to concurrent/concurrent-futures-ktx/api/current.txt

diff --git a/concurrent/futures-ktx/api/public_plus_experimental_1.1.0-beta01.txt b/concurrent/concurrent-futures-ktx/api/public_plus_experimental_1.1.0-beta01.txt
similarity index 100%
rename from concurrent/futures-ktx/api/public_plus_experimental_1.1.0-beta01.txt
rename to concurrent/concurrent-futures-ktx/api/public_plus_experimental_1.1.0-beta01.txt

diff --git a/concurrent/futures-ktx/api/public_plus_experimental_1.1.0-rc01.txt b/concurrent/concurrent-futures-ktx/api/public_plus_experimental_1.1.0-rc01.txt
similarity index 100%
rename from concurrent/futures-ktx/api/public_plus_experimental_1.1.0-rc01.txt
rename to concurrent/concurrent-futures-ktx/api/public_plus_experimental_1.1.0-rc01.txt

diff --git a/concurrent/futures-ktx/api/public_plus_experimental_current.txt b/concurrent/concurrent-futures-ktx/api/public_plus_experimental_current.txt
similarity index 100%
rename from concurrent/futures-ktx/api/public_plus_experimental_current.txt
rename to concurrent/concurrent-futures-ktx/api/public_plus_experimental_current.txt

diff --git a/concurrent/futures-ktx/api/restricted_1.1.0-beta01.txt b/concurrent/concurrent-futures-ktx/api/restricted_1.1.0-beta01.txt
similarity index 100%
rename from concurrent/futures-ktx/api/restricted_1.1.0-beta01.txt
rename to concurrent/concurrent-futures-ktx/api/restricted_1.1.0-beta01.txt

diff --git a/concurrent/futures-ktx/api/restricted_1.1.0-rc01.txt b/concurrent/concurrent-futures-ktx/api/restricted_1.1.0-rc01.txt
similarity index 100%
rename from concurrent/futures-ktx/api/restricted_1.1.0-rc01.txt
rename to concurrent/concurrent-futures-ktx/api/restricted_1.1.0-rc01.txt

diff --git a/concurrent/futures-ktx/api/restricted_current.txt b/concurrent/concurrent-futures-ktx/api/restricted_current.txt
similarity index 100%
rename from concurrent/futures-ktx/api/restricted_current.txt
rename to concurrent/concurrent-futures-ktx/api/restricted_current.txt

diff --git a/concurrent/futures-ktx/build.gradle b/concurrent/concurrent-futures-ktx/build.gradle
similarity index 100%
rename from concurrent/futures-ktx/build.gradle
rename to concurrent/concurrent-futures-ktx/build.gradle

diff --git a/concurrent/futures-ktx/src/main/java/androidx/concurrent/futures/ListenableFuture.kt b/concurrent/concurrent-futures-ktx/src/main/java/androidx/concurrent/futures/ListenableFuture.kt
similarity index 100%
rename from concurrent/futures-ktx/src/main/java/androidx/concurrent/futures/ListenableFuture.kt
rename to concurrent/concurrent-futures-ktx/src/main/java/androidx/concurrent/futures/ListenableFuture.kt

diff --git a/concurrent/futures-ktx/src/test/java/androidx/concurrent/futures/ListenableFutureTest.kt b/concurrent/concurrent-futures-ktx/src/test/java/androidx/concurrent/futures/ListenableFutureTest.kt
similarity index 100%
rename from concurrent/futures-ktx/src/test/java/androidx/concurrent/futures/ListenableFutureTest.kt
rename to concurrent/concurrent-futures-ktx/src/test/java/androidx/concurrent/futures/ListenableFutureTest.kt

diff --git a/concurrent/futures/api/1.0.0-beta01.txt b/concurrent/concurrent-futures/api/1.0.0-beta01.txt
similarity index 100%
rename from concurrent/futures/api/1.0.0-beta01.txt
rename to concurrent/concurrent-futures/api/1.0.0-beta01.txt

diff --git a/concurrent/futures/api/1.0.0-beta02.txt b/concurrent/concurrent-futures/api/1.0.0-beta02.txt
similarity index 100%
rename from concurrent/futures/api/1.0.0-beta02.txt
rename to concurrent/concurrent-futures/api/1.0.0-beta02.txt

diff --git a/concurrent/futures/api/1.0.0-rc01.txt b/concurrent/concurrent-futures/api/1.0.0-rc01.txt
similarity index 100%
rename from concurrent/futures/api/1.0.0-rc01.txt
rename to concurrent/concurrent-futures/api/1.0.0-rc01.txt

diff --git a/concurrent/futures/api/1.0.0.txt b/concurrent/concurrent-futures/api/1.0.0.txt
similarity index 100%
rename from concurrent/futures/api/1.0.0.txt
rename to concurrent/concurrent-futures/api/1.0.0.txt

diff --git a/concurrent/futures/api/1.1.0-beta01.txt b/concurrent/concurrent-futures/api/1.1.0-beta01.txt
similarity index 100%
rename from concurrent/futures/api/1.1.0-beta01.txt
rename to concurrent/concurrent-futures/api/1.1.0-beta01.txt

diff --git a/concurrent/futures/api/1.1.0-rc01.txt b/concurrent/concurrent-futures/api/1.1.0-rc01.txt
similarity index 100%
rename from concurrent/futures/api/1.1.0-rc01.txt
rename to concurrent/concurrent-futures/api/1.1.0-rc01.txt

diff --git a/concurrent/futures/api/api_lint.ignore b/concurrent/concurrent-futures/api/api_lint.ignore
similarity index 100%
rename from concurrent/futures/api/api_lint.ignore
rename to concurrent/concurrent-futures/api/api_lint.ignore

diff --git a/concurrent/futures/api/current.txt b/concurrent/concurrent-futures/api/current.txt
similarity index 100%
rename from concurrent/futures/api/current.txt
rename to concurrent/concurrent-futures/api/current.txt

diff --git a/concurrent/futures/api/public_plus_experimental_1.0.0-beta01.txt b/concurrent/concurrent-futures/api/public_plus_experimental_1.0.0-beta01.txt
similarity index 100%
rename from concurrent/futures/api/public_plus_experimental_1.0.0-beta01.txt
rename to concurrent/concurrent-futures/api/public_plus_experimental_1.0.0-beta01.txt

diff --git a/concurrent/futures/api/public_plus_experimental_1.0.0-rc01.txt b/concurrent/concurrent-futures/api/public_plus_experimental_1.0.0-rc01.txt
similarity index 100%
rename from concurrent/futures/api/public_plus_experimental_1.0.0-rc01.txt
rename to concurrent/concurrent-futures/api/public_plus_experimental_1.0.0-rc01.txt

diff --git a/concurrent/futures/api/public_plus_experimental_1.0.0.txt b/concurrent/concurrent-futures/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from concurrent/futures/api/public_plus_experimental_1.0.0.txt
rename to concurrent/concurrent-futures/api/public_plus_experimental_1.0.0.txt

diff --git a/concurrent/futures/api/public_plus_experimental_1.1.0-beta01.txt b/concurrent/concurrent-futures/api/public_plus_experimental_1.1.0-beta01.txt
similarity index 100%
rename from concurrent/futures/api/public_plus_experimental_1.1.0-beta01.txt
rename to concurrent/concurrent-futures/api/public_plus_experimental_1.1.0-beta01.txt

diff --git a/concurrent/futures/api/public_plus_experimental_1.1.0-rc01.txt b/concurrent/concurrent-futures/api/public_plus_experimental_1.1.0-rc01.txt
similarity index 100%
rename from concurrent/futures/api/public_plus_experimental_1.1.0-rc01.txt
rename to concurrent/concurrent-futures/api/public_plus_experimental_1.1.0-rc01.txt

diff --git a/concurrent/futures/api/public_plus_experimental_current.txt b/concurrent/concurrent-futures/api/public_plus_experimental_current.txt
similarity index 100%
rename from concurrent/futures/api/public_plus_experimental_current.txt
rename to concurrent/concurrent-futures/api/public_plus_experimental_current.txt

diff --git a/concurrent/futures/api/restricted_1.0.0-beta01.txt b/concurrent/concurrent-futures/api/restricted_1.0.0-beta01.txt
similarity index 100%
rename from concurrent/futures/api/restricted_1.0.0-beta01.txt
rename to concurrent/concurrent-futures/api/restricted_1.0.0-beta01.txt

diff --git a/concurrent/futures/api/restricted_1.0.0-beta02.txt b/concurrent/concurrent-futures/api/restricted_1.0.0-beta02.txt
similarity index 100%
rename from concurrent/futures/api/restricted_1.0.0-beta02.txt
rename to concurrent/concurrent-futures/api/restricted_1.0.0-beta02.txt

diff --git a/concurrent/futures/api/restricted_1.0.0-rc01.txt b/concurrent/concurrent-futures/api/restricted_1.0.0-rc01.txt
similarity index 100%
rename from concurrent/futures/api/restricted_1.0.0-rc01.txt
rename to concurrent/concurrent-futures/api/restricted_1.0.0-rc01.txt

diff --git a/concurrent/futures/api/restricted_1.0.0.txt b/concurrent/concurrent-futures/api/restricted_1.0.0.txt
similarity index 100%
rename from concurrent/futures/api/restricted_1.0.0.txt
rename to concurrent/concurrent-futures/api/restricted_1.0.0.txt

diff --git a/concurrent/futures/api/restricted_1.1.0-beta01.txt b/concurrent/concurrent-futures/api/restricted_1.1.0-beta01.txt
similarity index 100%
rename from concurrent/futures/api/restricted_1.1.0-beta01.txt
rename to concurrent/concurrent-futures/api/restricted_1.1.0-beta01.txt

diff --git a/concurrent/futures/api/restricted_1.1.0-rc01.txt b/concurrent/concurrent-futures/api/restricted_1.1.0-rc01.txt
similarity index 100%
rename from concurrent/futures/api/restricted_1.1.0-rc01.txt
rename to concurrent/concurrent-futures/api/restricted_1.1.0-rc01.txt

diff --git a/concurrent/futures/api/restricted_current.txt b/concurrent/concurrent-futures/api/restricted_current.txt
similarity index 100%
rename from concurrent/futures/api/restricted_current.txt
rename to concurrent/concurrent-futures/api/restricted_current.txt

diff --git a/concurrent/futures/build.gradle b/concurrent/concurrent-futures/build.gradle
similarity index 100%
rename from concurrent/futures/build.gradle
rename to concurrent/concurrent-futures/build.gradle

diff --git a/concurrent/futures/lint-baseline.xml b/concurrent/concurrent-futures/lint-baseline.xml
similarity index 100%
rename from concurrent/futures/lint-baseline.xml
rename to concurrent/concurrent-futures/lint-baseline.xml

diff --git a/concurrent/futures/src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java b/concurrent/concurrent-futures/src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java
similarity index 100%
rename from concurrent/futures/src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java
rename to concurrent/concurrent-futures/src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java

diff --git a/concurrent/futures/src/main/java/androidx/concurrent/futures/CallbackToFutureAdapter.java b/concurrent/concurrent-futures/src/main/java/androidx/concurrent/futures/CallbackToFutureAdapter.java
similarity index 100%
rename from concurrent/futures/src/main/java/androidx/concurrent/futures/CallbackToFutureAdapter.java
rename to concurrent/concurrent-futures/src/main/java/androidx/concurrent/futures/CallbackToFutureAdapter.java

diff --git a/concurrent/futures/src/main/java/androidx/concurrent/futures/DirectExecutor.java b/concurrent/concurrent-futures/src/main/java/androidx/concurrent/futures/DirectExecutor.java
similarity index 100%
rename from concurrent/futures/src/main/java/androidx/concurrent/futures/DirectExecutor.java
rename to concurrent/concurrent-futures/src/main/java/androidx/concurrent/futures/DirectExecutor.java

diff --git a/concurrent/futures/src/main/java/androidx/concurrent/futures/ResolvableFuture.java b/concurrent/concurrent-futures/src/main/java/androidx/concurrent/futures/ResolvableFuture.java
similarity index 100%
rename from concurrent/futures/src/main/java/androidx/concurrent/futures/ResolvableFuture.java
rename to concurrent/concurrent-futures/src/main/java/androidx/concurrent/futures/ResolvableFuture.java

diff --git a/concurrent/futures/src/test/java/androidx/concurrent/futures/AbstractResolvableFutureTest.java b/concurrent/concurrent-futures/src/test/java/androidx/concurrent/futures/AbstractResolvableFutureTest.java
similarity index 100%
rename from concurrent/futures/src/test/java/androidx/concurrent/futures/AbstractResolvableFutureTest.java
rename to concurrent/concurrent-futures/src/test/java/androidx/concurrent/futures/AbstractResolvableFutureTest.java

diff --git a/concurrent/futures/src/test/java/androidx/concurrent/futures/CallbackToFutureAdapterTest.java b/concurrent/concurrent-futures/src/test/java/androidx/concurrent/futures/CallbackToFutureAdapterTest.java
similarity index 100%
rename from concurrent/futures/src/test/java/androidx/concurrent/futures/CallbackToFutureAdapterTest.java
rename to concurrent/concurrent-futures/src/test/java/androidx/concurrent/futures/CallbackToFutureAdapterTest.java

diff --git a/datastore/datastore-preferences-core/datastore-preferences-proto/build.gradle b/datastore/datastore-preferences-proto/build.gradle
similarity index 100%
rename from datastore/datastore-preferences-core/datastore-preferences-proto/build.gradle
rename to datastore/datastore-preferences-proto/build.gradle

diff --git a/datastore/datastore-preferences-core/datastore-preferences-proto/src/main/java/androidx/datastore/preferences/PreferencesMapCompat.kt b/datastore/datastore-preferences-proto/src/main/java/androidx/datastore/preferences/PreferencesMapCompat.kt
similarity index 100%
rename from datastore/datastore-preferences-core/datastore-preferences-proto/src/main/java/androidx/datastore/preferences/PreferencesMapCompat.kt
rename to datastore/datastore-preferences-proto/src/main/java/androidx/datastore/preferences/PreferencesMapCompat.kt

diff --git a/datastore/datastore-preferences-core/datastore-preferences-proto/src/main/proto/preferences.proto b/datastore/datastore-preferences-proto/src/main/proto/preferences.proto
similarity index 100%
rename from datastore/datastore-preferences-core/datastore-preferences-proto/src/main/proto/preferences.proto
rename to datastore/datastore-preferences-proto/src/main/proto/preferences.proto

diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index 3196854..37a6dc1 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore

@@ -613,4 +613,6 @@
 # > Configure project :emoji2:emoji2-bundled
 WARNING:The option setting 'android\.disableAutomaticComponentCreation=true' is experimental\.
 # > Task :compose:ui:ui-test-junit4:testDebugUnitTest
-System\.logW: A resource was acquired at attached stack trace but never released\. See java\.io\.Closeable for information on avoiding resource leaks\.java\.lang\.Throwable: Explicit termination method 'dispose' not called
\ No newline at end of file
+System\.logW: A resource was acquired at attached stack trace but never released\. See java\.io\.Closeable for information on avoiding resource leaks\.java\.lang\.Throwable: Explicit termination method 'dispose' not called
+# > Task :navigation:navigation-benchmark:processReleaseAndroidTestManifest
+\$SUPPORT/navigation/navigation\-benchmark/src/androidTest/AndroidManifest\.xml:[0-9]+:[0-9]+\-[0-9]+:[0-9]+ Warning:
\ No newline at end of file

diff --git a/dynamic-animation/OWNERS b/dynamicanimation/OWNERS
similarity index 100%
rename from dynamic-animation/OWNERS
rename to dynamicanimation/OWNERS

diff --git a/dynamic-animation/dynamic-animation-ktx/api/current.txt b/dynamicanimation/dynamicanimation-ktx/api/current.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/api/current.txt
rename to dynamicanimation/dynamicanimation-ktx/api/current.txt

diff --git a/dynamic-animation/dynamic-animation-ktx/api/public_plus_experimental_current.txt b/dynamicanimation/dynamicanimation-ktx/api/public_plus_experimental_current.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/api/public_plus_experimental_current.txt
rename to dynamicanimation/dynamicanimation-ktx/api/public_plus_experimental_current.txt

diff --git a/dynamic-animation/dynamic-animation-ktx/api/res-current.txt b/dynamicanimation/dynamicanimation-ktx/api/res-current.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/api/res-current.txt
rename to dynamicanimation/dynamicanimation-ktx/api/res-current.txt

diff --git a/dynamic-animation/dynamic-animation-ktx/api/restricted_current.txt b/dynamicanimation/dynamicanimation-ktx/api/restricted_current.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/api/restricted_current.txt
rename to dynamicanimation/dynamicanimation-ktx/api/restricted_current.txt

diff --git a/dynamic-animation/dynamic-animation-ktx/build.gradle b/dynamicanimation/dynamicanimation-ktx/build.gradle
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/build.gradle
rename to dynamicanimation/dynamicanimation-ktx/build.gradle

diff --git a/dynamic-animation/dynamic-animation-ktx/src/androidTest/AndroidManifest.xml b/dynamicanimation/dynamicanimation-ktx/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/src/androidTest/AndroidManifest.xml
rename to dynamicanimation/dynamicanimation-ktx/src/androidTest/AndroidManifest.xml

diff --git a/dynamic-animation/dynamic-animation-ktx/src/androidTest/java/androidx/dynamicanimation/tests/AnimationActivity.java b/dynamicanimation/dynamicanimation-ktx/src/androidTest/java/androidx/dynamicanimation/tests/AnimationActivity.java
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/src/androidTest/java/androidx/dynamicanimation/tests/AnimationActivity.java
rename to dynamicanimation/dynamicanimation-ktx/src/androidTest/java/androidx/dynamicanimation/tests/AnimationActivity.java

diff --git a/dynamic-animation/dynamic-animation-ktx/src/androidTest/java/androidx/dynamicanimation/tests/DynamicAnimationTest.kt b/dynamicanimation/dynamicanimation-ktx/src/androidTest/java/androidx/dynamicanimation/tests/DynamicAnimationTest.kt
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/src/androidTest/java/androidx/dynamicanimation/tests/DynamicAnimationTest.kt
rename to dynamicanimation/dynamicanimation-ktx/src/androidTest/java/androidx/dynamicanimation/tests/DynamicAnimationTest.kt

diff --git a/dynamic-animation/dynamic-animation-ktx/src/androidTest/res/layout/anim_layout.xml b/dynamicanimation/dynamicanimation-ktx/src/androidTest/res/layout/anim_layout.xml
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/src/androidTest/res/layout/anim_layout.xml
rename to dynamicanimation/dynamicanimation-ktx/src/androidTest/res/layout/anim_layout.xml

diff --git a/dynamic-animation/dynamic-animation-ktx/src/main/AndroidManifest.xml b/dynamicanimation/dynamicanimation-ktx/src/main/AndroidManifest.xml
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/src/main/AndroidManifest.xml
rename to dynamicanimation/dynamicanimation-ktx/src/main/AndroidManifest.xml

diff --git a/dynamic-animation/dynamic-animation-ktx/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.kt b/dynamicanimation/dynamicanimation-ktx/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.kt
similarity index 100%
rename from dynamic-animation/dynamic-animation-ktx/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.kt
rename to dynamicanimation/dynamicanimation-ktx/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.kt

diff --git a/dynamic-animation/dynamic-animation/api/0.0.0.txt b/dynamicanimation/dynamicanimation/api/0.0.0.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/0.0.0.txt
rename to dynamicanimation/dynamicanimation/api/0.0.0.txt

diff --git a/dynamic-animation/dynamic-animation/api/1.0.0.txt b/dynamicanimation/dynamicanimation/api/1.0.0.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/1.0.0.txt
rename to dynamicanimation/dynamicanimation/api/1.0.0.txt

diff --git a/dynamic-animation/dynamic-animation/api/api_lint.ignore b/dynamicanimation/dynamicanimation/api/api_lint.ignore
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/api_lint.ignore
rename to dynamicanimation/dynamicanimation/api/api_lint.ignore

diff --git a/dynamic-animation/dynamic-animation/api/current.txt b/dynamicanimation/dynamicanimation/api/current.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/current.txt
rename to dynamicanimation/dynamicanimation/api/current.txt

diff --git a/dynamic-animation/dynamic-animation/api/public_plus_experimental_1.0.0.txt b/dynamicanimation/dynamicanimation/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/public_plus_experimental_1.0.0.txt
rename to dynamicanimation/dynamicanimation/api/public_plus_experimental_1.0.0.txt

diff --git a/dynamic-animation/dynamic-animation/api/public_plus_experimental_current.txt b/dynamicanimation/dynamicanimation/api/public_plus_experimental_current.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/public_plus_experimental_current.txt
rename to dynamicanimation/dynamicanimation/api/public_plus_experimental_current.txt

diff --git a/dynamic-animation/dynamic-animation/api/res-1.0.0.txt b/dynamicanimation/dynamicanimation/api/res-1.0.0.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/res-1.0.0.txt
rename to dynamicanimation/dynamicanimation/api/res-1.0.0.txt

diff --git a/dynamic-animation/dynamic-animation/api/res-current.txt b/dynamicanimation/dynamicanimation/api/res-current.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/res-current.txt
rename to dynamicanimation/dynamicanimation/api/res-current.txt

diff --git a/dynamic-animation/dynamic-animation/api/restricted_1.0.0.txt b/dynamicanimation/dynamicanimation/api/restricted_1.0.0.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/restricted_1.0.0.txt
rename to dynamicanimation/dynamicanimation/api/restricted_1.0.0.txt

diff --git a/dynamic-animation/dynamic-animation/api/restricted_current.txt b/dynamicanimation/dynamicanimation/api/restricted_current.txt
similarity index 100%
rename from dynamic-animation/dynamic-animation/api/restricted_current.txt
rename to dynamicanimation/dynamicanimation/api/restricted_current.txt

diff --git a/dynamic-animation/dynamic-animation/build.gradle b/dynamicanimation/dynamicanimation/build.gradle
similarity index 100%
rename from dynamic-animation/dynamic-animation/build.gradle
rename to dynamicanimation/dynamicanimation/build.gradle

diff --git a/dynamic-animation/dynamic-animation/lint-baseline.xml b/dynamicanimation/dynamicanimation/lint-baseline.xml
similarity index 100%
rename from dynamic-animation/dynamic-animation/lint-baseline.xml
rename to dynamicanimation/dynamicanimation/lint-baseline.xml

diff --git a/dynamic-animation/dynamic-animation/src/androidTest/AndroidManifest.xml b/dynamicanimation/dynamicanimation/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/androidTest/AndroidManifest.xml
rename to dynamicanimation/dynamicanimation/src/androidTest/AndroidManifest.xml

diff --git a/dynamic-animation/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/AnimationActivity.java b/dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/AnimationActivity.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/AnimationActivity.java
rename to dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/AnimationActivity.java

diff --git a/dynamic-animation/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java b/dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java
rename to dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java

diff --git a/dynamic-animation/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java b/dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
rename to dynamicanimation/dynamicanimation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java

diff --git a/dynamic-animation/dynamic-animation/src/androidTest/res/layout/anim_layout.xml b/dynamicanimation/dynamicanimation/src/androidTest/res/layout/anim_layout.xml
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/androidTest/res/layout/anim_layout.xml
rename to dynamicanimation/dynamicanimation/src/androidTest/res/layout/anim_layout.xml

diff --git a/dynamic-animation/dynamic-animation/src/main/AndroidManifest.xml b/dynamicanimation/dynamicanimation/src/main/AndroidManifest.xml
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/main/AndroidManifest.xml
rename to dynamicanimation/dynamicanimation/src/main/AndroidManifest.xml

diff --git a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java b/dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java
rename to dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java

diff --git a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java b/dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java
rename to dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java

diff --git a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java b/dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java
rename to dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java

diff --git a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java b/dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java
rename to dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java

diff --git a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FloatValueHolder.java b/dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/FloatValueHolder.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FloatValueHolder.java
rename to dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/FloatValueHolder.java

diff --git a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/Force.java b/dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/Force.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/Force.java
rename to dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/Force.java

diff --git a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java b/dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java
rename to dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java

diff --git a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/SpringForce.java b/dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/SpringForce.java
similarity index 100%
rename from dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/SpringForce.java
rename to dynamicanimation/dynamicanimation/src/main/java/androidx/dynamicanimation/animation/SpringForce.java

diff --git a/emoji/appcompat/api/0.0.0.txt b/emoji/emoji-appcompat/api/0.0.0.txt
similarity index 100%
rename from emoji/appcompat/api/0.0.0.txt
rename to emoji/emoji-appcompat/api/0.0.0.txt

diff --git a/emoji/appcompat/api/1.0.0.txt b/emoji/emoji-appcompat/api/1.0.0.txt
similarity index 100%
rename from emoji/appcompat/api/1.0.0.txt
rename to emoji/emoji-appcompat/api/1.0.0.txt

diff --git a/emoji/appcompat/api/1.1.0-beta01.txt b/emoji/emoji-appcompat/api/1.1.0-beta01.txt
similarity index 100%
rename from emoji/appcompat/api/1.1.0-beta01.txt
rename to emoji/emoji-appcompat/api/1.1.0-beta01.txt

diff --git a/emoji/appcompat/api/1.1.0-rc01.txt b/emoji/emoji-appcompat/api/1.1.0-rc01.txt
similarity index 100%
rename from emoji/appcompat/api/1.1.0-rc01.txt
rename to emoji/emoji-appcompat/api/1.1.0-rc01.txt

diff --git a/emoji/appcompat/api/api_lint.ignore b/emoji/emoji-appcompat/api/api_lint.ignore
similarity index 100%
rename from emoji/appcompat/api/api_lint.ignore
rename to emoji/emoji-appcompat/api/api_lint.ignore

diff --git a/emoji/appcompat/api/current.txt b/emoji/emoji-appcompat/api/current.txt
similarity index 100%
rename from emoji/appcompat/api/current.txt
rename to emoji/emoji-appcompat/api/current.txt

diff --git a/emoji/appcompat/api/public_plus_experimental_1.0.0.txt b/emoji/emoji-appcompat/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from emoji/appcompat/api/public_plus_experimental_1.0.0.txt
rename to emoji/emoji-appcompat/api/public_plus_experimental_1.0.0.txt

diff --git a/emoji/appcompat/api/public_plus_experimental_1.1.0-beta01.txt b/emoji/emoji-appcompat/api/public_plus_experimental_1.1.0-beta01.txt
similarity index 100%
rename from emoji/appcompat/api/public_plus_experimental_1.1.0-beta01.txt
rename to emoji/emoji-appcompat/api/public_plus_experimental_1.1.0-beta01.txt

diff --git a/emoji/appcompat/api/public_plus_experimental_1.1.0-rc01.txt b/emoji/emoji-appcompat/api/public_plus_experimental_1.1.0-rc01.txt
similarity index 100%
rename from emoji/appcompat/api/public_plus_experimental_1.1.0-rc01.txt
rename to emoji/emoji-appcompat/api/public_plus_experimental_1.1.0-rc01.txt

diff --git a/emoji/appcompat/api/public_plus_experimental_current.txt b/emoji/emoji-appcompat/api/public_plus_experimental_current.txt
similarity index 100%
rename from emoji/appcompat/api/public_plus_experimental_current.txt
rename to emoji/emoji-appcompat/api/public_plus_experimental_current.txt

diff --git a/emoji/appcompat/api/res-1.0.0.txt b/emoji/emoji-appcompat/api/res-1.0.0.txt
similarity index 100%
rename from emoji/appcompat/api/res-1.0.0.txt
rename to emoji/emoji-appcompat/api/res-1.0.0.txt

diff --git a/emoji/appcompat/api/res-1.1.0-beta01.txt b/emoji/emoji-appcompat/api/res-1.1.0-beta01.txt
similarity index 100%
rename from emoji/appcompat/api/res-1.1.0-beta01.txt
rename to emoji/emoji-appcompat/api/res-1.1.0-beta01.txt

diff --git a/emoji/appcompat/api/res-1.1.0-rc01.txt b/emoji/emoji-appcompat/api/res-1.1.0-rc01.txt
similarity index 100%
rename from emoji/appcompat/api/res-1.1.0-rc01.txt
rename to emoji/emoji-appcompat/api/res-1.1.0-rc01.txt

diff --git a/emoji/appcompat/api/res-current.txt b/emoji/emoji-appcompat/api/res-current.txt
similarity index 100%
rename from emoji/appcompat/api/res-current.txt
rename to emoji/emoji-appcompat/api/res-current.txt

diff --git a/emoji/appcompat/api/restricted_1.0.0.txt b/emoji/emoji-appcompat/api/restricted_1.0.0.txt
similarity index 100%
rename from emoji/appcompat/api/restricted_1.0.0.txt
rename to emoji/emoji-appcompat/api/restricted_1.0.0.txt

diff --git a/emoji/appcompat/api/restricted_1.1.0-beta01.txt b/emoji/emoji-appcompat/api/restricted_1.1.0-beta01.txt
similarity index 100%
rename from emoji/appcompat/api/restricted_1.1.0-beta01.txt
rename to emoji/emoji-appcompat/api/restricted_1.1.0-beta01.txt

diff --git a/emoji/appcompat/api/restricted_1.1.0-rc01.txt b/emoji/emoji-appcompat/api/restricted_1.1.0-rc01.txt
similarity index 100%
rename from emoji/appcompat/api/restricted_1.1.0-rc01.txt
rename to emoji/emoji-appcompat/api/restricted_1.1.0-rc01.txt

diff --git a/emoji/appcompat/api/restricted_current.txt b/emoji/emoji-appcompat/api/restricted_current.txt
similarity index 100%
rename from emoji/appcompat/api/restricted_current.txt
rename to emoji/emoji-appcompat/api/restricted_current.txt

diff --git a/emoji/appcompat/build.gradle b/emoji/emoji-appcompat/build.gradle
similarity index 100%
rename from emoji/appcompat/build.gradle
rename to emoji/emoji-appcompat/build.gradle

diff --git a/emoji/appcompat/lint-baseline.xml b/emoji/emoji-appcompat/lint-baseline.xml
similarity index 100%
rename from emoji/appcompat/lint-baseline.xml
rename to emoji/emoji-appcompat/lint-baseline.xml

diff --git a/emoji/appcompat/src/main/AndroidManifest.xml b/emoji/emoji-appcompat/src/main/AndroidManifest.xml
similarity index 100%
rename from emoji/appcompat/src/main/AndroidManifest.xml
rename to emoji/emoji-appcompat/src/main/AndroidManifest.xml

diff --git a/emoji/appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java b/emoji/emoji-appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java
similarity index 100%
rename from emoji/appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java
rename to emoji/emoji-appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java

diff --git a/emoji/appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java b/emoji/emoji-appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java
similarity index 100%
rename from emoji/appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java
rename to emoji/emoji-appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java

diff --git a/emoji/appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java b/emoji/emoji-appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java
similarity index 100%
rename from emoji/appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java
rename to emoji/emoji-appcompat/src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java

diff --git a/emoji/bundled/api/0.0.0.txt b/emoji/emoji-bundled/api/0.0.0.txt
similarity index 100%
rename from emoji/bundled/api/0.0.0.txt
rename to emoji/emoji-bundled/api/0.0.0.txt

diff --git a/emoji/bundled/api/1.0.0.txt b/emoji/emoji-bundled/api/1.0.0.txt
similarity index 100%
rename from emoji/bundled/api/1.0.0.txt
rename to emoji/emoji-bundled/api/1.0.0.txt

diff --git a/emoji/bundled/api/1.1.0-beta01.txt b/emoji/emoji-bundled/api/1.1.0-beta01.txt
similarity index 100%
rename from emoji/bundled/api/1.1.0-beta01.txt
rename to emoji/emoji-bundled/api/1.1.0-beta01.txt

diff --git a/emoji/bundled/api/1.1.0-rc01.txt b/emoji/emoji-bundled/api/1.1.0-rc01.txt
similarity index 100%
rename from emoji/bundled/api/1.1.0-rc01.txt
rename to emoji/emoji-bundled/api/1.1.0-rc01.txt

diff --git a/emoji/bundled/api/current.txt b/emoji/emoji-bundled/api/current.txt
similarity index 100%
rename from emoji/bundled/api/current.txt
rename to emoji/emoji-bundled/api/current.txt

diff --git a/emoji/bundled/api/public_plus_experimental_1.0.0.txt b/emoji/emoji-bundled/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from emoji/bundled/api/public_plus_experimental_1.0.0.txt
rename to emoji/emoji-bundled/api/public_plus_experimental_1.0.0.txt

diff --git a/emoji/bundled/api/public_plus_experimental_1.1.0-beta01.txt b/emoji/emoji-bundled/api/public_plus_experimental_1.1.0-beta01.txt
similarity index 100%
rename from emoji/bundled/api/public_plus_experimental_1.1.0-beta01.txt
rename to emoji/emoji-bundled/api/public_plus_experimental_1.1.0-beta01.txt

diff --git a/emoji/bundled/api/public_plus_experimental_1.1.0-rc01.txt b/emoji/emoji-bundled/api/public_plus_experimental_1.1.0-rc01.txt
similarity index 100%
rename from emoji/bundled/api/public_plus_experimental_1.1.0-rc01.txt
rename to emoji/emoji-bundled/api/public_plus_experimental_1.1.0-rc01.txt

diff --git a/emoji/bundled/api/public_plus_experimental_current.txt b/emoji/emoji-bundled/api/public_plus_experimental_current.txt
similarity index 100%
rename from emoji/bundled/api/public_plus_experimental_current.txt
rename to emoji/emoji-bundled/api/public_plus_experimental_current.txt

diff --git a/emoji/bundled/api/res-1.0.0.txt b/emoji/emoji-bundled/api/res-1.0.0.txt
similarity index 100%
rename from emoji/bundled/api/res-1.0.0.txt
rename to emoji/emoji-bundled/api/res-1.0.0.txt

diff --git a/emoji/bundled/api/res-1.1.0-beta01.txt b/emoji/emoji-bundled/api/res-1.1.0-beta01.txt
similarity index 100%
rename from emoji/bundled/api/res-1.1.0-beta01.txt
rename to emoji/emoji-bundled/api/res-1.1.0-beta01.txt

diff --git a/emoji/bundled/api/res-1.1.0-rc01.txt b/emoji/emoji-bundled/api/res-1.1.0-rc01.txt
similarity index 100%
rename from emoji/bundled/api/res-1.1.0-rc01.txt
rename to emoji/emoji-bundled/api/res-1.1.0-rc01.txt

diff --git a/emoji/bundled/api/res-current.txt b/emoji/emoji-bundled/api/res-current.txt
similarity index 100%
rename from emoji/bundled/api/res-current.txt
rename to emoji/emoji-bundled/api/res-current.txt

diff --git a/emoji/bundled/api/restricted_1.0.0.txt b/emoji/emoji-bundled/api/restricted_1.0.0.txt
similarity index 100%
rename from emoji/bundled/api/restricted_1.0.0.txt
rename to emoji/emoji-bundled/api/restricted_1.0.0.txt

diff --git a/emoji/bundled/api/restricted_1.1.0-beta01.txt b/emoji/emoji-bundled/api/restricted_1.1.0-beta01.txt
similarity index 100%
rename from emoji/bundled/api/restricted_1.1.0-beta01.txt
rename to emoji/emoji-bundled/api/restricted_1.1.0-beta01.txt

diff --git a/emoji/bundled/api/restricted_1.1.0-rc01.txt b/emoji/emoji-bundled/api/restricted_1.1.0-rc01.txt
similarity index 100%
rename from emoji/bundled/api/restricted_1.1.0-rc01.txt
rename to emoji/emoji-bundled/api/restricted_1.1.0-rc01.txt

diff --git a/emoji/bundled/api/restricted_current.txt b/emoji/emoji-bundled/api/restricted_current.txt
similarity index 100%
rename from emoji/bundled/api/restricted_current.txt
rename to emoji/emoji-bundled/api/restricted_current.txt

diff --git a/emoji/bundled/build.gradle b/emoji/emoji-bundled/build.gradle
similarity index 100%
rename from emoji/bundled/build.gradle
rename to emoji/emoji-bundled/build.gradle

diff --git a/emoji/bundled/src/main/AndroidManifest.xml b/emoji/emoji-bundled/src/main/AndroidManifest.xml
similarity index 100%
rename from emoji/bundled/src/main/AndroidManifest.xml
rename to emoji/emoji-bundled/src/main/AndroidManifest.xml

diff --git a/emoji/bundled/src/main/java/androidx/emoji/bundled/BundledEmojiCompatConfig.java b/emoji/emoji-bundled/src/main/java/androidx/emoji/bundled/BundledEmojiCompatConfig.java
similarity index 100%
rename from emoji/bundled/src/main/java/androidx/emoji/bundled/BundledEmojiCompatConfig.java
rename to emoji/emoji-bundled/src/main/java/androidx/emoji/bundled/BundledEmojiCompatConfig.java

diff --git a/emoji/core/AndroidManifest.xml b/emoji/emoji/AndroidManifest.xml
similarity index 100%
rename from emoji/core/AndroidManifest.xml
rename to emoji/emoji/AndroidManifest.xml

diff --git a/emoji/core/api/0.0.0.txt b/emoji/emoji/api/0.0.0.txt
similarity index 100%
rename from emoji/core/api/0.0.0.txt
rename to emoji/emoji/api/0.0.0.txt

diff --git a/emoji/core/api/1.0.0.txt b/emoji/emoji/api/1.0.0.txt
similarity index 100%
rename from emoji/core/api/1.0.0.txt
rename to emoji/emoji/api/1.0.0.txt

diff --git a/emoji/core/api/1.1.0-beta01.txt b/emoji/emoji/api/1.1.0-beta01.txt
similarity index 100%
rename from emoji/core/api/1.1.0-beta01.txt
rename to emoji/emoji/api/1.1.0-beta01.txt

diff --git a/emoji/core/api/1.1.0-rc01.txt b/emoji/emoji/api/1.1.0-rc01.txt
similarity index 100%
rename from emoji/core/api/1.1.0-rc01.txt
rename to emoji/emoji/api/1.1.0-rc01.txt

diff --git a/emoji/core/api/api_lint.ignore b/emoji/emoji/api/api_lint.ignore
similarity index 100%
rename from emoji/core/api/api_lint.ignore
rename to emoji/emoji/api/api_lint.ignore

diff --git a/emoji/core/api/current.txt b/emoji/emoji/api/current.txt
similarity index 100%
rename from emoji/core/api/current.txt
rename to emoji/emoji/api/current.txt

diff --git a/emoji/core/api/public_plus_experimental_1.0.0.txt b/emoji/emoji/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from emoji/core/api/public_plus_experimental_1.0.0.txt
rename to emoji/emoji/api/public_plus_experimental_1.0.0.txt

diff --git a/emoji/core/api/public_plus_experimental_1.1.0-beta01.txt b/emoji/emoji/api/public_plus_experimental_1.1.0-beta01.txt
similarity index 100%
rename from emoji/core/api/public_plus_experimental_1.1.0-beta01.txt
rename to emoji/emoji/api/public_plus_experimental_1.1.0-beta01.txt

diff --git a/emoji/core/api/public_plus_experimental_1.1.0-rc01.txt b/emoji/emoji/api/public_plus_experimental_1.1.0-rc01.txt
similarity index 100%
rename from emoji/core/api/public_plus_experimental_1.1.0-rc01.txt
rename to emoji/emoji/api/public_plus_experimental_1.1.0-rc01.txt

diff --git a/emoji/core/api/public_plus_experimental_current.txt b/emoji/emoji/api/public_plus_experimental_current.txt
similarity index 100%
rename from emoji/core/api/public_plus_experimental_current.txt
rename to emoji/emoji/api/public_plus_experimental_current.txt

diff --git a/emoji/core/api/res-1.0.0.txt b/emoji/emoji/api/res-1.0.0.txt
similarity index 100%
rename from emoji/core/api/res-1.0.0.txt
rename to emoji/emoji/api/res-1.0.0.txt

diff --git a/emoji/core/api/res-1.1.0-beta01.txt b/emoji/emoji/api/res-1.1.0-beta01.txt
similarity index 100%
rename from emoji/core/api/res-1.1.0-beta01.txt
rename to emoji/emoji/api/res-1.1.0-beta01.txt

diff --git a/emoji/core/api/res-1.1.0-rc01.txt b/emoji/emoji/api/res-1.1.0-rc01.txt
similarity index 100%
rename from emoji/core/api/res-1.1.0-rc01.txt
rename to emoji/emoji/api/res-1.1.0-rc01.txt

diff --git a/emoji/core/api/res-current.txt b/emoji/emoji/api/res-current.txt
similarity index 100%
rename from emoji/core/api/res-current.txt
rename to emoji/emoji/api/res-current.txt

diff --git a/emoji/core/api/restricted_1.0.0.txt b/emoji/emoji/api/restricted_1.0.0.txt
similarity index 100%
rename from emoji/core/api/restricted_1.0.0.txt
rename to emoji/emoji/api/restricted_1.0.0.txt

diff --git a/emoji/core/api/restricted_1.1.0-beta01.txt b/emoji/emoji/api/restricted_1.1.0-beta01.txt
similarity index 100%
rename from emoji/core/api/restricted_1.1.0-beta01.txt
rename to emoji/emoji/api/restricted_1.1.0-beta01.txt

diff --git a/emoji/core/api/restricted_1.1.0-rc01.txt b/emoji/emoji/api/restricted_1.1.0-rc01.txt
similarity index 100%
rename from emoji/core/api/restricted_1.1.0-rc01.txt
rename to emoji/emoji/api/restricted_1.1.0-rc01.txt

diff --git a/emoji/core/api/restricted_current.txt b/emoji/emoji/api/restricted_current.txt
similarity index 100%
rename from emoji/core/api/restricted_current.txt
rename to emoji/emoji/api/restricted_current.txt

diff --git a/emoji/core/build.gradle b/emoji/emoji/build.gradle
similarity index 100%
rename from emoji/core/build.gradle
rename to emoji/emoji/build.gradle

diff --git a/emoji/core/lint-baseline.xml b/emoji/emoji/lint-baseline.xml
similarity index 100%
rename from emoji/core/lint-baseline.xml
rename to emoji/emoji/lint-baseline.xml

diff --git a/emoji/core/src/androidTest/AndroidManifest.xml b/emoji/emoji/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from emoji/core/src/androidTest/AndroidManifest.xml
rename to emoji/emoji/src/androidTest/AndroidManifest.xml

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/ConfigTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/ConfigTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/TestActivity.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/TestActivity.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/TestActivity.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/TestActivity.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/TestEmojiMetadata.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/TestEmojiMetadata.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/TestEmojiMetadata.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/TestEmojiMetadata.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/util/Emoji.java b/emoji/emoji/src/androidTest/java/androidx/emoji/util/Emoji.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/util/Emoji.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/util/Emoji.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/util/EmojiMatcher.java b/emoji/emoji/src/androidTest/java/androidx/emoji/util/EmojiMatcher.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/util/EmojiMatcher.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/util/EmojiMatcher.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/util/KeyboardUtil.java b/emoji/emoji/src/androidTest/java/androidx/emoji/util/KeyboardUtil.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/util/KeyboardUtil.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/util/KeyboardUtil.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/util/TestString.java b/emoji/emoji/src/androidTest/java/androidx/emoji/util/TestString.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/util/TestString.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/util/TestString.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java b/emoji/emoji/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java
similarity index 100%
rename from emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java
rename to emoji/emoji/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java

diff --git a/emoji/core/src/androidTest/res/layout/activity_default.xml b/emoji/emoji/src/androidTest/res/layout/activity_default.xml
similarity index 100%
rename from emoji/core/src/androidTest/res/layout/activity_default.xml
rename to emoji/emoji/src/androidTest/res/layout/activity_default.xml

diff --git a/emoji/core/src/androidTest/res/layout/extract_view.xml b/emoji/emoji/src/androidTest/res/layout/extract_view.xml
similarity index 100%
rename from emoji/core/src/androidTest/res/layout/extract_view.xml
rename to emoji/emoji/src/androidTest/res/layout/extract_view.xml

diff --git a/emoji/core/src/androidTest/res/layout/extract_view_with_attrs.xml b/emoji/emoji/src/androidTest/res/layout/extract_view_with_attrs.xml
similarity index 100%
rename from emoji/core/src/androidTest/res/layout/extract_view_with_attrs.xml
rename to emoji/emoji/src/androidTest/res/layout/extract_view_with_attrs.xml

diff --git a/emoji/core/src/main/java/androidx/emoji/text/EmojiCompat.java b/emoji/emoji/src/main/java/androidx/emoji/text/EmojiCompat.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/text/EmojiCompat.java
rename to emoji/emoji/src/main/java/androidx/emoji/text/EmojiCompat.java

diff --git a/emoji/core/src/main/java/androidx/emoji/text/EmojiMetadata.java b/emoji/emoji/src/main/java/androidx/emoji/text/EmojiMetadata.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/text/EmojiMetadata.java
rename to emoji/emoji/src/main/java/androidx/emoji/text/EmojiMetadata.java

diff --git a/emoji/core/src/main/java/androidx/emoji/text/EmojiProcessor.java b/emoji/emoji/src/main/java/androidx/emoji/text/EmojiProcessor.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/text/EmojiProcessor.java
rename to emoji/emoji/src/main/java/androidx/emoji/text/EmojiProcessor.java

diff --git a/emoji/core/src/main/java/androidx/emoji/text/EmojiSpan.java b/emoji/emoji/src/main/java/androidx/emoji/text/EmojiSpan.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/text/EmojiSpan.java
rename to emoji/emoji/src/main/java/androidx/emoji/text/EmojiSpan.java

diff --git a/emoji/core/src/main/java/androidx/emoji/text/FontRequestEmojiCompatConfig.java b/emoji/emoji/src/main/java/androidx/emoji/text/FontRequestEmojiCompatConfig.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/text/FontRequestEmojiCompatConfig.java
rename to emoji/emoji/src/main/java/androidx/emoji/text/FontRequestEmojiCompatConfig.java

diff --git a/emoji/core/src/main/java/androidx/emoji/text/MetadataListReader.java b/emoji/emoji/src/main/java/androidx/emoji/text/MetadataListReader.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/text/MetadataListReader.java
rename to emoji/emoji/src/main/java/androidx/emoji/text/MetadataListReader.java

diff --git a/emoji/core/src/main/java/androidx/emoji/text/MetadataRepo.java b/emoji/emoji/src/main/java/androidx/emoji/text/MetadataRepo.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/text/MetadataRepo.java
rename to emoji/emoji/src/main/java/androidx/emoji/text/MetadataRepo.java

diff --git a/emoji/core/src/main/java/androidx/emoji/text/TypefaceEmojiSpan.java b/emoji/emoji/src/main/java/androidx/emoji/text/TypefaceEmojiSpan.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/text/TypefaceEmojiSpan.java
rename to emoji/emoji/src/main/java/androidx/emoji/text/TypefaceEmojiSpan.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EditTextAttributeHelper.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EditTextAttributeHelper.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EditTextAttributeHelper.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EditTextAttributeHelper.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiButton.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiButton.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiButton.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiButton.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiEditText.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiEditText.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiEditText.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiEditText.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiEditTextHelper.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiEditTextHelper.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiEditTextHelper.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiEditTextHelper.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiEditableFactory.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiEditableFactory.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiEditableFactory.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiEditableFactory.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiExtractEditText.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiExtractEditText.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiExtractEditText.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiExtractEditText.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiExtractTextLayout.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiExtractTextLayout.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiExtractTextLayout.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiExtractTextLayout.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiInputConnection.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiInputConnection.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiInputConnection.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiInputConnection.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiInputFilter.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiInputFilter.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiInputFilter.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiInputFilter.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiKeyListener.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiKeyListener.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiKeyListener.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiKeyListener.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiTextView.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiTextView.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiTextView.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiTextView.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiTextViewHelper.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiTextViewHelper.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiTextViewHelper.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiTextViewHelper.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiTextWatcher.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiTextWatcher.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiTextWatcher.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiTextWatcher.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/EmojiTransformationMethod.java b/emoji/emoji/src/main/java/androidx/emoji/widget/EmojiTransformationMethod.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/EmojiTransformationMethod.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/EmojiTransformationMethod.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/ExtractButtonCompat.java b/emoji/emoji/src/main/java/androidx/emoji/widget/ExtractButtonCompat.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/ExtractButtonCompat.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/ExtractButtonCompat.java

diff --git a/emoji/core/src/main/java/androidx/emoji/widget/SpannableBuilder.java b/emoji/emoji/src/main/java/androidx/emoji/widget/SpannableBuilder.java
similarity index 100%
rename from emoji/core/src/main/java/androidx/emoji/widget/SpannableBuilder.java
rename to emoji/emoji/src/main/java/androidx/emoji/widget/SpannableBuilder.java

diff --git a/emoji/core/src/main/res-public/values/public_attrs.xml b/emoji/emoji/src/main/res-public/values/public_attrs.xml
similarity index 100%
rename from emoji/core/src/main/res-public/values/public_attrs.xml
rename to emoji/emoji/src/main/res-public/values/public_attrs.xml

diff --git a/emoji/core/src/main/res/layout/input_method_extract_view.xml b/emoji/emoji/src/main/res/layout/input_method_extract_view.xml
similarity index 100%
rename from emoji/core/src/main/res/layout/input_method_extract_view.xml
rename to emoji/emoji/src/main/res/layout/input_method_extract_view.xml

diff --git a/emoji/core/src/main/res/values/attrs.xml b/emoji/emoji/src/main/res/values/attrs.xml
similarity index 100%
rename from emoji/core/src/main/res/values/attrs.xml
rename to emoji/emoji/src/main/res/values/attrs.xml

diff --git a/enterprise/feedback/testing/api/1.0.0-beta01.txt b/enterprise/enterprise-feedback-testing/api/1.0.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/1.0.0-beta01.txt
rename to enterprise/enterprise-feedback-testing/api/1.0.0-beta01.txt

diff --git a/enterprise/feedback/testing/api/1.0.0-beta02.txt b/enterprise/enterprise-feedback-testing/api/1.0.0-beta02.txt
similarity index 100%
rename from enterprise/feedback/testing/api/1.0.0-beta02.txt
rename to enterprise/enterprise-feedback-testing/api/1.0.0-beta02.txt

diff --git a/enterprise/feedback/testing/api/1.0.0-rc01.txt b/enterprise/enterprise-feedback-testing/api/1.0.0-rc01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/1.0.0-rc01.txt
rename to enterprise/enterprise-feedback-testing/api/1.0.0-rc01.txt

diff --git a/enterprise/feedback/testing/api/1.1.0-beta01.txt b/enterprise/enterprise-feedback-testing/api/1.1.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/1.1.0-beta01.txt
rename to enterprise/enterprise-feedback-testing/api/1.1.0-beta01.txt

diff --git a/enterprise/feedback/testing/api/api_lint.ignore b/enterprise/enterprise-feedback-testing/api/api_lint.ignore
similarity index 100%
rename from enterprise/feedback/testing/api/api_lint.ignore
rename to enterprise/enterprise-feedback-testing/api/api_lint.ignore

diff --git a/enterprise/feedback/testing/api/current.txt b/enterprise/enterprise-feedback-testing/api/current.txt
similarity index 100%
rename from enterprise/feedback/testing/api/current.txt
rename to enterprise/enterprise-feedback-testing/api/current.txt

diff --git a/enterprise/feedback/testing/api/public_plus_experimental_1.0.0-beta01.txt b/enterprise/enterprise-feedback-testing/api/public_plus_experimental_1.0.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/public_plus_experimental_1.0.0-beta01.txt
rename to enterprise/enterprise-feedback-testing/api/public_plus_experimental_1.0.0-beta01.txt

diff --git a/enterprise/feedback/testing/api/public_plus_experimental_1.0.0-beta02.txt b/enterprise/enterprise-feedback-testing/api/public_plus_experimental_1.0.0-beta02.txt
similarity index 100%
rename from enterprise/feedback/testing/api/public_plus_experimental_1.0.0-beta02.txt
rename to enterprise/enterprise-feedback-testing/api/public_plus_experimental_1.0.0-beta02.txt

diff --git a/enterprise/feedback/testing/api/public_plus_experimental_1.0.0-rc01.txt b/enterprise/enterprise-feedback-testing/api/public_plus_experimental_1.0.0-rc01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/public_plus_experimental_1.0.0-rc01.txt
rename to enterprise/enterprise-feedback-testing/api/public_plus_experimental_1.0.0-rc01.txt

diff --git a/enterprise/feedback/testing/api/public_plus_experimental_1.1.0-beta01.txt b/enterprise/enterprise-feedback-testing/api/public_plus_experimental_1.1.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/public_plus_experimental_1.1.0-beta01.txt
rename to enterprise/enterprise-feedback-testing/api/public_plus_experimental_1.1.0-beta01.txt

diff --git a/enterprise/feedback/testing/api/public_plus_experimental_current.txt b/enterprise/enterprise-feedback-testing/api/public_plus_experimental_current.txt
similarity index 100%
rename from enterprise/feedback/testing/api/public_plus_experimental_current.txt
rename to enterprise/enterprise-feedback-testing/api/public_plus_experimental_current.txt

diff --git a/enterprise/feedback/testing/api/res-1.0.0-beta01.txt b/enterprise/enterprise-feedback-testing/api/res-1.0.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/res-1.0.0-beta01.txt
rename to enterprise/enterprise-feedback-testing/api/res-1.0.0-beta01.txt

diff --git a/enterprise/feedback/testing/api/res-1.0.0-beta02.txt b/enterprise/enterprise-feedback-testing/api/res-1.0.0-beta02.txt
similarity index 100%
rename from enterprise/feedback/testing/api/res-1.0.0-beta02.txt
rename to enterprise/enterprise-feedback-testing/api/res-1.0.0-beta02.txt

diff --git a/enterprise/feedback/testing/api/res-1.0.0-rc01.txt b/enterprise/enterprise-feedback-testing/api/res-1.0.0-rc01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/res-1.0.0-rc01.txt
rename to enterprise/enterprise-feedback-testing/api/res-1.0.0-rc01.txt

diff --git a/enterprise/feedback/testing/api/res-1.1.0-beta01.txt b/enterprise/enterprise-feedback-testing/api/res-1.1.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/res-1.1.0-beta01.txt
rename to enterprise/enterprise-feedback-testing/api/res-1.1.0-beta01.txt

diff --git a/enterprise/feedback/testing/api/res-current.txt b/enterprise/enterprise-feedback-testing/api/res-current.txt
similarity index 100%
rename from enterprise/feedback/testing/api/res-current.txt
rename to enterprise/enterprise-feedback-testing/api/res-current.txt

diff --git a/enterprise/feedback/testing/api/restricted_1.0.0-beta01.txt b/enterprise/enterprise-feedback-testing/api/restricted_1.0.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/restricted_1.0.0-beta01.txt
rename to enterprise/enterprise-feedback-testing/api/restricted_1.0.0-beta01.txt

diff --git a/enterprise/feedback/testing/api/restricted_1.0.0-beta02.txt b/enterprise/enterprise-feedback-testing/api/restricted_1.0.0-beta02.txt
similarity index 100%
rename from enterprise/feedback/testing/api/restricted_1.0.0-beta02.txt
rename to enterprise/enterprise-feedback-testing/api/restricted_1.0.0-beta02.txt

diff --git a/enterprise/feedback/testing/api/restricted_1.0.0-rc01.txt b/enterprise/enterprise-feedback-testing/api/restricted_1.0.0-rc01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/restricted_1.0.0-rc01.txt
rename to enterprise/enterprise-feedback-testing/api/restricted_1.0.0-rc01.txt

diff --git a/enterprise/feedback/testing/api/restricted_1.1.0-beta01.txt b/enterprise/enterprise-feedback-testing/api/restricted_1.1.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/testing/api/restricted_1.1.0-beta01.txt
rename to enterprise/enterprise-feedback-testing/api/restricted_1.1.0-beta01.txt

diff --git a/enterprise/feedback/testing/api/restricted_current.txt b/enterprise/enterprise-feedback-testing/api/restricted_current.txt
similarity index 100%
rename from enterprise/feedback/testing/api/restricted_current.txt
rename to enterprise/enterprise-feedback-testing/api/restricted_current.txt

diff --git a/enterprise/feedback/testing/build.gradle b/enterprise/enterprise-feedback-testing/build.gradle
similarity index 100%
rename from enterprise/feedback/testing/build.gradle
rename to enterprise/enterprise-feedback-testing/build.gradle

diff --git a/enterprise/feedback/testing/src/main/AndroidManifest.xml b/enterprise/enterprise-feedback-testing/src/main/AndroidManifest.xml
similarity index 100%
rename from enterprise/feedback/testing/src/main/AndroidManifest.xml
rename to enterprise/enterprise-feedback-testing/src/main/AndroidManifest.xml

diff --git a/enterprise/feedback/testing/src/main/java/androidx/enterprise/feedback/FakeKeyedAppStatesReporter.java b/enterprise/enterprise-feedback-testing/src/main/java/androidx/enterprise/feedback/FakeKeyedAppStatesReporter.java
similarity index 100%
rename from enterprise/feedback/testing/src/main/java/androidx/enterprise/feedback/FakeKeyedAppStatesReporter.java
rename to enterprise/enterprise-feedback-testing/src/main/java/androidx/enterprise/feedback/FakeKeyedAppStatesReporter.java

diff --git a/enterprise/feedback/testing/src/test/java/androidx/enterprise/feedback/FakeKeyedAppStatesReporterTest.java b/enterprise/enterprise-feedback-testing/src/test/java/androidx/enterprise/feedback/FakeKeyedAppStatesReporterTest.java
similarity index 100%
rename from enterprise/feedback/testing/src/test/java/androidx/enterprise/feedback/FakeKeyedAppStatesReporterTest.java
rename to enterprise/enterprise-feedback-testing/src/test/java/androidx/enterprise/feedback/FakeKeyedAppStatesReporterTest.java

diff --git a/enterprise/feedback/testing/src/test/java/androidx/enterprise/feedback/TestKeyedAppStatesCallback.java b/enterprise/enterprise-feedback-testing/src/test/java/androidx/enterprise/feedback/TestKeyedAppStatesCallback.java
similarity index 100%
rename from enterprise/feedback/testing/src/test/java/androidx/enterprise/feedback/TestKeyedAppStatesCallback.java
rename to enterprise/enterprise-feedback-testing/src/test/java/androidx/enterprise/feedback/TestKeyedAppStatesCallback.java

diff --git a/enterprise/feedback/api/1.0.0-beta01.txt b/enterprise/enterprise-feedback/api/1.0.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/api/1.0.0-beta01.txt
rename to enterprise/enterprise-feedback/api/1.0.0-beta01.txt

diff --git a/enterprise/feedback/api/1.0.0-beta02.txt b/enterprise/enterprise-feedback/api/1.0.0-beta02.txt
similarity index 100%
rename from enterprise/feedback/api/1.0.0-beta02.txt
rename to enterprise/enterprise-feedback/api/1.0.0-beta02.txt

diff --git a/enterprise/feedback/api/1.0.0-rc01.txt b/enterprise/enterprise-feedback/api/1.0.0-rc01.txt
similarity index 100%
rename from enterprise/feedback/api/1.0.0-rc01.txt
rename to enterprise/enterprise-feedback/api/1.0.0-rc01.txt

diff --git a/enterprise/feedback/api/1.1.0-beta01.txt b/enterprise/enterprise-feedback/api/1.1.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/api/1.1.0-beta01.txt
rename to enterprise/enterprise-feedback/api/1.1.0-beta01.txt

diff --git a/enterprise/feedback/api/api_lint.ignore b/enterprise/enterprise-feedback/api/api_lint.ignore
similarity index 100%
rename from enterprise/feedback/api/api_lint.ignore
rename to enterprise/enterprise-feedback/api/api_lint.ignore

diff --git a/enterprise/feedback/api/current.txt b/enterprise/enterprise-feedback/api/current.txt
similarity index 100%
rename from enterprise/feedback/api/current.txt
rename to enterprise/enterprise-feedback/api/current.txt

diff --git a/enterprise/feedback/api/public_plus_experimental_1.0.0-beta01.txt b/enterprise/enterprise-feedback/api/public_plus_experimental_1.0.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/api/public_plus_experimental_1.0.0-beta01.txt
rename to enterprise/enterprise-feedback/api/public_plus_experimental_1.0.0-beta01.txt

diff --git a/enterprise/feedback/api/public_plus_experimental_1.0.0-beta02.txt b/enterprise/enterprise-feedback/api/public_plus_experimental_1.0.0-beta02.txt
similarity index 100%
rename from enterprise/feedback/api/public_plus_experimental_1.0.0-beta02.txt
rename to enterprise/enterprise-feedback/api/public_plus_experimental_1.0.0-beta02.txt

diff --git a/enterprise/feedback/api/public_plus_experimental_1.0.0-rc01.txt b/enterprise/enterprise-feedback/api/public_plus_experimental_1.0.0-rc01.txt
similarity index 100%
rename from enterprise/feedback/api/public_plus_experimental_1.0.0-rc01.txt
rename to enterprise/enterprise-feedback/api/public_plus_experimental_1.0.0-rc01.txt

diff --git a/enterprise/feedback/api/public_plus_experimental_1.1.0-beta01.txt b/enterprise/enterprise-feedback/api/public_plus_experimental_1.1.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/api/public_plus_experimental_1.1.0-beta01.txt
rename to enterprise/enterprise-feedback/api/public_plus_experimental_1.1.0-beta01.txt

diff --git a/enterprise/feedback/api/public_plus_experimental_current.txt b/enterprise/enterprise-feedback/api/public_plus_experimental_current.txt
similarity index 100%
rename from enterprise/feedback/api/public_plus_experimental_current.txt
rename to enterprise/enterprise-feedback/api/public_plus_experimental_current.txt

diff --git a/enterprise/feedback/api/res-1.0.0-beta01.txt b/enterprise/enterprise-feedback/api/res-1.0.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/api/res-1.0.0-beta01.txt
rename to enterprise/enterprise-feedback/api/res-1.0.0-beta01.txt

diff --git a/enterprise/feedback/api/res-1.0.0-beta02.txt b/enterprise/enterprise-feedback/api/res-1.0.0-beta02.txt
similarity index 100%
rename from enterprise/feedback/api/res-1.0.0-beta02.txt
rename to enterprise/enterprise-feedback/api/res-1.0.0-beta02.txt

diff --git a/enterprise/feedback/api/res-1.0.0-rc01.txt b/enterprise/enterprise-feedback/api/res-1.0.0-rc01.txt
similarity index 100%
rename from enterprise/feedback/api/res-1.0.0-rc01.txt
rename to enterprise/enterprise-feedback/api/res-1.0.0-rc01.txt

diff --git a/enterprise/feedback/api/res-1.1.0-beta01.txt b/enterprise/enterprise-feedback/api/res-1.1.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/api/res-1.1.0-beta01.txt
rename to enterprise/enterprise-feedback/api/res-1.1.0-beta01.txt

diff --git a/enterprise/feedback/api/res-current.txt b/enterprise/enterprise-feedback/api/res-current.txt
similarity index 100%
rename from enterprise/feedback/api/res-current.txt
rename to enterprise/enterprise-feedback/api/res-current.txt

diff --git a/enterprise/feedback/api/restricted_1.0.0-beta01.txt b/enterprise/enterprise-feedback/api/restricted_1.0.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/api/restricted_1.0.0-beta01.txt
rename to enterprise/enterprise-feedback/api/restricted_1.0.0-beta01.txt

diff --git a/enterprise/feedback/api/restricted_1.0.0-beta02.txt b/enterprise/enterprise-feedback/api/restricted_1.0.0-beta02.txt
similarity index 100%
rename from enterprise/feedback/api/restricted_1.0.0-beta02.txt
rename to enterprise/enterprise-feedback/api/restricted_1.0.0-beta02.txt

diff --git a/enterprise/feedback/api/restricted_1.0.0-rc01.txt b/enterprise/enterprise-feedback/api/restricted_1.0.0-rc01.txt
similarity index 100%
rename from enterprise/feedback/api/restricted_1.0.0-rc01.txt
rename to enterprise/enterprise-feedback/api/restricted_1.0.0-rc01.txt

diff --git a/enterprise/feedback/api/restricted_1.1.0-beta01.txt b/enterprise/enterprise-feedback/api/restricted_1.1.0-beta01.txt
similarity index 100%
rename from enterprise/feedback/api/restricted_1.1.0-beta01.txt
rename to enterprise/enterprise-feedback/api/restricted_1.1.0-beta01.txt

diff --git a/enterprise/feedback/api/restricted_current.txt b/enterprise/enterprise-feedback/api/restricted_current.txt
similarity index 100%
rename from enterprise/feedback/api/restricted_current.txt
rename to enterprise/enterprise-feedback/api/restricted_current.txt

diff --git a/enterprise/feedback/build.gradle b/enterprise/enterprise-feedback/build.gradle
similarity index 100%
rename from enterprise/feedback/build.gradle
rename to enterprise/enterprise-feedback/build.gradle

diff --git a/enterprise/feedback/lint-baseline.xml b/enterprise/enterprise-feedback/lint-baseline.xml
similarity index 100%
rename from enterprise/feedback/lint-baseline.xml
rename to enterprise/enterprise-feedback/lint-baseline.xml

diff --git a/enterprise/feedback/src/main/AndroidManifest.xml b/enterprise/enterprise-feedback/src/main/AndroidManifest.xml
similarity index 100%
rename from enterprise/feedback/src/main/AndroidManifest.xml
rename to enterprise/enterprise-feedback/src/main/AndroidManifest.xml

diff --git a/enterprise/feedback/src/main/java/androidx/enterprise/feedback/BufferedServiceConnection.java b/enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/BufferedServiceConnection.java
similarity index 100%
rename from enterprise/feedback/src/main/java/androidx/enterprise/feedback/BufferedServiceConnection.java
rename to enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/BufferedServiceConnection.java

diff --git a/enterprise/feedback/src/main/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporter.java b/enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporter.java
similarity index 100%
rename from enterprise/feedback/src/main/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporter.java
rename to enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporter.java

diff --git a/enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppState.java b/enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppState.java
similarity index 100%
rename from enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppState.java
rename to enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppState.java

diff --git a/enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesCallback.java b/enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesCallback.java
similarity index 100%
rename from enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesCallback.java
rename to enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesCallback.java

diff --git a/enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesCallbackMerger.java b/enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesCallbackMerger.java
similarity index 100%
rename from enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesCallbackMerger.java
rename to enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesCallbackMerger.java

diff --git a/enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesReporter.java b/enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesReporter.java
similarity index 100%
rename from enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesReporter.java
rename to enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesReporter.java

diff --git a/enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesService.java b/enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesService.java
similarity index 100%
rename from enterprise/feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesService.java
rename to enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/KeyedAppStatesService.java

diff --git a/enterprise/feedback/src/main/java/androidx/enterprise/feedback/ReceivedKeyedAppState.java b/enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/ReceivedKeyedAppState.java
similarity index 100%
rename from enterprise/feedback/src/main/java/androidx/enterprise/feedback/ReceivedKeyedAppState.java
rename to enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/ReceivedKeyedAppState.java

diff --git a/enterprise/feedback/src/main/java/androidx/enterprise/feedback/SendableMessage.java b/enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/SendableMessage.java
similarity index 100%
rename from enterprise/feedback/src/main/java/androidx/enterprise/feedback/SendableMessage.java
rename to enterprise/enterprise-feedback/src/main/java/androidx/enterprise/feedback/SendableMessage.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/BufferedServiceConnectionTest.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/BufferedServiceConnectionTest.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/BufferedServiceConnectionTest.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/BufferedServiceConnectionTest.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporterTest.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporterTest.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporterTest.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporterTest.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStateTest.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStateTest.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStateTest.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStateTest.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesCallbackMergerTest.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesCallbackMergerTest.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesCallbackMergerTest.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesCallbackMergerTest.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesReporterTest.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesReporterTest.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesReporterTest.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesReporterTest.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesServiceTest.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesServiceTest.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesServiceTest.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesServiceTest.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/ReceivedKeyedAppStateTest.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/ReceivedKeyedAppStateTest.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/ReceivedKeyedAppStateTest.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/ReceivedKeyedAppStateTest.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/TestExecutor.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/TestExecutor.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/TestExecutor.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/TestExecutor.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/TestHandler.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/TestHandler.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/TestHandler.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/TestHandler.java

diff --git a/enterprise/feedback/src/test/java/androidx/enterprise/feedback/TestKeyedAppStatesCallback.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/TestKeyedAppStatesCallback.java
similarity index 100%
rename from enterprise/feedback/src/test/java/androidx/enterprise/feedback/TestKeyedAppStatesCallback.java
rename to enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/TestKeyedAppStatesCallback.java

diff --git a/legacy/core-utils/api/1.0.0.txt b/legacy/legacy-support-core-utils/api/1.0.0.txt
similarity index 100%
rename from legacy/core-utils/api/1.0.0.txt
rename to legacy/legacy-support-core-utils/api/1.0.0.txt

diff --git a/legacy/core-utils/api/api_lint.ignore b/legacy/legacy-support-core-utils/api/api_lint.ignore
similarity index 100%
rename from legacy/core-utils/api/api_lint.ignore
rename to legacy/legacy-support-core-utils/api/api_lint.ignore

diff --git a/legacy/core-utils/api/current.txt b/legacy/legacy-support-core-utils/api/current.txt
similarity index 100%
rename from legacy/core-utils/api/current.txt
rename to legacy/legacy-support-core-utils/api/current.txt

diff --git a/legacy/core-utils/api/public_plus_experimental_1.0.0.txt b/legacy/legacy-support-core-utils/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from legacy/core-utils/api/public_plus_experimental_1.0.0.txt
rename to legacy/legacy-support-core-utils/api/public_plus_experimental_1.0.0.txt

diff --git a/legacy/core-utils/api/public_plus_experimental_current.txt b/legacy/legacy-support-core-utils/api/public_plus_experimental_current.txt
similarity index 100%
rename from legacy/core-utils/api/public_plus_experimental_current.txt
rename to legacy/legacy-support-core-utils/api/public_plus_experimental_current.txt

diff --git a/legacy/core-utils/api/res-1.0.0.txt b/legacy/legacy-support-core-utils/api/res-1.0.0.txt
similarity index 100%
rename from legacy/core-utils/api/res-1.0.0.txt
rename to legacy/legacy-support-core-utils/api/res-1.0.0.txt

diff --git a/legacy/core-utils/api/res-current.txt b/legacy/legacy-support-core-utils/api/res-current.txt
similarity index 100%
rename from legacy/core-utils/api/res-current.txt
rename to legacy/legacy-support-core-utils/api/res-current.txt

diff --git a/legacy/core-utils/api/restricted_1.0.0.txt b/legacy/legacy-support-core-utils/api/restricted_1.0.0.txt
similarity index 100%
rename from legacy/core-utils/api/restricted_1.0.0.txt
rename to legacy/legacy-support-core-utils/api/restricted_1.0.0.txt

diff --git a/legacy/core-utils/api/restricted_current.txt b/legacy/legacy-support-core-utils/api/restricted_current.txt
similarity index 100%
rename from legacy/core-utils/api/restricted_current.txt
rename to legacy/legacy-support-core-utils/api/restricted_current.txt

diff --git a/legacy/core-utils/build.gradle b/legacy/legacy-support-core-utils/build.gradle
similarity index 100%
rename from legacy/core-utils/build.gradle
rename to legacy/legacy-support-core-utils/build.gradle

diff --git a/legacy/core-utils/lint-baseline.xml b/legacy/legacy-support-core-utils/lint-baseline.xml
similarity index 100%
rename from legacy/core-utils/lint-baseline.xml
rename to legacy/legacy-support-core-utils/lint-baseline.xml

diff --git a/legacy/core-utils/src/main/AndroidManifest.xml b/legacy/legacy-support-core-utils/src/main/AndroidManifest.xml
similarity index 100%
rename from legacy/core-utils/src/main/AndroidManifest.xml
rename to legacy/legacy-support-core-utils/src/main/AndroidManifest.xml

diff --git a/legacy/core-utils/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java b/legacy/legacy-support-core-utils/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java
similarity index 100%
rename from legacy/core-utils/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java
rename to legacy/legacy-support-core-utils/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java

diff --git a/navigation/benchmark/build.gradle b/navigation/navigation-benchmark/build.gradle
similarity index 100%
rename from navigation/benchmark/build.gradle
rename to navigation/navigation-benchmark/build.gradle

diff --git a/navigation/benchmark/src/androidTest/AndroidManifest.xml b/navigation/navigation-benchmark/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from navigation/benchmark/src/androidTest/AndroidManifest.xml
rename to navigation/navigation-benchmark/src/androidTest/AndroidManifest.xml

diff --git a/navigation/benchmark/src/androidTest/java/androidx/navigation/NavInflaterBenchmark.kt b/navigation/navigation-benchmark/src/androidTest/java/androidx/navigation/NavInflaterBenchmark.kt
similarity index 100%
rename from navigation/benchmark/src/androidTest/java/androidx/navigation/NavInflaterBenchmark.kt
rename to navigation/navigation-benchmark/src/androidTest/java/androidx/navigation/NavInflaterBenchmark.kt

diff --git a/navigation/benchmark/src/androidTest/res/navigation/nav_deep_link.xml b/navigation/navigation-benchmark/src/androidTest/res/navigation/nav_deep_link.xml
similarity index 100%
rename from navigation/benchmark/src/androidTest/res/navigation/nav_deep_link.xml
rename to navigation/navigation-benchmark/src/androidTest/res/navigation/nav_deep_link.xml

diff --git a/navigation/benchmark/src/androidTest/res/navigation/nav_simple.xml b/navigation/navigation-benchmark/src/androidTest/res/navigation/nav_simple.xml
similarity index 100%
rename from navigation/benchmark/src/androidTest/res/navigation/nav_simple.xml
rename to navigation/navigation-benchmark/src/androidTest/res/navigation/nav_simple.xml

diff --git a/navigation/benchmark/src/main/AndroidManifest.xml b/navigation/navigation-benchmark/src/main/AndroidManifest.xml
similarity index 100%
rename from navigation/benchmark/src/main/AndroidManifest.xml
rename to navigation/navigation-benchmark/src/main/AndroidManifest.xml

diff --git a/security/crypto/OWNERS b/security/security-crypto/OWNERS
similarity index 100%
rename from security/crypto/OWNERS
rename to security/security-crypto/OWNERS

diff --git a/security/crypto/api/1.0.0-beta01.txt b/security/security-crypto/api/1.0.0-beta01.txt
similarity index 100%
rename from security/crypto/api/1.0.0-beta01.txt
rename to security/security-crypto/api/1.0.0-beta01.txt

diff --git a/security/crypto/api/1.0.0-rc01.txt b/security/security-crypto/api/1.0.0-rc01.txt
similarity index 100%
rename from security/crypto/api/1.0.0-rc01.txt
rename to security/security-crypto/api/1.0.0-rc01.txt

diff --git a/security/crypto/api/api_lint.ignore b/security/security-crypto/api/api_lint.ignore
similarity index 100%
rename from security/crypto/api/api_lint.ignore
rename to security/security-crypto/api/api_lint.ignore

diff --git a/security/crypto/api/current.txt b/security/security-crypto/api/current.txt
similarity index 100%
rename from security/crypto/api/current.txt
rename to security/security-crypto/api/current.txt

diff --git a/security/crypto/api/public_plus_experimental_1.0.0-beta01.txt b/security/security-crypto/api/public_plus_experimental_1.0.0-beta01.txt
similarity index 100%
rename from security/crypto/api/public_plus_experimental_1.0.0-beta01.txt
rename to security/security-crypto/api/public_plus_experimental_1.0.0-beta01.txt

diff --git a/security/crypto/api/public_plus_experimental_1.0.0-rc01.txt b/security/security-crypto/api/public_plus_experimental_1.0.0-rc01.txt
similarity index 100%
rename from security/crypto/api/public_plus_experimental_1.0.0-rc01.txt
rename to security/security-crypto/api/public_plus_experimental_1.0.0-rc01.txt

diff --git a/security/crypto/api/public_plus_experimental_current.txt b/security/security-crypto/api/public_plus_experimental_current.txt
similarity index 100%
rename from security/crypto/api/public_plus_experimental_current.txt
rename to security/security-crypto/api/public_plus_experimental_current.txt

diff --git a/security/crypto/api/res-1.0.0-beta01.txt b/security/security-crypto/api/res-1.0.0-beta01.txt
similarity index 100%
rename from security/crypto/api/res-1.0.0-beta01.txt
rename to security/security-crypto/api/res-1.0.0-beta01.txt

diff --git a/security/crypto/api/res-1.0.0-rc01.txt b/security/security-crypto/api/res-1.0.0-rc01.txt
similarity index 100%
rename from security/crypto/api/res-1.0.0-rc01.txt
rename to security/security-crypto/api/res-1.0.0-rc01.txt

diff --git a/security/crypto/api/res-current.txt b/security/security-crypto/api/res-current.txt
similarity index 100%
rename from security/crypto/api/res-current.txt
rename to security/security-crypto/api/res-current.txt

diff --git a/security/crypto/api/restricted_1.0.0-beta01.txt b/security/security-crypto/api/restricted_1.0.0-beta01.txt
similarity index 100%
rename from security/crypto/api/restricted_1.0.0-beta01.txt
rename to security/security-crypto/api/restricted_1.0.0-beta01.txt

diff --git a/security/crypto/api/restricted_1.0.0-rc01.txt b/security/security-crypto/api/restricted_1.0.0-rc01.txt
similarity index 100%
rename from security/crypto/api/restricted_1.0.0-rc01.txt
rename to security/security-crypto/api/restricted_1.0.0-rc01.txt

diff --git a/security/crypto/api/restricted_current.txt b/security/security-crypto/api/restricted_current.txt
similarity index 100%
rename from security/crypto/api/restricted_current.txt
rename to security/security-crypto/api/restricted_current.txt

diff --git a/security/crypto/build.gradle b/security/security-crypto/build.gradle
similarity index 100%
rename from security/crypto/build.gradle
rename to security/security-crypto/build.gradle

diff --git a/security/crypto/gradle/wrapper/gradle-wrapper.jar b/security/security-crypto/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from security/crypto/gradle/wrapper/gradle-wrapper.jar
rename to security/security-crypto/gradle/wrapper/gradle-wrapper.jar
Binary files differ

diff --git a/security/crypto/gradle/wrapper/gradle-wrapper.properties b/security/security-crypto/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from security/crypto/gradle/wrapper/gradle-wrapper.properties
rename to security/security-crypto/gradle/wrapper/gradle-wrapper.properties

diff --git a/security/crypto/gradlew b/security/security-crypto/gradlew
similarity index 100%
rename from security/crypto/gradlew
rename to security/security-crypto/gradlew

diff --git a/security/crypto/gradlew.bat b/security/security-crypto/gradlew.bat
similarity index 100%
rename from security/crypto/gradlew.bat
rename to security/security-crypto/gradlew.bat

diff --git a/security/crypto/lint-baseline.xml b/security/security-crypto/lint-baseline.xml
similarity index 100%
rename from security/crypto/lint-baseline.xml
rename to security/security-crypto/lint-baseline.xml

diff --git a/security/crypto/src/androidTest/AndroidManifest.xml b/security/security-crypto/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from security/crypto/src/androidTest/AndroidManifest.xml
rename to security/security-crypto/src/androidTest/AndroidManifest.xml

diff --git a/security/crypto/src/androidTest/java/androidx/security/crypto/EncryptedFileTest.java b/security/security-crypto/src/androidTest/java/androidx/security/crypto/EncryptedFileTest.java
similarity index 100%
rename from security/crypto/src/androidTest/java/androidx/security/crypto/EncryptedFileTest.java
rename to security/security-crypto/src/androidTest/java/androidx/security/crypto/EncryptedFileTest.java

diff --git a/security/crypto/src/androidTest/java/androidx/security/crypto/EncryptedSharedPreferencesTest.java b/security/security-crypto/src/androidTest/java/androidx/security/crypto/EncryptedSharedPreferencesTest.java
similarity index 100%
rename from security/crypto/src/androidTest/java/androidx/security/crypto/EncryptedSharedPreferencesTest.java
rename to security/security-crypto/src/androidTest/java/androidx/security/crypto/EncryptedSharedPreferencesTest.java

diff --git a/security/crypto/src/androidTest/java/androidx/security/crypto/MasterKeySecureTest.java b/security/security-crypto/src/androidTest/java/androidx/security/crypto/MasterKeySecureTest.java
similarity index 100%
rename from security/crypto/src/androidTest/java/androidx/security/crypto/MasterKeySecureTest.java
rename to security/security-crypto/src/androidTest/java/androidx/security/crypto/MasterKeySecureTest.java

diff --git a/security/crypto/src/androidTest/java/androidx/security/crypto/MasterKeyTest.java b/security/security-crypto/src/androidTest/java/androidx/security/crypto/MasterKeyTest.java
similarity index 100%
rename from security/crypto/src/androidTest/java/androidx/security/crypto/MasterKeyTest.java
rename to security/security-crypto/src/androidTest/java/androidx/security/crypto/MasterKeyTest.java

diff --git a/security/crypto/src/androidTest/java/androidx/security/crypto/MasterKeysTest.java b/security/security-crypto/src/androidTest/java/androidx/security/crypto/MasterKeysTest.java
similarity index 100%
rename from security/crypto/src/androidTest/java/androidx/security/crypto/MasterKeysTest.java
rename to security/security-crypto/src/androidTest/java/androidx/security/crypto/MasterKeysTest.java

diff --git a/security/crypto/src/main/AndroidManifest.xml b/security/security-crypto/src/main/AndroidManifest.xml
similarity index 100%
rename from security/crypto/src/main/AndroidManifest.xml
rename to security/security-crypto/src/main/AndroidManifest.xml

diff --git a/security/crypto/src/main/java/androidx/security/crypto/EncryptedFile.java b/security/security-crypto/src/main/java/androidx/security/crypto/EncryptedFile.java
similarity index 100%
rename from security/crypto/src/main/java/androidx/security/crypto/EncryptedFile.java
rename to security/security-crypto/src/main/java/androidx/security/crypto/EncryptedFile.java

diff --git a/security/crypto/src/main/java/androidx/security/crypto/EncryptedSharedPreferences.java b/security/security-crypto/src/main/java/androidx/security/crypto/EncryptedSharedPreferences.java
similarity index 100%
rename from security/crypto/src/main/java/androidx/security/crypto/EncryptedSharedPreferences.java
rename to security/security-crypto/src/main/java/androidx/security/crypto/EncryptedSharedPreferences.java

diff --git a/security/crypto/src/main/java/androidx/security/crypto/MasterKey.java b/security/security-crypto/src/main/java/androidx/security/crypto/MasterKey.java
similarity index 100%
rename from security/crypto/src/main/java/androidx/security/crypto/MasterKey.java
rename to security/security-crypto/src/main/java/androidx/security/crypto/MasterKey.java

diff --git a/security/crypto/src/main/java/androidx/security/crypto/MasterKeys.java b/security/security-crypto/src/main/java/androidx/security/crypto/MasterKeys.java
similarity index 100%
rename from security/crypto/src/main/java/androidx/security/crypto/MasterKeys.java
rename to security/security-crypto/src/main/java/androidx/security/crypto/MasterKeys.java

diff --git a/security/identity-credential/OWNERS b/security/security-identity-credential/OWNERS
similarity index 100%
rename from security/identity-credential/OWNERS
rename to security/security-identity-credential/OWNERS

diff --git a/security/identity-credential/api/api_lint.ignore b/security/security-identity-credential/api/api_lint.ignore
similarity index 100%
rename from security/identity-credential/api/api_lint.ignore
rename to security/security-identity-credential/api/api_lint.ignore

diff --git a/security/identity-credential/api/current.txt b/security/security-identity-credential/api/current.txt
similarity index 100%
rename from security/identity-credential/api/current.txt
rename to security/security-identity-credential/api/current.txt

diff --git a/security/identity-credential/api/public_plus_experimental_current.txt b/security/security-identity-credential/api/public_plus_experimental_current.txt
similarity index 100%
rename from security/identity-credential/api/public_plus_experimental_current.txt
rename to security/security-identity-credential/api/public_plus_experimental_current.txt

diff --git a/security/identity-credential/api/res-current.txt b/security/security-identity-credential/api/res-current.txt
similarity index 100%
rename from security/identity-credential/api/res-current.txt
rename to security/security-identity-credential/api/res-current.txt

diff --git a/security/identity-credential/api/restricted_current.txt b/security/security-identity-credential/api/restricted_current.txt
similarity index 100%
rename from security/identity-credential/api/restricted_current.txt
rename to security/security-identity-credential/api/restricted_current.txt

diff --git a/security/identity-credential/build.gradle b/security/security-identity-credential/build.gradle
similarity index 100%
rename from security/identity-credential/build.gradle
rename to security/security-identity-credential/build.gradle

diff --git a/security/identity-credential/lint-baseline.xml b/security/security-identity-credential/lint-baseline.xml
similarity index 100%
rename from security/identity-credential/lint-baseline.xml
rename to security/security-identity-credential/lint-baseline.xml

diff --git a/security/identity-credential/src/androidTest/AndroidManifest.xml b/security/security-identity-credential/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from security/identity-credential/src/androidTest/AndroidManifest.xml
rename to security/security-identity-credential/src/androidTest/AndroidManifest.xml

diff --git a/security/identity-credential/src/androidTest/java/androidx/security/identity/CreateItemsRequestTest.java b/security/security-identity-credential/src/androidTest/java/androidx/security/identity/CreateItemsRequestTest.java
similarity index 100%
rename from security/identity-credential/src/androidTest/java/androidx/security/identity/CreateItemsRequestTest.java
rename to security/security-identity-credential/src/androidTest/java/androidx/security/identity/CreateItemsRequestTest.java

diff --git a/security/identity-credential/src/androidTest/java/androidx/security/identity/DynamicAuthTest.java b/security/security-identity-credential/src/androidTest/java/androidx/security/identity/DynamicAuthTest.java
similarity index 100%
rename from security/identity-credential/src/androidTest/java/androidx/security/identity/DynamicAuthTest.java
rename to security/security-identity-credential/src/androidTest/java/androidx/security/identity/DynamicAuthTest.java

diff --git a/security/identity-credential/src/androidTest/java/androidx/security/identity/EphemeralKeyTest.java b/security/security-identity-credential/src/androidTest/java/androidx/security/identity/EphemeralKeyTest.java
similarity index 100%
rename from security/identity-credential/src/androidTest/java/androidx/security/identity/EphemeralKeyTest.java
rename to security/security-identity-credential/src/androidTest/java/androidx/security/identity/EphemeralKeyTest.java

diff --git a/security/identity-credential/src/androidTest/java/androidx/security/identity/HkdfTest.java b/security/security-identity-credential/src/androidTest/java/androidx/security/identity/HkdfTest.java
similarity index 100%
rename from security/identity-credential/src/androidTest/java/androidx/security/identity/HkdfTest.java
rename to security/security-identity-credential/src/androidTest/java/androidx/security/identity/HkdfTest.java

diff --git a/security/identity-credential/src/androidTest/java/androidx/security/identity/ProvisioningTest.java b/security/security-identity-credential/src/androidTest/java/androidx/security/identity/ProvisioningTest.java
similarity index 100%
rename from security/identity-credential/src/androidTest/java/androidx/security/identity/ProvisioningTest.java
rename to security/security-identity-credential/src/androidTest/java/androidx/security/identity/ProvisioningTest.java

diff --git a/security/identity-credential/src/androidTest/java/androidx/security/identity/ReaderAuthTest.java b/security/security-identity-credential/src/androidTest/java/androidx/security/identity/ReaderAuthTest.java
similarity index 100%
rename from security/identity-credential/src/androidTest/java/androidx/security/identity/ReaderAuthTest.java
rename to security/security-identity-credential/src/androidTest/java/androidx/security/identity/ReaderAuthTest.java

diff --git a/security/identity-credential/src/androidTest/java/androidx/security/identity/UtilUnitTests.java b/security/security-identity-credential/src/androidTest/java/androidx/security/identity/UtilUnitTests.java
similarity index 100%
rename from security/identity-credential/src/androidTest/java/androidx/security/identity/UtilUnitTests.java
rename to security/security-identity-credential/src/androidTest/java/androidx/security/identity/UtilUnitTests.java

diff --git a/security/identity-credential/src/androidTest/java/androidx/security/identity/X509CertificateSigningTest.java b/security/security-identity-credential/src/androidTest/java/androidx/security/identity/X509CertificateSigningTest.java
similarity index 100%
rename from security/identity-credential/src/androidTest/java/androidx/security/identity/X509CertificateSigningTest.java
rename to security/security-identity-credential/src/androidTest/java/androidx/security/identity/X509CertificateSigningTest.java

diff --git a/security/identity-credential/src/main/AndroidManifest.xml b/security/security-identity-credential/src/main/AndroidManifest.xml
similarity index 100%
rename from security/identity-credential/src/main/AndroidManifest.xml
rename to security/security-identity-credential/src/main/AndroidManifest.xml

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/AccessControlProfile.java b/security/security-identity-credential/src/main/java/androidx/security/identity/AccessControlProfile.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/AccessControlProfile.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/AccessControlProfile.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/AccessControlProfileId.java b/security/security-identity-credential/src/main/java/androidx/security/identity/AccessControlProfileId.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/AccessControlProfileId.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/AccessControlProfileId.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/AlreadyPersonalizedException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/AlreadyPersonalizedException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/AlreadyPersonalizedException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/AlreadyPersonalizedException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/CipherSuiteNotSupportedException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/CipherSuiteNotSupportedException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/CipherSuiteNotSupportedException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/CipherSuiteNotSupportedException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/CredentialData.java b/security/security-identity-credential/src/main/java/androidx/security/identity/CredentialData.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/CredentialData.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/CredentialData.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/DocTypeNotSupportedException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/DocTypeNotSupportedException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/DocTypeNotSupportedException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/DocTypeNotSupportedException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/EphemeralPublicKeyNotFoundException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/EphemeralPublicKeyNotFoundException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/EphemeralPublicKeyNotFoundException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/EphemeralPublicKeyNotFoundException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/HardwareIdentityCredential.java b/security/security-identity-credential/src/main/java/androidx/security/identity/HardwareIdentityCredential.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/HardwareIdentityCredential.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/HardwareIdentityCredential.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/HardwareIdentityCredentialStore.java b/security/security-identity-credential/src/main/java/androidx/security/identity/HardwareIdentityCredentialStore.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/HardwareIdentityCredentialStore.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/HardwareIdentityCredentialStore.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/HardwareWritableIdentityCredential.java b/security/security-identity-credential/src/main/java/androidx/security/identity/HardwareWritableIdentityCredential.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/HardwareWritableIdentityCredential.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/HardwareWritableIdentityCredential.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/IdentityCredential.java b/security/security-identity-credential/src/main/java/androidx/security/identity/IdentityCredential.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/IdentityCredential.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/IdentityCredential.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/IdentityCredentialException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/IdentityCredentialException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/IdentityCredentialException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/IdentityCredentialException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/IdentityCredentialStore.java b/security/security-identity-credential/src/main/java/androidx/security/identity/IdentityCredentialStore.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/IdentityCredentialStore.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/IdentityCredentialStore.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/IdentityCredentialStoreCapabilities.java b/security/security-identity-credential/src/main/java/androidx/security/identity/IdentityCredentialStoreCapabilities.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/IdentityCredentialStoreCapabilities.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/IdentityCredentialStoreCapabilities.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/InvalidReaderSignatureException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/InvalidReaderSignatureException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/InvalidReaderSignatureException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/InvalidReaderSignatureException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/InvalidRequestMessageException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/InvalidRequestMessageException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/InvalidRequestMessageException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/InvalidRequestMessageException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/MessageDecryptionException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/MessageDecryptionException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/MessageDecryptionException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/MessageDecryptionException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/NoAuthenticationKeyAvailableException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/NoAuthenticationKeyAvailableException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/NoAuthenticationKeyAvailableException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/NoAuthenticationKeyAvailableException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/PersonalizationData.java b/security/security-identity-credential/src/main/java/androidx/security/identity/PersonalizationData.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/PersonalizationData.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/PersonalizationData.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/ResultData.java b/security/security-identity-credential/src/main/java/androidx/security/identity/ResultData.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/ResultData.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/ResultData.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/SimpleIdentityCredentialStoreCapabilities.java b/security/security-identity-credential/src/main/java/androidx/security/identity/SimpleIdentityCredentialStoreCapabilities.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/SimpleIdentityCredentialStoreCapabilities.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/SimpleIdentityCredentialStoreCapabilities.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/SimpleResultData.java b/security/security-identity-credential/src/main/java/androidx/security/identity/SimpleResultData.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/SimpleResultData.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/SimpleResultData.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/SoftwareIdentityCredential.java b/security/security-identity-credential/src/main/java/androidx/security/identity/SoftwareIdentityCredential.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/SoftwareIdentityCredential.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/SoftwareIdentityCredential.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/SoftwareIdentityCredentialStore.java b/security/security-identity-credential/src/main/java/androidx/security/identity/SoftwareIdentityCredentialStore.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/SoftwareIdentityCredentialStore.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/SoftwareIdentityCredentialStore.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/SoftwareWritableIdentityCredential.java b/security/security-identity-credential/src/main/java/androidx/security/identity/SoftwareWritableIdentityCredential.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/SoftwareWritableIdentityCredential.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/SoftwareWritableIdentityCredential.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/UnknownAuthenticationKeyException.java b/security/security-identity-credential/src/main/java/androidx/security/identity/UnknownAuthenticationKeyException.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/UnknownAuthenticationKeyException.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/UnknownAuthenticationKeyException.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/Util.java b/security/security-identity-credential/src/main/java/androidx/security/identity/Util.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/Util.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/Util.java

diff --git a/security/identity-credential/src/main/java/androidx/security/identity/WritableIdentityCredential.java b/security/security-identity-credential/src/main/java/androidx/security/identity/WritableIdentityCredential.java
similarity index 100%
rename from security/identity-credential/src/main/java/androidx/security/identity/WritableIdentityCredential.java
rename to security/security-identity-credential/src/main/java/androidx/security/identity/WritableIdentityCredential.java

diff --git a/settings.gradle b/settings.gradle
index 59728df..fec6fa8 100644
--- a/settings.gradle
+++ b/settings.gradle

@@ -255,7 +255,7 @@
 includeProject(":camera:integration-tests:camera-testapp-timing", "camera/integration-tests/timingtestapp", [BuildType.MAIN])
 includeProject(":camera:integration-tests:camera-testapp-uiwidgets", "camera/integration-tests/uiwidgetstestapp", [BuildType.MAIN])
 includeProject(":camera:integration-tests:camera-testapp-view", "camera/integration-tests/viewtestapp", [BuildType.MAIN])
-includeProject(":camera:integration-tests:camera-testlib-extensions", "camera/integration-tests/extensionstestlib", [BuildType.MAIN])
+includeProject(":camera:camera-testlib-extensions", "camera/camera-testlib-extensions", [BuildType.MAIN])
 includeProject(":car:app:app", "car/app/app", [BuildType.MAIN])
 includeProject(":car:app:app-automotive", "car/app/app-automotive", [BuildType.MAIN])
 includeProject(":car:app:app-projected", "car/app/app-projected", [BuildType.MAIN])
@@ -327,11 +327,11 @@
 includeProject(":compose:material:material-icons-core", "compose/material/material-icons-core", [BuildType.COMPOSE])
 includeProject(":compose:material:material-icons-core:material-icons-core-samples", "compose/material/material-icons-core/samples", [BuildType.COMPOSE])
 includeProject(":compose:material:material-icons-extended", "compose/material/material-icons-extended", [BuildType.COMPOSE])
-includeProject(":compose:material:material-icons-extended-filled", "compose/material/material-icons-extended/material-icons-extended-filled", [BuildType.COMPOSE])
-includeProject(":compose:material:material-icons-extended-outlined", "compose/material/material-icons-extended/material-icons-extended-outlined", [BuildType.COMPOSE])
-includeProject(":compose:material:material-icons-extended-rounded", "compose/material/material-icons-extended/material-icons-extended-rounded", [BuildType.COMPOSE])
-includeProject(":compose:material:material-icons-extended-sharp", "compose/material/material-icons-extended/material-icons-extended-sharp", [BuildType.COMPOSE])
-includeProject(":compose:material:material-icons-extended-twotone", "compose/material/material-icons-extended/material-icons-extended-twotone", [BuildType.COMPOSE])
+includeProject(":compose:material:material-icons-extended-filled", "compose/material/material-icons-extended-filled", [BuildType.COMPOSE])
+includeProject(":compose:material:material-icons-extended-outlined", "compose/material/material-icons-extended-outlined", [BuildType.COMPOSE])
+includeProject(":compose:material:material-icons-extended-rounded", "compose/material/material-icons-extended-rounded", [BuildType.COMPOSE])
+includeProject(":compose:material:material-icons-extended-sharp", "compose/material/material-icons-extended-sharp", [BuildType.COMPOSE])
+includeProject(":compose:material:material-icons-extended-twotone", "compose/material/material-icons-extended-twotone", [BuildType.COMPOSE])
 includeProject(":compose:material:material-ripple", "compose/material/material-ripple", [BuildType.COMPOSE])
 includeProject(":compose:material:material:icons:generator", "compose/material/material/icons/generator", [BuildType.COMPOSE])
 includeProject(":compose:material:material:integration-tests:material-demos", "compose/material/material/integration-tests/material-demos", [BuildType.COMPOSE])
@@ -383,8 +383,8 @@
 includeProject(":compose:ui:ui-viewbinding:ui-viewbinding-samples", "compose/ui/ui-viewbinding/samples", [BuildType.COMPOSE])
 includeProject(":compose:ui:ui:integration-tests:ui-demos", "compose/ui/ui/integration-tests/ui-demos", [BuildType.COMPOSE])
 includeProject(":compose:ui:ui:ui-samples", "compose/ui/ui/samples", [BuildType.COMPOSE])
-includeProject(":concurrent:concurrent-futures", "concurrent/futures", [BuildType.MAIN])
-includeProject(":concurrent:concurrent-futures-ktx", "concurrent/futures-ktx", [BuildType.MAIN])
+includeProject(":concurrent:concurrent-futures", "concurrent/concurrent-futures", [BuildType.MAIN])
+includeProject(":concurrent:concurrent-futures-ktx", "concurrent/concurrent-futures-ktx", [BuildType.MAIN])
 includeProject(":contentpager:contentpager", "contentpager/contentpager", [BuildType.MAIN])
 includeProject(":coordinatorlayout:coordinatorlayout", "coordinatorlayout/coordinatorlayout", [BuildType.MAIN])
 includeProject(":core:core", "core/core", [BuildType.MAIN, BuildType.MEDIA])
@@ -406,7 +406,7 @@
 includeProject(":datastore:datastore-preferences-core", "datastore/datastore-preferences-core",
         [BuildType.MAIN])
 includeProject(":datastore:datastore-preferences-proto",
-        "datastore/datastore-preferences-core/datastore-preferences-proto", [BuildType.MAIN])
+        "datastore/datastore-preferences-proto", [BuildType.MAIN])
 includeProject(":datastore:datastore-preferences-rxjava2",
         "datastore/datastore-preferences-rxjava2", [BuildType.MAIN])
 includeProject(":datastore:datastore-preferences-rxjava3",
@@ -417,12 +417,12 @@
 includeProject(":datastore:datastore-sampleapp", "datastore/datastore-sampleapp", [BuildType.MAIN])
 includeProject(":documentfile:documentfile", "documentfile/documentfile", [BuildType.MAIN])
 includeProject(":drawerlayout:drawerlayout", "drawerlayout/drawerlayout", [BuildType.MAIN])
-includeProject(":dynamicanimation", "dynamic-animation", [BuildType.MAIN])
-includeProject(":dynamicanimation:dynamicanimation", "dynamic-animation/dynamic-animation", [BuildType.MAIN])
-includeProject(":dynamicanimation:dynamicanimation-ktx", "dynamic-animation/dynamic-animation-ktx", [BuildType.MAIN])
-includeProject(":emoji:emoji", "emoji/core", [BuildType.MAIN])
-includeProject(":emoji:emoji-appcompat", "emoji/appcompat", [BuildType.MAIN])
-includeProject(":emoji:emoji-bundled", "emoji/bundled", [BuildType.MAIN])
+includeProject(":dynamicanimation", "dynamicanimation", [BuildType.MAIN])
+includeProject(":dynamicanimation:dynamicanimation", "dynamicanimation/dynamicanimation", [BuildType.MAIN])
+includeProject(":dynamicanimation:dynamicanimation-ktx", "dynamicanimation/dynamicanimation-ktx", [BuildType.MAIN])
+includeProject(":emoji:emoji", "emoji/emoji", [BuildType.MAIN])
+includeProject(":emoji:emoji-appcompat", "emoji/emoji-appcompat", [BuildType.MAIN])
+includeProject(":emoji:emoji-bundled", "emoji/emoji-bundled", [BuildType.MAIN])
 includeProject(":emoji2:emoji2", "emoji2/emoji2", [BuildType.MAIN])
 includeProject(":emoji2:emoji2-bundled", "emoji2/emoji2-bundled", [BuildType.MAIN])
 includeProject(":emoji2:emoji2-views", "emoji2/emoji2-views", [BuildType.MAIN])
@@ -432,8 +432,8 @@
 includeProject(":emoji2:integration-tests:init-disabled-macrobenchmark-target", "emoji2/integration-tests/init-disabled-macrobenchmark-target", [BuildType.MAIN])
 includeProject(":emoji2:integration-tests:init-enabled-macrobenchmark", "emoji2/integration-tests/init-enabled-macrobenchmark", [BuildType.MAIN])
 includeProject(":emoji2:integration-tests:init-enabled-macrobenchmark-target", "emoji2/integration-tests/init-enabled-macrobenchmark-target", [BuildType.MAIN])
-includeProject(":enterprise:enterprise-feedback", "enterprise/feedback", [BuildType.MAIN])
-includeProject(":enterprise:enterprise-feedback-testing", "enterprise/feedback/testing", [BuildType.MAIN])
+includeProject(":enterprise:enterprise-feedback", "enterprise/enterprise-feedback", [BuildType.MAIN])
+includeProject(":enterprise:enterprise-feedback-testing", "enterprise/enterprise-feedback-testing", [BuildType.MAIN])
 includeProject(":exifinterface:exifinterface", "exifinterface/exifinterface", [BuildType.MAIN])
 includeProject(":fakeannotations", "fakeannotations", [BuildType.MAIN])
 includeProject(":fragment:fragment", "fragment/fragment", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
@@ -508,7 +508,7 @@
 includeProject(":media2:media2-widget", "media2/media2-widget", [BuildType.MAIN, BuildType.MEDIA])
 includeProject(":media:media", "media/media", [BuildType.MAIN, BuildType.MEDIA])
 includeProject(":mediarouter:mediarouter", "mediarouter/mediarouter", [BuildType.MAIN, BuildType.MEDIA])
-includeProject(":navigation:navigation-benchmark", "navigation/benchmark", [BuildType.MAIN, BuildType.FLAN])
+includeProject(":navigation:navigation-benchmark", "navigation/navigation-benchmark", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":navigation:navigation-common", "navigation/navigation-common", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE])
 includeProject(":navigation:navigation-common-ktx", "navigation/navigation-common-ktx", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE])
 includeProject(":navigation:navigation-compose", "navigation/navigation-compose", [BuildType.COMPOSE])
@@ -584,18 +584,18 @@
 includeProject(":security:security-app-authenticator", "security/security-app-authenticator", [BuildType.MAIN])
 includeProject(":security:security-app-authenticator-testing", "security/security-app-authenticator-testing", [BuildType.MAIN])
 includeProject(":security:security-biometric", "security/security-biometric", [BuildType.MAIN])
-includeProject(":security:security-crypto", "security/crypto", [BuildType.MAIN])
+includeProject(":security:security-crypto", "security/security-crypto", [BuildType.MAIN])
 includeProject(":security:security-crypto-ktx", "security/security-crypto-ktx", [BuildType.MAIN])
-includeProject(":security:security-identity-credential", "security/identity-credential", [BuildType.MAIN])
+includeProject(":security:security-identity-credential", "security/security-identity-credential", [BuildType.MAIN])
 includeProject(":sharetarget:integration-tests:testapp", "sharetarget/integration-tests/testapp", [BuildType.MAIN])
 includeProject(":sharetarget:sharetarget", "sharetarget/sharetarget", [BuildType.MAIN])
-includeProject(":slice:slice-benchmark", "slice/benchmark", [BuildType.MAIN])
-includeProject(":slice:slice-builders", "slice/builders", [BuildType.MAIN])
-includeProject(":slice:slice-builders-ktx", "slice/builders/ktx", [BuildType.MAIN])
-includeProject(":slice:slice-core", "slice/core", [BuildType.MAIN])
-includeProject(":slice:slice-remotecallback", "slice/remotecallback", [BuildType.MAIN])
-includeProject(":slice:slice-test", "slice/test", [BuildType.MAIN])
-includeProject(":slice:slice-view", "slice/view", [BuildType.MAIN])
+includeProject(":slice:slice-benchmark", "slice/slice-benchmark", [BuildType.MAIN])
+includeProject(":slice:slice-builders", "slice/slice-builders", [BuildType.MAIN])
+includeProject(":slice:slice-builders-ktx", "slice/slice-builders/ktx", [BuildType.MAIN])
+includeProject(":slice:slice-core", "slice/slice-core", [BuildType.MAIN])
+includeProject(":slice:slice-remotecallback", "slice/slice-remotecallback", [BuildType.MAIN])
+includeProject(":slice:slice-test", "slice/slice-test", [BuildType.MAIN])
+includeProject(":slice:slice-view", "slice/slice-view", [BuildType.MAIN])
 includeProject(":slidingpanelayout:slidingpanelayout", "slidingpanelayout/slidingpanelayout", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":sqlite:integration-tests:inspection-room-testapp", "sqlite/integration-tests/inspection-room-testapp", [BuildType.MAIN])
 includeProject(":sqlite:integration-tests:inspection-sqldelight-testapp", "sqlite/integration-tests/inspection-sqldelight-testapp", [BuildType.MAIN])
@@ -618,7 +618,7 @@
 includeProject(":tracing:tracing-ktx", "tracing/tracing-ktx")
 includeProject(":transition:transition", "transition/transition", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":transition:transition-ktx", "transition/transition-ktx", [BuildType.MAIN, BuildType.FLAN])
-includeProject(":tvprovider:tvprovider", "tvprovider/tv-provider", [BuildType.MAIN])
+includeProject(":tvprovider:tvprovider", "tvprovider/tvprovider", [BuildType.MAIN])
 includeProject(":vectordrawable:integration-tests:testapp", "vectordrawable/integration-tests/testapp", [BuildType.MAIN])
 includeProject(":vectordrawable:vectordrawable", "vectordrawable/vectordrawable", [BuildType.MAIN])
 includeProject(":vectordrawable:vectordrawable-animated", "vectordrawable/vectordrawable-animated", [BuildType.MAIN])
@@ -691,7 +691,7 @@
 //
 /////////////////////////////
 
-includeProject(":legacy:legacy-support-core-utils", "legacy/core-utils", [BuildType.MAIN])
+includeProject(":legacy:legacy-support-core-utils", "legacy/legacy-support-core-utils", [BuildType.MAIN])
 
 /////////////////////////////
 //

diff --git a/slice/benchmark/build.gradle b/slice/slice-benchmark/build.gradle
similarity index 100%
rename from slice/benchmark/build.gradle
rename to slice/slice-benchmark/build.gradle

diff --git a/slice/benchmark/src/androidTest/AndroidManifest.xml b/slice/slice-benchmark/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from slice/benchmark/src/androidTest/AndroidManifest.xml
rename to slice/slice-benchmark/src/androidTest/AndroidManifest.xml

diff --git a/slice/benchmark/src/androidTest/java/androidx/slice/SliceSerializeMetrics.java b/slice/slice-benchmark/src/androidTest/java/androidx/slice/SliceSerializeMetrics.java
similarity index 100%
rename from slice/benchmark/src/androidTest/java/androidx/slice/SliceSerializeMetrics.java
rename to slice/slice-benchmark/src/androidTest/java/androidx/slice/SliceSerializeMetrics.java

diff --git a/slice/benchmark/src/androidTest/java/androidx/slice/SliceViewMetrics.java b/slice/slice-benchmark/src/androidTest/java/androidx/slice/SliceViewMetrics.java
similarity index 100%
rename from slice/benchmark/src/androidTest/java/androidx/slice/SliceViewMetrics.java
rename to slice/slice-benchmark/src/androidTest/java/androidx/slice/SliceViewMetrics.java

diff --git a/slice/benchmark/src/androidTest/res/raw/slice.vp b/slice/slice-benchmark/src/androidTest/res/raw/slice.vp
similarity index 100%
rename from slice/benchmark/src/androidTest/res/raw/slice.vp
rename to slice/slice-benchmark/src/androidTest/res/raw/slice.vp
Binary files differ

diff --git a/slice/benchmark/src/main/AndroidManifest.xml b/slice/slice-benchmark/src/main/AndroidManifest.xml
similarity index 100%
rename from slice/benchmark/src/main/AndroidManifest.xml
rename to slice/slice-benchmark/src/main/AndroidManifest.xml

diff --git a/slice/builders/api/api_lint.ignore b/slice/slice-builders/api/api_lint.ignore
similarity index 100%
rename from slice/builders/api/api_lint.ignore
rename to slice/slice-builders/api/api_lint.ignore

diff --git a/slice/builders/api/current.txt b/slice/slice-builders/api/current.txt
similarity index 100%
rename from slice/builders/api/current.txt
rename to slice/slice-builders/api/current.txt

diff --git a/slice/builders/api/public_plus_experimental_1.0.0.txt b/slice/slice-builders/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from slice/builders/api/public_plus_experimental_1.0.0.txt
rename to slice/slice-builders/api/public_plus_experimental_1.0.0.txt

diff --git a/slice/builders/api/public_plus_experimental_current.txt b/slice/slice-builders/api/public_plus_experimental_current.txt
similarity index 100%
rename from slice/builders/api/public_plus_experimental_current.txt
rename to slice/slice-builders/api/public_plus_experimental_current.txt

diff --git a/slice/builders/api/res-current.txt b/slice/slice-builders/api/res-current.txt
similarity index 100%
rename from slice/builders/api/res-current.txt
rename to slice/slice-builders/api/res-current.txt

diff --git a/slice/builders/api/restricted_1.0.0.txt b/slice/slice-builders/api/restricted_1.0.0.txt
similarity index 100%
rename from slice/builders/api/restricted_1.0.0.txt
rename to slice/slice-builders/api/restricted_1.0.0.txt

diff --git a/slice/builders/api/restricted_current.txt b/slice/slice-builders/api/restricted_current.txt
similarity index 100%
rename from slice/builders/api/restricted_current.txt
rename to slice/slice-builders/api/restricted_current.txt

diff --git a/slice/builders/build.gradle b/slice/slice-builders/build.gradle
similarity index 100%
rename from slice/builders/build.gradle
rename to slice/slice-builders/build.gradle

diff --git a/slice/builders/ktx/OWNERS b/slice/slice-builders/ktx/OWNERS
similarity index 100%
rename from slice/builders/ktx/OWNERS
rename to slice/slice-builders/ktx/OWNERS

diff --git a/slice/builders/ktx/api/current.txt b/slice/slice-builders/ktx/api/current.txt
similarity index 100%
rename from slice/builders/ktx/api/current.txt
rename to slice/slice-builders/ktx/api/current.txt

diff --git a/slice/builders/ktx/api/public_plus_experimental_current.txt b/slice/slice-builders/ktx/api/public_plus_experimental_current.txt
similarity index 100%
rename from slice/builders/ktx/api/public_plus_experimental_current.txt
rename to slice/slice-builders/ktx/api/public_plus_experimental_current.txt

diff --git a/slice/builders/ktx/api/res-current.txt b/slice/slice-builders/ktx/api/res-current.txt
similarity index 100%
rename from slice/builders/ktx/api/res-current.txt
rename to slice/slice-builders/ktx/api/res-current.txt

diff --git a/slice/builders/ktx/api/restricted_current.txt b/slice/slice-builders/ktx/api/restricted_current.txt
similarity index 100%
rename from slice/builders/ktx/api/restricted_current.txt
rename to slice/slice-builders/ktx/api/restricted_current.txt

diff --git a/slice/builders/ktx/build.gradle b/slice/slice-builders/ktx/build.gradle
similarity index 100%
rename from slice/builders/ktx/build.gradle
rename to slice/slice-builders/ktx/build.gradle

diff --git a/slice/builders/ktx/src/androidTest/AndroidManifest.xml b/slice/slice-builders/ktx/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from slice/builders/ktx/src/androidTest/AndroidManifest.xml
rename to slice/slice-builders/ktx/src/androidTest/AndroidManifest.xml

diff --git a/slice/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt b/slice/slice-builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt
similarity index 100%
rename from slice/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt
rename to slice/slice-builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt

diff --git a/slice/builders/ktx/src/androidTest/java/androidx/slice/builders/TestActivity.java b/slice/slice-builders/ktx/src/androidTest/java/androidx/slice/builders/TestActivity.java
similarity index 100%
rename from slice/builders/ktx/src/androidTest/java/androidx/slice/builders/TestActivity.java
rename to slice/slice-builders/ktx/src/androidTest/java/androidx/slice/builders/TestActivity.java

diff --git a/slice/builders/ktx/src/androidTest/res/drawable/ic_all_out_black_24dp.xml b/slice/slice-builders/ktx/src/androidTest/res/drawable/ic_all_out_black_24dp.xml
similarity index 100%
rename from slice/builders/ktx/src/androidTest/res/drawable/ic_all_out_black_24dp.xml
rename to slice/slice-builders/ktx/src/androidTest/res/drawable/ic_all_out_black_24dp.xml

diff --git a/slice/builders/ktx/src/androidTest/res/drawable/ic_android_black_24dp.xml b/slice/slice-builders/ktx/src/androidTest/res/drawable/ic_android_black_24dp.xml
similarity index 100%
rename from slice/builders/ktx/src/androidTest/res/drawable/ic_android_black_24dp.xml
rename to slice/slice-builders/ktx/src/androidTest/res/drawable/ic_android_black_24dp.xml

diff --git a/slice/builders/ktx/src/androidTest/res/drawable/ic_attach_money_black_24dp.xml b/slice/slice-builders/ktx/src/androidTest/res/drawable/ic_attach_money_black_24dp.xml
similarity index 100%
rename from slice/builders/ktx/src/androidTest/res/drawable/ic_attach_money_black_24dp.xml
rename to slice/slice-builders/ktx/src/androidTest/res/drawable/ic_attach_money_black_24dp.xml

diff --git a/slice/builders/ktx/src/androidTest/res/layout/activity_test.xml b/slice/slice-builders/ktx/src/androidTest/res/layout/activity_test.xml
similarity index 100%
rename from slice/builders/ktx/src/androidTest/res/layout/activity_test.xml
rename to slice/slice-builders/ktx/src/androidTest/res/layout/activity_test.xml

diff --git a/slice/builders/ktx/src/main/AndroidManifest.xml b/slice/slice-builders/ktx/src/main/AndroidManifest.xml
similarity index 100%
rename from slice/builders/ktx/src/main/AndroidManifest.xml
rename to slice/slice-builders/ktx/src/main/AndroidManifest.xml

diff --git a/slice/builders/ktx/src/main/java/androidx/slice/builders/GridRowBuilder.kt b/slice/slice-builders/ktx/src/main/java/androidx/slice/builders/GridRowBuilder.kt
similarity index 100%
rename from slice/builders/ktx/src/main/java/androidx/slice/builders/GridRowBuilder.kt
rename to slice/slice-builders/ktx/src/main/java/androidx/slice/builders/GridRowBuilder.kt

diff --git a/slice/builders/ktx/src/main/java/androidx/slice/builders/ListBuilder.kt b/slice/slice-builders/ktx/src/main/java/androidx/slice/builders/ListBuilder.kt
similarity index 100%
rename from slice/builders/ktx/src/main/java/androidx/slice/builders/ListBuilder.kt
rename to slice/slice-builders/ktx/src/main/java/androidx/slice/builders/ListBuilder.kt

diff --git a/slice/builders/lint-baseline.xml b/slice/slice-builders/lint-baseline.xml
similarity index 100%
rename from slice/builders/lint-baseline.xml
rename to slice/slice-builders/lint-baseline.xml

diff --git a/slice/builders/src/main/AndroidManifest.xml b/slice/slice-builders/src/main/AndroidManifest.xml
similarity index 100%
rename from slice/builders/src/main/AndroidManifest.xml
rename to slice/slice-builders/src/main/AndroidManifest.xml

diff --git a/slice/builders/src/main/java/androidx/slice/builders/GridRowBuilder.java b/slice/slice-builders/src/main/java/androidx/slice/builders/GridRowBuilder.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/GridRowBuilder.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/GridRowBuilder.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/ListBuilder.java b/slice/slice-builders/src/main/java/androidx/slice/builders/ListBuilder.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/ListBuilder.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/ListBuilder.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java b/slice/slice-builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/SelectionBuilder.java b/slice/slice-builders/src/main/java/androidx/slice/builders/SelectionBuilder.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/SelectionBuilder.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/SelectionBuilder.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/SliceAction.java b/slice/slice-builders/src/main/java/androidx/slice/builders/SliceAction.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/SliceAction.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/SliceAction.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java b/slice/slice-builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java

diff --git a/slice/builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java b/slice/slice-builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java
similarity index 100%
rename from slice/builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java
rename to slice/slice-builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java

diff --git a/slice/core/api/api_lint.ignore b/slice/slice-core/api/api_lint.ignore
similarity index 100%
rename from slice/core/api/api_lint.ignore
rename to slice/slice-core/api/api_lint.ignore

diff --git a/slice/core/api/current.txt b/slice/slice-core/api/current.txt
similarity index 100%
rename from slice/core/api/current.txt
rename to slice/slice-core/api/current.txt

diff --git a/slice/core/api/public_plus_experimental_1.0.0.txt b/slice/slice-core/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from slice/core/api/public_plus_experimental_1.0.0.txt
rename to slice/slice-core/api/public_plus_experimental_1.0.0.txt

diff --git a/slice/core/api/public_plus_experimental_current.txt b/slice/slice-core/api/public_plus_experimental_current.txt
similarity index 100%
rename from slice/core/api/public_plus_experimental_current.txt
rename to slice/slice-core/api/public_plus_experimental_current.txt

diff --git a/slice/core/api/res-current.txt b/slice/slice-core/api/res-current.txt
similarity index 100%
rename from slice/core/api/res-current.txt
rename to slice/slice-core/api/res-current.txt

diff --git a/slice/core/api/restricted_1.0.0.txt b/slice/slice-core/api/restricted_1.0.0.txt
similarity index 100%
rename from slice/core/api/restricted_1.0.0.txt
rename to slice/slice-core/api/restricted_1.0.0.txt

diff --git a/slice/core/api/restricted_current.txt b/slice/slice-core/api/restricted_current.txt
similarity index 100%
rename from slice/core/api/restricted_current.txt
rename to slice/slice-core/api/restricted_current.txt

diff --git a/slice/core/build.gradle b/slice/slice-core/build.gradle
similarity index 100%
rename from slice/core/build.gradle
rename to slice/slice-core/build.gradle

diff --git a/slice/core/lint-baseline.xml b/slice/slice-core/lint-baseline.xml
similarity index 100%
rename from slice/core/lint-baseline.xml
rename to slice/slice-core/lint-baseline.xml

diff --git a/slice/core/src/androidTest/AndroidManifest.xml b/slice/slice-core/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from slice/core/src/androidTest/AndroidManifest.xml
rename to slice/slice-core/src/androidTest/AndroidManifest.xml

diff --git a/slice/core/src/androidTest/java/androidx/slice/SliceItemTest.java b/slice/slice-core/src/androidTest/java/androidx/slice/SliceItemTest.java
similarity index 100%
rename from slice/core/src/androidTest/java/androidx/slice/SliceItemTest.java
rename to slice/slice-core/src/androidTest/java/androidx/slice/SliceItemTest.java

diff --git a/slice/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java b/slice/slice-core/src/androidTest/java/androidx/slice/SlicePermissionTest.java
similarity index 100%
rename from slice/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java
rename to slice/slice-core/src/androidTest/java/androidx/slice/SlicePermissionTest.java

diff --git a/slice/core/src/androidTest/java/androidx/slice/SliceTest.java b/slice/slice-core/src/androidTest/java/androidx/slice/SliceTest.java
similarity index 100%
rename from slice/core/src/androidTest/java/androidx/slice/SliceTest.java
rename to slice/slice-core/src/androidTest/java/androidx/slice/SliceTest.java

diff --git a/slice/core/src/androidTest/java/androidx/slice/SliceTestProvider.java b/slice/slice-core/src/androidTest/java/androidx/slice/SliceTestProvider.java
similarity index 100%
rename from slice/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
rename to slice/slice-core/src/androidTest/java/androidx/slice/SliceTestProvider.java

diff --git a/slice/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java b/slice/slice-core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java
similarity index 100%
rename from slice/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java
rename to slice/slice-core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java

diff --git a/slice/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java b/slice/slice-core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
similarity index 100%
rename from slice/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
rename to slice/slice-core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java

diff --git a/slice/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java b/slice/slice-core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java
similarity index 100%
rename from slice/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java
rename to slice/slice-core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java

diff --git a/slice/core/src/androidTest/res/drawable/size_48x48.jpg b/slice/slice-core/src/androidTest/res/drawable/size_48x48.jpg
similarity index 100%
rename from slice/core/src/androidTest/res/drawable/size_48x48.jpg
rename to slice/slice-core/src/androidTest/res/drawable/size_48x48.jpg
Binary files differ

diff --git a/slice/core/src/main/AndroidManifest.xml b/slice/slice-core/src/main/AndroidManifest.xml
similarity index 100%
rename from slice/core/src/main/AndroidManifest.xml
rename to slice/slice-core/src/main/AndroidManifest.xml

diff --git a/slice/core/src/main/java/androidx/slice/ArrayUtils.java b/slice/slice-core/src/main/java/androidx/slice/ArrayUtils.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/ArrayUtils.java
rename to slice/slice-core/src/main/java/androidx/slice/ArrayUtils.java

diff --git a/slice/core/src/main/java/androidx/slice/Clock.java b/slice/slice-core/src/main/java/androidx/slice/Clock.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/Clock.java
rename to slice/slice-core/src/main/java/androidx/slice/Clock.java

diff --git a/slice/core/src/main/java/androidx/slice/CornerDrawable.java b/slice/slice-core/src/main/java/androidx/slice/CornerDrawable.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/CornerDrawable.java
rename to slice/slice-core/src/main/java/androidx/slice/CornerDrawable.java

diff --git a/slice/core/src/main/java/androidx/slice/Slice.java b/slice/slice-core/src/main/java/androidx/slice/Slice.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/Slice.java
rename to slice/slice-core/src/main/java/androidx/slice/Slice.java

diff --git a/slice/core/src/main/java/androidx/slice/SliceConvert.java b/slice/slice-core/src/main/java/androidx/slice/SliceConvert.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SliceConvert.java
rename to slice/slice-core/src/main/java/androidx/slice/SliceConvert.java

diff --git a/slice/core/src/main/java/androidx/slice/SliceItem.java b/slice/slice-core/src/main/java/androidx/slice/SliceItem.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SliceItem.java
rename to slice/slice-core/src/main/java/androidx/slice/SliceItem.java

diff --git a/slice/core/src/main/java/androidx/slice/SliceItemHolder.java b/slice/slice-core/src/main/java/androidx/slice/SliceItemHolder.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SliceItemHolder.java
rename to slice/slice-core/src/main/java/androidx/slice/SliceItemHolder.java

diff --git a/slice/core/src/main/java/androidx/slice/SliceManager.java b/slice/slice-core/src/main/java/androidx/slice/SliceManager.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SliceManager.java
rename to slice/slice-core/src/main/java/androidx/slice/SliceManager.java

diff --git a/slice/core/src/main/java/androidx/slice/SliceManagerCompat.java b/slice/slice-core/src/main/java/androidx/slice/SliceManagerCompat.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SliceManagerCompat.java
rename to slice/slice-core/src/main/java/androidx/slice/SliceManagerCompat.java

diff --git a/slice/core/src/main/java/androidx/slice/SliceManagerWrapper.java b/slice/slice-core/src/main/java/androidx/slice/SliceManagerWrapper.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SliceManagerWrapper.java
rename to slice/slice-core/src/main/java/androidx/slice/SliceManagerWrapper.java

diff --git a/slice/core/src/main/java/androidx/slice/SliceProvider.java b/slice/slice-core/src/main/java/androidx/slice/SliceProvider.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SliceProvider.java
rename to slice/slice-core/src/main/java/androidx/slice/SliceProvider.java

diff --git a/slice/core/src/main/java/androidx/slice/SliceSpec.java b/slice/slice-core/src/main/java/androidx/slice/SliceSpec.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SliceSpec.java
rename to slice/slice-core/src/main/java/androidx/slice/SliceSpec.java

diff --git a/slice/core/src/main/java/androidx/slice/SliceSpecs.java b/slice/slice-core/src/main/java/androidx/slice/SliceSpecs.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SliceSpecs.java
rename to slice/slice-core/src/main/java/androidx/slice/SliceSpecs.java

diff --git a/slice/core/src/main/java/androidx/slice/SystemClock.java b/slice/slice-core/src/main/java/androidx/slice/SystemClock.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/SystemClock.java
rename to slice/slice-core/src/main/java/androidx/slice/SystemClock.java

diff --git a/slice/core/src/main/java/androidx/slice/compat/CompatPermissionManager.java b/slice/slice-core/src/main/java/androidx/slice/compat/CompatPermissionManager.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/compat/CompatPermissionManager.java
rename to slice/slice-core/src/main/java/androidx/slice/compat/CompatPermissionManager.java

diff --git a/slice/core/src/main/java/androidx/slice/compat/CompatPinnedList.java b/slice/slice-core/src/main/java/androidx/slice/compat/CompatPinnedList.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/compat/CompatPinnedList.java
rename to slice/slice-core/src/main/java/androidx/slice/compat/CompatPinnedList.java

diff --git a/slice/core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java b/slice/slice-core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java
rename to slice/slice-core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java

diff --git a/slice/core/src/main/java/androidx/slice/compat/SliceProviderCompat.java b/slice/slice-core/src/main/java/androidx/slice/compat/SliceProviderCompat.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/compat/SliceProviderCompat.java
rename to slice/slice-core/src/main/java/androidx/slice/compat/SliceProviderCompat.java

diff --git a/slice/core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java b/slice/slice-core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java
rename to slice/slice-core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java

diff --git a/slice/core/src/main/java/androidx/slice/core/SliceAction.java b/slice/slice-core/src/main/java/androidx/slice/core/SliceAction.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/core/SliceAction.java
rename to slice/slice-core/src/main/java/androidx/slice/core/SliceAction.java

diff --git a/slice/core/src/main/java/androidx/slice/core/SliceActionImpl.java b/slice/slice-core/src/main/java/androidx/slice/core/SliceActionImpl.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/core/SliceActionImpl.java
rename to slice/slice-core/src/main/java/androidx/slice/core/SliceActionImpl.java

diff --git a/slice/core/src/main/java/androidx/slice/core/SliceHints.java b/slice/slice-core/src/main/java/androidx/slice/core/SliceHints.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/core/SliceHints.java
rename to slice/slice-core/src/main/java/androidx/slice/core/SliceHints.java

diff --git a/slice/core/src/main/java/androidx/slice/core/SliceQuery.java b/slice/slice-core/src/main/java/androidx/slice/core/SliceQuery.java
similarity index 100%
rename from slice/core/src/main/java/androidx/slice/core/SliceQuery.java
rename to slice/slice-core/src/main/java/androidx/slice/core/SliceQuery.java

diff --git a/slice/core/src/main/res-public/values-af/strings.xml b/slice/slice-core/src/main/res-public/values-af/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-af/strings.xml
rename to slice/slice-core/src/main/res-public/values-af/strings.xml

diff --git a/slice/core/src/main/res-public/values-am/strings.xml b/slice/slice-core/src/main/res-public/values-am/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-am/strings.xml
rename to slice/slice-core/src/main/res-public/values-am/strings.xml

diff --git a/slice/core/src/main/res-public/values-ar/strings.xml b/slice/slice-core/src/main/res-public/values-ar/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ar/strings.xml
rename to slice/slice-core/src/main/res-public/values-ar/strings.xml

diff --git a/slice/core/src/main/res-public/values-as/strings.xml b/slice/slice-core/src/main/res-public/values-as/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-as/strings.xml
rename to slice/slice-core/src/main/res-public/values-as/strings.xml

diff --git a/slice/core/src/main/res-public/values-az/strings.xml b/slice/slice-core/src/main/res-public/values-az/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-az/strings.xml
rename to slice/slice-core/src/main/res-public/values-az/strings.xml

diff --git a/slice/core/src/main/res-public/values-b+sr+Latn/strings.xml b/slice/slice-core/src/main/res-public/values-b+sr+Latn/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-b+sr+Latn/strings.xml
rename to slice/slice-core/src/main/res-public/values-b+sr+Latn/strings.xml

diff --git a/slice/core/src/main/res-public/values-be/strings.xml b/slice/slice-core/src/main/res-public/values-be/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-be/strings.xml
rename to slice/slice-core/src/main/res-public/values-be/strings.xml

diff --git a/slice/core/src/main/res-public/values-bg/strings.xml b/slice/slice-core/src/main/res-public/values-bg/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-bg/strings.xml
rename to slice/slice-core/src/main/res-public/values-bg/strings.xml

diff --git a/slice/core/src/main/res-public/values-bn/strings.xml b/slice/slice-core/src/main/res-public/values-bn/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-bn/strings.xml
rename to slice/slice-core/src/main/res-public/values-bn/strings.xml

diff --git a/slice/core/src/main/res-public/values-bs/strings.xml b/slice/slice-core/src/main/res-public/values-bs/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-bs/strings.xml
rename to slice/slice-core/src/main/res-public/values-bs/strings.xml

diff --git a/slice/core/src/main/res-public/values-ca/strings.xml b/slice/slice-core/src/main/res-public/values-ca/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ca/strings.xml
rename to slice/slice-core/src/main/res-public/values-ca/strings.xml

diff --git a/slice/core/src/main/res-public/values-cs/strings.xml b/slice/slice-core/src/main/res-public/values-cs/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-cs/strings.xml
rename to slice/slice-core/src/main/res-public/values-cs/strings.xml

diff --git a/slice/core/src/main/res-public/values-da/strings.xml b/slice/slice-core/src/main/res-public/values-da/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-da/strings.xml
rename to slice/slice-core/src/main/res-public/values-da/strings.xml

diff --git a/slice/core/src/main/res-public/values-de/strings.xml b/slice/slice-core/src/main/res-public/values-de/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-de/strings.xml
rename to slice/slice-core/src/main/res-public/values-de/strings.xml

diff --git a/slice/core/src/main/res-public/values-el/strings.xml b/slice/slice-core/src/main/res-public/values-el/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-el/strings.xml
rename to slice/slice-core/src/main/res-public/values-el/strings.xml

diff --git a/slice/core/src/main/res-public/values-en-rAU/strings.xml b/slice/slice-core/src/main/res-public/values-en-rAU/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-en-rAU/strings.xml
rename to slice/slice-core/src/main/res-public/values-en-rAU/strings.xml

diff --git a/slice/core/src/main/res-public/values-en-rCA/strings.xml b/slice/slice-core/src/main/res-public/values-en-rCA/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-en-rCA/strings.xml
rename to slice/slice-core/src/main/res-public/values-en-rCA/strings.xml

diff --git a/slice/core/src/main/res-public/values-en-rGB/strings.xml b/slice/slice-core/src/main/res-public/values-en-rGB/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-en-rGB/strings.xml
rename to slice/slice-core/src/main/res-public/values-en-rGB/strings.xml

diff --git a/slice/core/src/main/res-public/values-en-rIN/strings.xml b/slice/slice-core/src/main/res-public/values-en-rIN/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-en-rIN/strings.xml
rename to slice/slice-core/src/main/res-public/values-en-rIN/strings.xml

diff --git a/slice/core/src/main/res-public/values-en-rXC/strings.xml b/slice/slice-core/src/main/res-public/values-en-rXC/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-en-rXC/strings.xml
rename to slice/slice-core/src/main/res-public/values-en-rXC/strings.xml

diff --git a/slice/core/src/main/res-public/values-es-rUS/strings.xml b/slice/slice-core/src/main/res-public/values-es-rUS/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-es-rUS/strings.xml
rename to slice/slice-core/src/main/res-public/values-es-rUS/strings.xml

diff --git a/slice/core/src/main/res-public/values-es/strings.xml b/slice/slice-core/src/main/res-public/values-es/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-es/strings.xml
rename to slice/slice-core/src/main/res-public/values-es/strings.xml

diff --git a/slice/core/src/main/res-public/values-et/strings.xml b/slice/slice-core/src/main/res-public/values-et/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-et/strings.xml
rename to slice/slice-core/src/main/res-public/values-et/strings.xml

diff --git a/slice/core/src/main/res-public/values-eu/strings.xml b/slice/slice-core/src/main/res-public/values-eu/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-eu/strings.xml
rename to slice/slice-core/src/main/res-public/values-eu/strings.xml

diff --git a/slice/core/src/main/res-public/values-fa/strings.xml b/slice/slice-core/src/main/res-public/values-fa/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-fa/strings.xml
rename to slice/slice-core/src/main/res-public/values-fa/strings.xml

diff --git a/slice/core/src/main/res-public/values-fi/strings.xml b/slice/slice-core/src/main/res-public/values-fi/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-fi/strings.xml
rename to slice/slice-core/src/main/res-public/values-fi/strings.xml

diff --git a/slice/core/src/main/res-public/values-fr-rCA/strings.xml b/slice/slice-core/src/main/res-public/values-fr-rCA/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-fr-rCA/strings.xml
rename to slice/slice-core/src/main/res-public/values-fr-rCA/strings.xml

diff --git a/slice/core/src/main/res-public/values-fr/strings.xml b/slice/slice-core/src/main/res-public/values-fr/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-fr/strings.xml
rename to slice/slice-core/src/main/res-public/values-fr/strings.xml

diff --git a/slice/core/src/main/res-public/values-gl/strings.xml b/slice/slice-core/src/main/res-public/values-gl/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-gl/strings.xml
rename to slice/slice-core/src/main/res-public/values-gl/strings.xml

diff --git a/slice/core/src/main/res-public/values-gu/strings.xml b/slice/slice-core/src/main/res-public/values-gu/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-gu/strings.xml
rename to slice/slice-core/src/main/res-public/values-gu/strings.xml

diff --git a/slice/core/src/main/res-public/values-hi/strings.xml b/slice/slice-core/src/main/res-public/values-hi/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-hi/strings.xml
rename to slice/slice-core/src/main/res-public/values-hi/strings.xml

diff --git a/slice/core/src/main/res-public/values-hr/strings.xml b/slice/slice-core/src/main/res-public/values-hr/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-hr/strings.xml
rename to slice/slice-core/src/main/res-public/values-hr/strings.xml

diff --git a/slice/core/src/main/res-public/values-hu/strings.xml b/slice/slice-core/src/main/res-public/values-hu/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-hu/strings.xml
rename to slice/slice-core/src/main/res-public/values-hu/strings.xml

diff --git a/slice/core/src/main/res-public/values-hy/strings.xml b/slice/slice-core/src/main/res-public/values-hy/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-hy/strings.xml
rename to slice/slice-core/src/main/res-public/values-hy/strings.xml

diff --git a/slice/core/src/main/res-public/values-in/strings.xml b/slice/slice-core/src/main/res-public/values-in/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-in/strings.xml
rename to slice/slice-core/src/main/res-public/values-in/strings.xml

diff --git a/slice/core/src/main/res-public/values-is/strings.xml b/slice/slice-core/src/main/res-public/values-is/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-is/strings.xml
rename to slice/slice-core/src/main/res-public/values-is/strings.xml

diff --git a/slice/core/src/main/res-public/values-it/strings.xml b/slice/slice-core/src/main/res-public/values-it/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-it/strings.xml
rename to slice/slice-core/src/main/res-public/values-it/strings.xml

diff --git a/slice/core/src/main/res-public/values-iw/strings.xml b/slice/slice-core/src/main/res-public/values-iw/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-iw/strings.xml
rename to slice/slice-core/src/main/res-public/values-iw/strings.xml

diff --git a/slice/core/src/main/res-public/values-ja/strings.xml b/slice/slice-core/src/main/res-public/values-ja/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ja/strings.xml
rename to slice/slice-core/src/main/res-public/values-ja/strings.xml

diff --git a/slice/core/src/main/res-public/values-ka/strings.xml b/slice/slice-core/src/main/res-public/values-ka/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ka/strings.xml
rename to slice/slice-core/src/main/res-public/values-ka/strings.xml

diff --git a/slice/core/src/main/res-public/values-kk/strings.xml b/slice/slice-core/src/main/res-public/values-kk/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-kk/strings.xml
rename to slice/slice-core/src/main/res-public/values-kk/strings.xml

diff --git a/slice/core/src/main/res-public/values-km/strings.xml b/slice/slice-core/src/main/res-public/values-km/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-km/strings.xml
rename to slice/slice-core/src/main/res-public/values-km/strings.xml

diff --git a/slice/core/src/main/res-public/values-kn/strings.xml b/slice/slice-core/src/main/res-public/values-kn/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-kn/strings.xml
rename to slice/slice-core/src/main/res-public/values-kn/strings.xml

diff --git a/slice/core/src/main/res-public/values-ko/strings.xml b/slice/slice-core/src/main/res-public/values-ko/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ko/strings.xml
rename to slice/slice-core/src/main/res-public/values-ko/strings.xml

diff --git a/slice/core/src/main/res-public/values-ky/strings.xml b/slice/slice-core/src/main/res-public/values-ky/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ky/strings.xml
rename to slice/slice-core/src/main/res-public/values-ky/strings.xml

diff --git a/slice/core/src/main/res-public/values-lo/strings.xml b/slice/slice-core/src/main/res-public/values-lo/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-lo/strings.xml
rename to slice/slice-core/src/main/res-public/values-lo/strings.xml

diff --git a/slice/core/src/main/res-public/values-lt/strings.xml b/slice/slice-core/src/main/res-public/values-lt/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-lt/strings.xml
rename to slice/slice-core/src/main/res-public/values-lt/strings.xml

diff --git a/slice/core/src/main/res-public/values-lv/strings.xml b/slice/slice-core/src/main/res-public/values-lv/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-lv/strings.xml
rename to slice/slice-core/src/main/res-public/values-lv/strings.xml

diff --git a/slice/core/src/main/res-public/values-mk/strings.xml b/slice/slice-core/src/main/res-public/values-mk/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-mk/strings.xml
rename to slice/slice-core/src/main/res-public/values-mk/strings.xml

diff --git a/slice/core/src/main/res-public/values-ml/strings.xml b/slice/slice-core/src/main/res-public/values-ml/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ml/strings.xml
rename to slice/slice-core/src/main/res-public/values-ml/strings.xml

diff --git a/slice/core/src/main/res-public/values-mn/strings.xml b/slice/slice-core/src/main/res-public/values-mn/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-mn/strings.xml
rename to slice/slice-core/src/main/res-public/values-mn/strings.xml

diff --git a/slice/core/src/main/res-public/values-mr/strings.xml b/slice/slice-core/src/main/res-public/values-mr/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-mr/strings.xml
rename to slice/slice-core/src/main/res-public/values-mr/strings.xml

diff --git a/slice/core/src/main/res-public/values-ms/strings.xml b/slice/slice-core/src/main/res-public/values-ms/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ms/strings.xml
rename to slice/slice-core/src/main/res-public/values-ms/strings.xml

diff --git a/slice/core/src/main/res-public/values-my/strings.xml b/slice/slice-core/src/main/res-public/values-my/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-my/strings.xml
rename to slice/slice-core/src/main/res-public/values-my/strings.xml

diff --git a/slice/core/src/main/res-public/values-nb/strings.xml b/slice/slice-core/src/main/res-public/values-nb/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-nb/strings.xml
rename to slice/slice-core/src/main/res-public/values-nb/strings.xml

diff --git a/slice/core/src/main/res-public/values-ne/strings.xml b/slice/slice-core/src/main/res-public/values-ne/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ne/strings.xml
rename to slice/slice-core/src/main/res-public/values-ne/strings.xml

diff --git a/slice/core/src/main/res-public/values-nl/strings.xml b/slice/slice-core/src/main/res-public/values-nl/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-nl/strings.xml
rename to slice/slice-core/src/main/res-public/values-nl/strings.xml

diff --git a/slice/core/src/main/res-public/values-or/strings.xml b/slice/slice-core/src/main/res-public/values-or/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-or/strings.xml
rename to slice/slice-core/src/main/res-public/values-or/strings.xml

diff --git a/slice/core/src/main/res-public/values-pa/strings.xml b/slice/slice-core/src/main/res-public/values-pa/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-pa/strings.xml
rename to slice/slice-core/src/main/res-public/values-pa/strings.xml

diff --git a/slice/core/src/main/res-public/values-pl/strings.xml b/slice/slice-core/src/main/res-public/values-pl/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-pl/strings.xml
rename to slice/slice-core/src/main/res-public/values-pl/strings.xml

diff --git a/slice/core/src/main/res-public/values-pt-rBR/strings.xml b/slice/slice-core/src/main/res-public/values-pt-rBR/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-pt-rBR/strings.xml
rename to slice/slice-core/src/main/res-public/values-pt-rBR/strings.xml

diff --git a/slice/core/src/main/res-public/values-pt-rPT/strings.xml b/slice/slice-core/src/main/res-public/values-pt-rPT/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-pt-rPT/strings.xml
rename to slice/slice-core/src/main/res-public/values-pt-rPT/strings.xml

diff --git a/slice/core/src/main/res-public/values-pt/strings.xml b/slice/slice-core/src/main/res-public/values-pt/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-pt/strings.xml
rename to slice/slice-core/src/main/res-public/values-pt/strings.xml

diff --git a/slice/core/src/main/res-public/values-ro/strings.xml b/slice/slice-core/src/main/res-public/values-ro/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ro/strings.xml
rename to slice/slice-core/src/main/res-public/values-ro/strings.xml

diff --git a/slice/core/src/main/res-public/values-ru/strings.xml b/slice/slice-core/src/main/res-public/values-ru/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ru/strings.xml
rename to slice/slice-core/src/main/res-public/values-ru/strings.xml

diff --git a/slice/core/src/main/res-public/values-si/strings.xml b/slice/slice-core/src/main/res-public/values-si/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-si/strings.xml
rename to slice/slice-core/src/main/res-public/values-si/strings.xml

diff --git a/slice/core/src/main/res-public/values-sk/strings.xml b/slice/slice-core/src/main/res-public/values-sk/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-sk/strings.xml
rename to slice/slice-core/src/main/res-public/values-sk/strings.xml

diff --git a/slice/core/src/main/res-public/values-sl/strings.xml b/slice/slice-core/src/main/res-public/values-sl/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-sl/strings.xml
rename to slice/slice-core/src/main/res-public/values-sl/strings.xml

diff --git a/slice/core/src/main/res-public/values-sq/strings.xml b/slice/slice-core/src/main/res-public/values-sq/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-sq/strings.xml
rename to slice/slice-core/src/main/res-public/values-sq/strings.xml

diff --git a/slice/core/src/main/res-public/values-sr/strings.xml b/slice/slice-core/src/main/res-public/values-sr/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-sr/strings.xml
rename to slice/slice-core/src/main/res-public/values-sr/strings.xml

diff --git a/slice/core/src/main/res-public/values-sv/strings.xml b/slice/slice-core/src/main/res-public/values-sv/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-sv/strings.xml
rename to slice/slice-core/src/main/res-public/values-sv/strings.xml

diff --git a/slice/core/src/main/res-public/values-sw/strings.xml b/slice/slice-core/src/main/res-public/values-sw/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-sw/strings.xml
rename to slice/slice-core/src/main/res-public/values-sw/strings.xml

diff --git a/slice/core/src/main/res-public/values-ta/strings.xml b/slice/slice-core/src/main/res-public/values-ta/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ta/strings.xml
rename to slice/slice-core/src/main/res-public/values-ta/strings.xml

diff --git a/slice/core/src/main/res-public/values-te/strings.xml b/slice/slice-core/src/main/res-public/values-te/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-te/strings.xml
rename to slice/slice-core/src/main/res-public/values-te/strings.xml

diff --git a/slice/core/src/main/res-public/values-th/strings.xml b/slice/slice-core/src/main/res-public/values-th/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-th/strings.xml
rename to slice/slice-core/src/main/res-public/values-th/strings.xml

diff --git a/slice/core/src/main/res-public/values-tl/strings.xml b/slice/slice-core/src/main/res-public/values-tl/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-tl/strings.xml
rename to slice/slice-core/src/main/res-public/values-tl/strings.xml

diff --git a/slice/core/src/main/res-public/values-tr/strings.xml b/slice/slice-core/src/main/res-public/values-tr/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-tr/strings.xml
rename to slice/slice-core/src/main/res-public/values-tr/strings.xml

diff --git a/slice/core/src/main/res-public/values-uk/strings.xml b/slice/slice-core/src/main/res-public/values-uk/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-uk/strings.xml
rename to slice/slice-core/src/main/res-public/values-uk/strings.xml

diff --git a/slice/core/src/main/res-public/values-ur/strings.xml b/slice/slice-core/src/main/res-public/values-ur/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-ur/strings.xml
rename to slice/slice-core/src/main/res-public/values-ur/strings.xml

diff --git a/slice/core/src/main/res-public/values-uz/strings.xml b/slice/slice-core/src/main/res-public/values-uz/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-uz/strings.xml
rename to slice/slice-core/src/main/res-public/values-uz/strings.xml

diff --git a/slice/core/src/main/res-public/values-v28/strings.xml b/slice/slice-core/src/main/res-public/values-v28/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-v28/strings.xml
rename to slice/slice-core/src/main/res-public/values-v28/strings.xml

diff --git a/slice/core/src/main/res-public/values-vi/strings.xml b/slice/slice-core/src/main/res-public/values-vi/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-vi/strings.xml
rename to slice/slice-core/src/main/res-public/values-vi/strings.xml

diff --git a/slice/core/src/main/res-public/values-zh-rCN/strings.xml b/slice/slice-core/src/main/res-public/values-zh-rCN/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-zh-rCN/strings.xml
rename to slice/slice-core/src/main/res-public/values-zh-rCN/strings.xml

diff --git a/slice/core/src/main/res-public/values-zh-rHK/strings.xml b/slice/slice-core/src/main/res-public/values-zh-rHK/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-zh-rHK/strings.xml
rename to slice/slice-core/src/main/res-public/values-zh-rHK/strings.xml

diff --git a/slice/core/src/main/res-public/values-zh-rTW/strings.xml b/slice/slice-core/src/main/res-public/values-zh-rTW/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-zh-rTW/strings.xml
rename to slice/slice-core/src/main/res-public/values-zh-rTW/strings.xml

diff --git a/slice/core/src/main/res-public/values-zu/strings.xml b/slice/slice-core/src/main/res-public/values-zu/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values-zu/strings.xml
rename to slice/slice-core/src/main/res-public/values-zu/strings.xml

diff --git a/slice/core/src/main/res-public/values/strings.xml b/slice/slice-core/src/main/res-public/values/strings.xml
similarity index 100%
rename from slice/core/src/main/res-public/values/strings.xml
rename to slice/slice-core/src/main/res-public/values/strings.xml

diff --git a/slice/core/src/main/res/drawable/abc_ic_arrow_forward.xml b/slice/slice-core/src/main/res/drawable/abc_ic_arrow_forward.xml
similarity index 100%
rename from slice/core/src/main/res/drawable/abc_ic_arrow_forward.xml
rename to slice/slice-core/src/main/res/drawable/abc_ic_arrow_forward.xml

diff --git a/slice/core/src/main/res/drawable/abc_ic_permission.xml b/slice/slice-core/src/main/res/drawable/abc_ic_permission.xml
similarity index 100%
rename from slice/core/src/main/res/drawable/abc_ic_permission.xml
rename to slice/slice-core/src/main/res/drawable/abc_ic_permission.xml

diff --git a/slice/core/src/main/res/layout/abc_slice_permission_request.xml b/slice/slice-core/src/main/res/layout/abc_slice_permission_request.xml
similarity index 100%
rename from slice/core/src/main/res/layout/abc_slice_permission_request.xml
rename to slice/slice-core/src/main/res/layout/abc_slice_permission_request.xml

diff --git a/slice/core/src/main/res/values-af/strings.xml b/slice/slice-core/src/main/res/values-af/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-af/strings.xml
rename to slice/slice-core/src/main/res/values-af/strings.xml

diff --git a/slice/core/src/main/res/values-am/strings.xml b/slice/slice-core/src/main/res/values-am/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-am/strings.xml
rename to slice/slice-core/src/main/res/values-am/strings.xml

diff --git a/slice/core/src/main/res/values-ar/strings.xml b/slice/slice-core/src/main/res/values-ar/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ar/strings.xml
rename to slice/slice-core/src/main/res/values-ar/strings.xml

diff --git a/slice/core/src/main/res/values-as/strings.xml b/slice/slice-core/src/main/res/values-as/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-as/strings.xml
rename to slice/slice-core/src/main/res/values-as/strings.xml

diff --git a/slice/core/src/main/res/values-az/strings.xml b/slice/slice-core/src/main/res/values-az/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-az/strings.xml
rename to slice/slice-core/src/main/res/values-az/strings.xml

diff --git a/slice/core/src/main/res/values-b+sr+Latn/strings.xml b/slice/slice-core/src/main/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-b+sr+Latn/strings.xml
rename to slice/slice-core/src/main/res/values-b+sr+Latn/strings.xml

diff --git a/slice/core/src/main/res/values-be/strings.xml b/slice/slice-core/src/main/res/values-be/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-be/strings.xml
rename to slice/slice-core/src/main/res/values-be/strings.xml

diff --git a/slice/core/src/main/res/values-bg/strings.xml b/slice/slice-core/src/main/res/values-bg/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-bg/strings.xml
rename to slice/slice-core/src/main/res/values-bg/strings.xml

diff --git a/slice/core/src/main/res/values-bn/strings.xml b/slice/slice-core/src/main/res/values-bn/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-bn/strings.xml
rename to slice/slice-core/src/main/res/values-bn/strings.xml

diff --git a/slice/core/src/main/res/values-bs/strings.xml b/slice/slice-core/src/main/res/values-bs/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-bs/strings.xml
rename to slice/slice-core/src/main/res/values-bs/strings.xml

diff --git a/slice/core/src/main/res/values-ca/strings.xml b/slice/slice-core/src/main/res/values-ca/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ca/strings.xml
rename to slice/slice-core/src/main/res/values-ca/strings.xml

diff --git a/slice/core/src/main/res/values-cs/strings.xml b/slice/slice-core/src/main/res/values-cs/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-cs/strings.xml
rename to slice/slice-core/src/main/res/values-cs/strings.xml

diff --git a/slice/core/src/main/res/values-da/strings.xml b/slice/slice-core/src/main/res/values-da/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-da/strings.xml
rename to slice/slice-core/src/main/res/values-da/strings.xml

diff --git a/slice/core/src/main/res/values-de/strings.xml b/slice/slice-core/src/main/res/values-de/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-de/strings.xml
rename to slice/slice-core/src/main/res/values-de/strings.xml

diff --git a/slice/core/src/main/res/values-el/strings.xml b/slice/slice-core/src/main/res/values-el/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-el/strings.xml
rename to slice/slice-core/src/main/res/values-el/strings.xml

diff --git a/slice/core/src/main/res/values-en-rAU/strings.xml b/slice/slice-core/src/main/res/values-en-rAU/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-en-rAU/strings.xml
rename to slice/slice-core/src/main/res/values-en-rAU/strings.xml

diff --git a/slice/core/src/main/res/values-en-rCA/strings.xml b/slice/slice-core/src/main/res/values-en-rCA/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-en-rCA/strings.xml
rename to slice/slice-core/src/main/res/values-en-rCA/strings.xml

diff --git a/slice/core/src/main/res/values-en-rGB/strings.xml b/slice/slice-core/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-en-rGB/strings.xml
rename to slice/slice-core/src/main/res/values-en-rGB/strings.xml

diff --git a/slice/core/src/main/res/values-en-rIN/strings.xml b/slice/slice-core/src/main/res/values-en-rIN/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-en-rIN/strings.xml
rename to slice/slice-core/src/main/res/values-en-rIN/strings.xml

diff --git a/slice/core/src/main/res/values-en-rXC/strings.xml b/slice/slice-core/src/main/res/values-en-rXC/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-en-rXC/strings.xml
rename to slice/slice-core/src/main/res/values-en-rXC/strings.xml

diff --git a/slice/core/src/main/res/values-es-rUS/strings.xml b/slice/slice-core/src/main/res/values-es-rUS/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-es-rUS/strings.xml
rename to slice/slice-core/src/main/res/values-es-rUS/strings.xml

diff --git a/slice/core/src/main/res/values-es/strings.xml b/slice/slice-core/src/main/res/values-es/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-es/strings.xml
rename to slice/slice-core/src/main/res/values-es/strings.xml

diff --git a/slice/core/src/main/res/values-et/strings.xml b/slice/slice-core/src/main/res/values-et/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-et/strings.xml
rename to slice/slice-core/src/main/res/values-et/strings.xml

diff --git a/slice/core/src/main/res/values-eu/strings.xml b/slice/slice-core/src/main/res/values-eu/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-eu/strings.xml
rename to slice/slice-core/src/main/res/values-eu/strings.xml

diff --git a/slice/core/src/main/res/values-fa/strings.xml b/slice/slice-core/src/main/res/values-fa/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-fa/strings.xml
rename to slice/slice-core/src/main/res/values-fa/strings.xml

diff --git a/slice/core/src/main/res/values-fi/strings.xml b/slice/slice-core/src/main/res/values-fi/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-fi/strings.xml
rename to slice/slice-core/src/main/res/values-fi/strings.xml

diff --git a/slice/core/src/main/res/values-fr-rCA/strings.xml b/slice/slice-core/src/main/res/values-fr-rCA/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-fr-rCA/strings.xml
rename to slice/slice-core/src/main/res/values-fr-rCA/strings.xml

diff --git a/slice/core/src/main/res/values-fr/strings.xml b/slice/slice-core/src/main/res/values-fr/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-fr/strings.xml
rename to slice/slice-core/src/main/res/values-fr/strings.xml

diff --git a/slice/core/src/main/res/values-gl/strings.xml b/slice/slice-core/src/main/res/values-gl/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-gl/strings.xml
rename to slice/slice-core/src/main/res/values-gl/strings.xml

diff --git a/slice/core/src/main/res/values-gu/strings.xml b/slice/slice-core/src/main/res/values-gu/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-gu/strings.xml
rename to slice/slice-core/src/main/res/values-gu/strings.xml

diff --git a/slice/core/src/main/res/values-hi/strings.xml b/slice/slice-core/src/main/res/values-hi/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-hi/strings.xml
rename to slice/slice-core/src/main/res/values-hi/strings.xml

diff --git a/slice/core/src/main/res/values-hr/strings.xml b/slice/slice-core/src/main/res/values-hr/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-hr/strings.xml
rename to slice/slice-core/src/main/res/values-hr/strings.xml

diff --git a/slice/core/src/main/res/values-hu/strings.xml b/slice/slice-core/src/main/res/values-hu/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-hu/strings.xml
rename to slice/slice-core/src/main/res/values-hu/strings.xml

diff --git a/slice/core/src/main/res/values-hy/strings.xml b/slice/slice-core/src/main/res/values-hy/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-hy/strings.xml
rename to slice/slice-core/src/main/res/values-hy/strings.xml

diff --git a/slice/core/src/main/res/values-in/strings.xml b/slice/slice-core/src/main/res/values-in/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-in/strings.xml
rename to slice/slice-core/src/main/res/values-in/strings.xml

diff --git a/slice/core/src/main/res/values-is/strings.xml b/slice/slice-core/src/main/res/values-is/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-is/strings.xml
rename to slice/slice-core/src/main/res/values-is/strings.xml

diff --git a/slice/core/src/main/res/values-it/strings.xml b/slice/slice-core/src/main/res/values-it/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-it/strings.xml
rename to slice/slice-core/src/main/res/values-it/strings.xml

diff --git a/slice/core/src/main/res/values-iw/strings.xml b/slice/slice-core/src/main/res/values-iw/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-iw/strings.xml
rename to slice/slice-core/src/main/res/values-iw/strings.xml

diff --git a/slice/core/src/main/res/values-ja/strings.xml b/slice/slice-core/src/main/res/values-ja/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ja/strings.xml
rename to slice/slice-core/src/main/res/values-ja/strings.xml

diff --git a/slice/core/src/main/res/values-ka/strings.xml b/slice/slice-core/src/main/res/values-ka/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ka/strings.xml
rename to slice/slice-core/src/main/res/values-ka/strings.xml

diff --git a/slice/core/src/main/res/values-kk/strings.xml b/slice/slice-core/src/main/res/values-kk/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-kk/strings.xml
rename to slice/slice-core/src/main/res/values-kk/strings.xml

diff --git a/slice/core/src/main/res/values-km/strings.xml b/slice/slice-core/src/main/res/values-km/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-km/strings.xml
rename to slice/slice-core/src/main/res/values-km/strings.xml

diff --git a/slice/core/src/main/res/values-kn/strings.xml b/slice/slice-core/src/main/res/values-kn/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-kn/strings.xml
rename to slice/slice-core/src/main/res/values-kn/strings.xml

diff --git a/slice/core/src/main/res/values-ko/strings.xml b/slice/slice-core/src/main/res/values-ko/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ko/strings.xml
rename to slice/slice-core/src/main/res/values-ko/strings.xml

diff --git a/slice/core/src/main/res/values-ky/strings.xml b/slice/slice-core/src/main/res/values-ky/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ky/strings.xml
rename to slice/slice-core/src/main/res/values-ky/strings.xml

diff --git a/slice/core/src/main/res/values-lo/strings.xml b/slice/slice-core/src/main/res/values-lo/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-lo/strings.xml
rename to slice/slice-core/src/main/res/values-lo/strings.xml

diff --git a/slice/core/src/main/res/values-lt/strings.xml b/slice/slice-core/src/main/res/values-lt/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-lt/strings.xml
rename to slice/slice-core/src/main/res/values-lt/strings.xml

diff --git a/slice/core/src/main/res/values-lv/strings.xml b/slice/slice-core/src/main/res/values-lv/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-lv/strings.xml
rename to slice/slice-core/src/main/res/values-lv/strings.xml

diff --git a/slice/core/src/main/res/values-mk/strings.xml b/slice/slice-core/src/main/res/values-mk/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-mk/strings.xml
rename to slice/slice-core/src/main/res/values-mk/strings.xml

diff --git a/slice/core/src/main/res/values-ml/strings.xml b/slice/slice-core/src/main/res/values-ml/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ml/strings.xml
rename to slice/slice-core/src/main/res/values-ml/strings.xml

diff --git a/slice/core/src/main/res/values-mn/strings.xml b/slice/slice-core/src/main/res/values-mn/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-mn/strings.xml
rename to slice/slice-core/src/main/res/values-mn/strings.xml

diff --git a/slice/core/src/main/res/values-mr/strings.xml b/slice/slice-core/src/main/res/values-mr/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-mr/strings.xml
rename to slice/slice-core/src/main/res/values-mr/strings.xml

diff --git a/slice/core/src/main/res/values-ms/strings.xml b/slice/slice-core/src/main/res/values-ms/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ms/strings.xml
rename to slice/slice-core/src/main/res/values-ms/strings.xml

diff --git a/slice/core/src/main/res/values-my/strings.xml b/slice/slice-core/src/main/res/values-my/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-my/strings.xml
rename to slice/slice-core/src/main/res/values-my/strings.xml

diff --git a/slice/core/src/main/res/values-nb/strings.xml b/slice/slice-core/src/main/res/values-nb/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-nb/strings.xml
rename to slice/slice-core/src/main/res/values-nb/strings.xml

diff --git a/slice/core/src/main/res/values-ne/strings.xml b/slice/slice-core/src/main/res/values-ne/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ne/strings.xml
rename to slice/slice-core/src/main/res/values-ne/strings.xml

diff --git a/slice/core/src/main/res/values-nl/strings.xml b/slice/slice-core/src/main/res/values-nl/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-nl/strings.xml
rename to slice/slice-core/src/main/res/values-nl/strings.xml

diff --git a/slice/core/src/main/res/values-or/strings.xml b/slice/slice-core/src/main/res/values-or/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-or/strings.xml
rename to slice/slice-core/src/main/res/values-or/strings.xml

diff --git a/slice/core/src/main/res/values-pa/strings.xml b/slice/slice-core/src/main/res/values-pa/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-pa/strings.xml
rename to slice/slice-core/src/main/res/values-pa/strings.xml

diff --git a/slice/core/src/main/res/values-pl/strings.xml b/slice/slice-core/src/main/res/values-pl/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-pl/strings.xml
rename to slice/slice-core/src/main/res/values-pl/strings.xml

diff --git a/slice/core/src/main/res/values-pt-rBR/strings.xml b/slice/slice-core/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-pt-rBR/strings.xml
rename to slice/slice-core/src/main/res/values-pt-rBR/strings.xml

diff --git a/slice/core/src/main/res/values-pt-rPT/strings.xml b/slice/slice-core/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-pt-rPT/strings.xml
rename to slice/slice-core/src/main/res/values-pt-rPT/strings.xml

diff --git a/slice/core/src/main/res/values-pt/strings.xml b/slice/slice-core/src/main/res/values-pt/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-pt/strings.xml
rename to slice/slice-core/src/main/res/values-pt/strings.xml

diff --git a/slice/core/src/main/res/values-ro/strings.xml b/slice/slice-core/src/main/res/values-ro/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ro/strings.xml
rename to slice/slice-core/src/main/res/values-ro/strings.xml

diff --git a/slice/core/src/main/res/values-ru/strings.xml b/slice/slice-core/src/main/res/values-ru/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ru/strings.xml
rename to slice/slice-core/src/main/res/values-ru/strings.xml

diff --git a/slice/core/src/main/res/values-si/strings.xml b/slice/slice-core/src/main/res/values-si/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-si/strings.xml
rename to slice/slice-core/src/main/res/values-si/strings.xml

diff --git a/slice/core/src/main/res/values-sk/strings.xml b/slice/slice-core/src/main/res/values-sk/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-sk/strings.xml
rename to slice/slice-core/src/main/res/values-sk/strings.xml

diff --git a/slice/core/src/main/res/values-sl/strings.xml b/slice/slice-core/src/main/res/values-sl/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-sl/strings.xml
rename to slice/slice-core/src/main/res/values-sl/strings.xml

diff --git a/slice/core/src/main/res/values-sq/strings.xml b/slice/slice-core/src/main/res/values-sq/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-sq/strings.xml
rename to slice/slice-core/src/main/res/values-sq/strings.xml

diff --git a/slice/core/src/main/res/values-sr/strings.xml b/slice/slice-core/src/main/res/values-sr/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-sr/strings.xml
rename to slice/slice-core/src/main/res/values-sr/strings.xml

diff --git a/slice/core/src/main/res/values-sv/strings.xml b/slice/slice-core/src/main/res/values-sv/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-sv/strings.xml
rename to slice/slice-core/src/main/res/values-sv/strings.xml

diff --git a/slice/core/src/main/res/values-sw/strings.xml b/slice/slice-core/src/main/res/values-sw/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-sw/strings.xml
rename to slice/slice-core/src/main/res/values-sw/strings.xml

diff --git a/slice/core/src/main/res/values-ta/strings.xml b/slice/slice-core/src/main/res/values-ta/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ta/strings.xml
rename to slice/slice-core/src/main/res/values-ta/strings.xml

diff --git a/slice/core/src/main/res/values-te/strings.xml b/slice/slice-core/src/main/res/values-te/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-te/strings.xml
rename to slice/slice-core/src/main/res/values-te/strings.xml

diff --git a/slice/core/src/main/res/values-th/strings.xml b/slice/slice-core/src/main/res/values-th/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-th/strings.xml
rename to slice/slice-core/src/main/res/values-th/strings.xml

diff --git a/slice/core/src/main/res/values-tl/strings.xml b/slice/slice-core/src/main/res/values-tl/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-tl/strings.xml
rename to slice/slice-core/src/main/res/values-tl/strings.xml

diff --git a/slice/core/src/main/res/values-tr/strings.xml b/slice/slice-core/src/main/res/values-tr/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-tr/strings.xml
rename to slice/slice-core/src/main/res/values-tr/strings.xml

diff --git a/slice/core/src/main/res/values-uk/strings.xml b/slice/slice-core/src/main/res/values-uk/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-uk/strings.xml
rename to slice/slice-core/src/main/res/values-uk/strings.xml

diff --git a/slice/core/src/main/res/values-ur/strings.xml b/slice/slice-core/src/main/res/values-ur/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-ur/strings.xml
rename to slice/slice-core/src/main/res/values-ur/strings.xml

diff --git a/slice/core/src/main/res/values-uz/strings.xml b/slice/slice-core/src/main/res/values-uz/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-uz/strings.xml
rename to slice/slice-core/src/main/res/values-uz/strings.xml

diff --git a/slice/core/src/main/res/values-vi/strings.xml b/slice/slice-core/src/main/res/values-vi/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-vi/strings.xml
rename to slice/slice-core/src/main/res/values-vi/strings.xml

diff --git a/slice/core/src/main/res/values-zh-rCN/strings.xml b/slice/slice-core/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-zh-rCN/strings.xml
rename to slice/slice-core/src/main/res/values-zh-rCN/strings.xml

diff --git a/slice/core/src/main/res/values-zh-rHK/strings.xml b/slice/slice-core/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-zh-rHK/strings.xml
rename to slice/slice-core/src/main/res/values-zh-rHK/strings.xml

diff --git a/slice/core/src/main/res/values-zh-rTW/strings.xml b/slice/slice-core/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-zh-rTW/strings.xml
rename to slice/slice-core/src/main/res/values-zh-rTW/strings.xml

diff --git a/slice/core/src/main/res/values-zu/strings.xml b/slice/slice-core/src/main/res/values-zu/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values-zu/strings.xml
rename to slice/slice-core/src/main/res/values-zu/strings.xml

diff --git a/slice/core/src/main/res/values/strings.xml b/slice/slice-core/src/main/res/values/strings.xml
similarity index 100%
rename from slice/core/src/main/res/values/strings.xml
rename to slice/slice-core/src/main/res/values/strings.xml

diff --git a/slice/remotecallback/api/current.txt b/slice/slice-remotecallback/api/current.txt
similarity index 100%
rename from slice/remotecallback/api/current.txt
rename to slice/slice-remotecallback/api/current.txt

diff --git a/slice/remotecallback/api/public_plus_experimental_current.txt b/slice/slice-remotecallback/api/public_plus_experimental_current.txt
similarity index 100%
rename from slice/remotecallback/api/public_plus_experimental_current.txt
rename to slice/slice-remotecallback/api/public_plus_experimental_current.txt

diff --git a/slice/remotecallback/api/res-current.txt b/slice/slice-remotecallback/api/res-current.txt
similarity index 100%
rename from slice/remotecallback/api/res-current.txt
rename to slice/slice-remotecallback/api/res-current.txt

diff --git a/slice/remotecallback/api/restricted_current.txt b/slice/slice-remotecallback/api/restricted_current.txt
similarity index 100%
rename from slice/remotecallback/api/restricted_current.txt
rename to slice/slice-remotecallback/api/restricted_current.txt

diff --git a/slice/remotecallback/build.gradle b/slice/slice-remotecallback/build.gradle
similarity index 100%
rename from slice/remotecallback/build.gradle
rename to slice/slice-remotecallback/build.gradle

diff --git a/slice/remotecallback/src/androidTest/AndroidManifest.xml b/slice/slice-remotecallback/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from slice/remotecallback/src/androidTest/AndroidManifest.xml
rename to slice/slice-remotecallback/src/androidTest/AndroidManifest.xml

diff --git a/slice/remotecallback/src/androidTest/java/androidx/slice/remotecallback/RemoteSliceProviderTest.java b/slice/slice-remotecallback/src/androidTest/java/androidx/slice/remotecallback/RemoteSliceProviderTest.java
similarity index 100%
rename from slice/remotecallback/src/androidTest/java/androidx/slice/remotecallback/RemoteSliceProviderTest.java
rename to slice/slice-remotecallback/src/androidTest/java/androidx/slice/remotecallback/RemoteSliceProviderTest.java

diff --git a/slice/remotecallback/src/main/AndroidManifest.xml b/slice/slice-remotecallback/src/main/AndroidManifest.xml
similarity index 100%
rename from slice/remotecallback/src/main/AndroidManifest.xml
rename to slice/slice-remotecallback/src/main/AndroidManifest.xml

diff --git a/slice/remotecallback/src/main/java/androidx/slice/remotecallback/RemoteSliceProvider.java b/slice/slice-remotecallback/src/main/java/androidx/slice/remotecallback/RemoteSliceProvider.java
similarity index 100%
rename from slice/remotecallback/src/main/java/androidx/slice/remotecallback/RemoteSliceProvider.java
rename to slice/slice-remotecallback/src/main/java/androidx/slice/remotecallback/RemoteSliceProvider.java

diff --git a/slice/test/build.gradle b/slice/slice-test/build.gradle
similarity index 100%
rename from slice/test/build.gradle
rename to slice/slice-test/build.gradle

diff --git a/slice/test/lint-baseline.xml b/slice/slice-test/lint-baseline.xml
similarity index 100%
rename from slice/test/lint-baseline.xml
rename to slice/slice-test/lint-baseline.xml

diff --git a/slice/test/src/main/AndroidManifest.xml b/slice/slice-test/src/main/AndroidManifest.xml
similarity index 100%
rename from slice/test/src/main/AndroidManifest.xml
rename to slice/slice-test/src/main/AndroidManifest.xml

diff --git a/slice/test/src/main/java/androidx/slice/test/SampleSliceProvider.java b/slice/slice-test/src/main/java/androidx/slice/test/SampleSliceProvider.java
similarity index 100%
rename from slice/test/src/main/java/androidx/slice/test/SampleSliceProvider.java
rename to slice/slice-test/src/main/java/androidx/slice/test/SampleSliceProvider.java

diff --git a/slice/test/src/main/java/androidx/slice/test/SliceBroadcastReceiver.java b/slice/slice-test/src/main/java/androidx/slice/test/SliceBroadcastReceiver.java
similarity index 100%
rename from slice/test/src/main/java/androidx/slice/test/SliceBroadcastReceiver.java
rename to slice/slice-test/src/main/java/androidx/slice/test/SliceBroadcastReceiver.java

diff --git a/slice/test/src/main/res/drawable/cake.png b/slice/slice-test/src/main/res/drawable/cake.png
similarity index 100%
rename from slice/test/src/main/res/drawable/cake.png
rename to slice/slice-test/src/main/res/drawable/cake.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/cat.jpeg b/slice/slice-test/src/main/res/drawable/cat.jpeg
similarity index 100%
rename from slice/test/src/main/res/drawable/cat.jpeg
rename to slice/slice-test/src/main/res/drawable/cat.jpeg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/cat_1.png b/slice/slice-test/src/main/res/drawable/cat_1.png
similarity index 100%
rename from slice/test/src/main/res/drawable/cat_1.png
rename to slice/slice-test/src/main/res/drawable/cat_1.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/cat_2.png b/slice/slice-test/src/main/res/drawable/cat_2.png
similarity index 100%
rename from slice/test/src/main/res/drawable/cat_2.png
rename to slice/slice-test/src/main/res/drawable/cat_2.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/cat_3.png b/slice/slice-test/src/main/res/drawable/cat_3.png
similarity index 100%
rename from slice/test/src/main/res/drawable/cat_3.png
rename to slice/slice-test/src/main/res/drawable/cat_3.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/cat_4.png b/slice/slice-test/src/main/res/drawable/cat_4.png
similarity index 100%
rename from slice/test/src/main/res/drawable/cat_4.png
rename to slice/slice-test/src/main/res/drawable/cat_4.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/cat_5.png b/slice/slice-test/src/main/res/drawable/cat_5.png
similarity index 100%
rename from slice/test/src/main/res/drawable/cat_5.png
rename to slice/slice-test/src/main/res/drawable/cat_5.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/cat_6.png b/slice/slice-test/src/main/res/drawable/cat_6.png
similarity index 100%
rename from slice/test/src/main/res/drawable/cat_6.png
rename to slice/slice-test/src/main/res/drawable/cat_6.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/cheese.png b/slice/slice-test/src/main/res/drawable/cheese.png
similarity index 100%
rename from slice/test/src/main/res/drawable/cheese.png
rename to slice/slice-test/src/main/res/drawable/cheese.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/ic_call.xml b/slice/slice-test/src/main/res/drawable/ic_call.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_call.xml
rename to slice/slice-test/src/main/res/drawable/ic_call.xml

diff --git a/slice/test/src/main/res/drawable/ic_camera.xml b/slice/slice-test/src/main/res/drawable/ic_camera.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_camera.xml
rename to slice/slice-test/src/main/res/drawable/ic_camera.xml

diff --git a/slice/test/src/main/res/drawable/ic_car.xml b/slice/slice-test/src/main/res/drawable/ic_car.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_car.xml
rename to slice/slice-test/src/main/res/drawable/ic_car.xml

diff --git a/slice/test/src/main/res/drawable/ic_cast.xml b/slice/slice-test/src/main/res/drawable/ic_cast.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_cast.xml
rename to slice/slice-test/src/main/res/drawable/ic_cast.xml

diff --git a/slice/test/src/main/res/drawable/ic_check.xml b/slice/slice-test/src/main/res/drawable/ic_check.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_check.xml
rename to slice/slice-test/src/main/res/drawable/ic_check.xml

diff --git a/slice/test/src/main/res/drawable/ic_create.xml b/slice/slice-test/src/main/res/drawable/ic_create.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_create.xml
rename to slice/slice-test/src/main/res/drawable/ic_create.xml

diff --git a/slice/test/src/main/res/drawable/ic_email.xml b/slice/slice-test/src/main/res/drawable/ic_email.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_email.xml
rename to slice/slice-test/src/main/res/drawable/ic_email.xml

diff --git a/slice/test/src/main/res/drawable/ic_error.xml b/slice/slice-test/src/main/res/drawable/ic_error.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_error.xml
rename to slice/slice-test/src/main/res/drawable/ic_error.xml

diff --git a/slice/test/src/main/res/drawable/ic_home.xml b/slice/slice-test/src/main/res/drawable/ic_home.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_home.xml
rename to slice/slice-test/src/main/res/drawable/ic_home.xml

diff --git a/slice/test/src/main/res/drawable/ic_large.xml b/slice/slice-test/src/main/res/drawable/ic_large.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_large.xml
rename to slice/slice-test/src/main/res/drawable/ic_large.xml

diff --git a/slice/test/src/main/res/drawable/ic_location.xml b/slice/slice-test/src/main/res/drawable/ic_location.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_location.xml
rename to slice/slice-test/src/main/res/drawable/ic_location.xml

diff --git a/slice/test/src/main/res/drawable/ic_lock.xml b/slice/slice-test/src/main/res/drawable/ic_lock.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_lock.xml
rename to slice/slice-test/src/main/res/drawable/ic_lock.xml

diff --git a/slice/test/src/main/res/drawable/ic_more.xml b/slice/slice-test/src/main/res/drawable/ic_more.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_more.xml
rename to slice/slice-test/src/main/res/drawable/ic_more.xml

diff --git a/slice/test/src/main/res/drawable/ic_note.xml b/slice/slice-test/src/main/res/drawable/ic_note.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_note.xml
rename to slice/slice-test/src/main/res/drawable/ic_note.xml

diff --git a/slice/test/src/main/res/drawable/ic_right_caret.xml b/slice/slice-test/src/main/res/drawable/ic_right_caret.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_right_caret.xml
rename to slice/slice-test/src/main/res/drawable/ic_right_caret.xml

diff --git a/slice/test/src/main/res/drawable/ic_school.xml b/slice/slice-test/src/main/res/drawable/ic_school.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_school.xml
rename to slice/slice-test/src/main/res/drawable/ic_school.xml

diff --git a/slice/test/src/main/res/drawable/ic_share.xml b/slice/slice-test/src/main/res/drawable/ic_share.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_share.xml
rename to slice/slice-test/src/main/res/drawable/ic_share.xml

diff --git a/slice/test/src/main/res/drawable/ic_shortcut.xml b/slice/slice-test/src/main/res/drawable/ic_shortcut.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_shortcut.xml
rename to slice/slice-test/src/main/res/drawable/ic_shortcut.xml

diff --git a/slice/test/src/main/res/drawable/ic_small.xml b/slice/slice-test/src/main/res/drawable/ic_small.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_small.xml
rename to slice/slice-test/src/main/res/drawable/ic_small.xml

diff --git a/slice/test/src/main/res/drawable/ic_speak.xml b/slice/slice-test/src/main/res/drawable/ic_speak.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_speak.xml
rename to slice/slice-test/src/main/res/drawable/ic_speak.xml

diff --git a/slice/test/src/main/res/drawable/ic_star_off.xml b/slice/slice-test/src/main/res/drawable/ic_star_off.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_star_off.xml
rename to slice/slice-test/src/main/res/drawable/ic_star_off.xml

diff --git a/slice/test/src/main/res/drawable/ic_star_on.xml b/slice/slice-test/src/main/res/drawable/ic_star_on.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_star_on.xml
rename to slice/slice-test/src/main/res/drawable/ic_star_on.xml

diff --git a/slice/test/src/main/res/drawable/ic_text.xml b/slice/slice-test/src/main/res/drawable/ic_text.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_text.xml
rename to slice/slice-test/src/main/res/drawable/ic_text.xml

diff --git a/slice/test/src/main/res/drawable/ic_unchecked.xml b/slice/slice-test/src/main/res/drawable/ic_unchecked.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_unchecked.xml
rename to slice/slice-test/src/main/res/drawable/ic_unchecked.xml

diff --git a/slice/test/src/main/res/drawable/ic_video.xml b/slice/slice-test/src/main/res/drawable/ic_video.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_video.xml
rename to slice/slice-test/src/main/res/drawable/ic_video.xml

diff --git a/slice/test/src/main/res/drawable/ic_voice.xml b/slice/slice-test/src/main/res/drawable/ic_voice.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_voice.xml
rename to slice/slice-test/src/main/res/drawable/ic_voice.xml

diff --git a/slice/test/src/main/res/drawable/ic_wifi.xml b/slice/slice-test/src/main/res/drawable/ic_wifi.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_wifi.xml
rename to slice/slice-test/src/main/res/drawable/ic_wifi.xml

diff --git a/slice/test/src/main/res/drawable/ic_wifi_fair.xml b/slice/slice-test/src/main/res/drawable/ic_wifi_fair.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_wifi_fair.xml
rename to slice/slice-test/src/main/res/drawable/ic_wifi_fair.xml

diff --git a/slice/test/src/main/res/drawable/ic_wifi_full.xml b/slice/slice-test/src/main/res/drawable/ic_wifi_full.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_wifi_full.xml
rename to slice/slice-test/src/main/res/drawable/ic_wifi_full.xml

diff --git a/slice/test/src/main/res/drawable/ic_wifi_low.xml b/slice/slice-test/src/main/res/drawable/ic_wifi_low.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_wifi_low.xml
rename to slice/slice-test/src/main/res/drawable/ic_wifi_low.xml

diff --git a/slice/test/src/main/res/drawable/ic_work.xml b/slice/slice-test/src/main/res/drawable/ic_work.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/ic_work.xml
rename to slice/slice-test/src/main/res/drawable/ic_work.xml

diff --git a/slice/test/src/main/res/drawable/landscape.jpg b/slice/slice-test/src/main/res/drawable/landscape.jpg
similarity index 100%
rename from slice/test/src/main/res/drawable/landscape.jpg
rename to slice/slice-test/src/main/res/drawable/landscape.jpg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/mady.jpg b/slice/slice-test/src/main/res/drawable/mady.jpg
similarity index 100%
rename from slice/test/src/main/res/drawable/mady.jpg
rename to slice/slice-test/src/main/res/drawable/mady.jpg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/message.png b/slice/slice-test/src/main/res/drawable/message.png
similarity index 100%
rename from slice/test/src/main/res/drawable/message.png
rename to slice/slice-test/src/main/res/drawable/message.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/pizza.png b/slice/slice-test/src/main/res/drawable/pizza.png
similarity index 100%
rename from slice/test/src/main/res/drawable/pizza.png
rename to slice/slice-test/src/main/res/drawable/pizza.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/pizza1.jpeg b/slice/slice-test/src/main/res/drawable/pizza1.jpeg
similarity index 100%
rename from slice/test/src/main/res/drawable/pizza1.jpeg
rename to slice/slice-test/src/main/res/drawable/pizza1.jpeg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/pizza2.jpg b/slice/slice-test/src/main/res/drawable/pizza2.jpg
similarity index 100%
rename from slice/test/src/main/res/drawable/pizza2.jpg
rename to slice/slice-test/src/main/res/drawable/pizza2.jpg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/pizza3.jpeg b/slice/slice-test/src/main/res/drawable/pizza3.jpeg
similarity index 100%
rename from slice/test/src/main/res/drawable/pizza3.jpeg
rename to slice/slice-test/src/main/res/drawable/pizza3.jpeg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/pizza4.jpeg b/slice/slice-test/src/main/res/drawable/pizza4.jpeg
similarity index 100%
rename from slice/test/src/main/res/drawable/pizza4.jpeg
rename to slice/slice-test/src/main/res/drawable/pizza4.jpeg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/portrait.jpg b/slice/slice-test/src/main/res/drawable/portrait.jpg
similarity index 100%
rename from slice/test/src/main/res/drawable/portrait.jpg
rename to slice/slice-test/src/main/res/drawable/portrait.jpg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/reservation.png b/slice/slice-test/src/main/res/drawable/reservation.png
similarity index 100%
rename from slice/test/src/main/res/drawable/reservation.png
rename to slice/slice-test/src/main/res/drawable/reservation.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/slices_1.jpg b/slice/slice-test/src/main/res/drawable/slices_1.jpg
similarity index 100%
rename from slice/test/src/main/res/drawable/slices_1.jpg
rename to slice/slice-test/src/main/res/drawable/slices_1.jpg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/slices_2.jpg b/slice/slice-test/src/main/res/drawable/slices_2.jpg
similarity index 100%
rename from slice/test/src/main/res/drawable/slices_2.jpg
rename to slice/slice-test/src/main/res/drawable/slices_2.jpg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/slices_3.jpg b/slice/slice-test/src/main/res/drawable/slices_3.jpg
similarity index 100%
rename from slice/test/src/main/res/drawable/slices_3.jpg
rename to slice/slice-test/src/main/res/drawable/slices_3.jpg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/slices_4.jpg b/slice/slice-test/src/main/res/drawable/slices_4.jpg
similarity index 100%
rename from slice/test/src/main/res/drawable/slices_4.jpg
rename to slice/slice-test/src/main/res/drawable/slices_4.jpg
Binary files differ

diff --git a/slice/test/src/main/res/drawable/toggle_check.xml b/slice/slice-test/src/main/res/drawable/toggle_check.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/toggle_check.xml
rename to slice/slice-test/src/main/res/drawable/toggle_check.xml

diff --git a/slice/test/src/main/res/drawable/toggle_star.xml b/slice/slice-test/src/main/res/drawable/toggle_star.xml
similarity index 100%
rename from slice/test/src/main/res/drawable/toggle_star.xml
rename to slice/slice-test/src/main/res/drawable/toggle_star.xml

diff --git a/slice/test/src/main/res/drawable/weather_1.png b/slice/slice-test/src/main/res/drawable/weather_1.png
similarity index 100%
rename from slice/test/src/main/res/drawable/weather_1.png
rename to slice/slice-test/src/main/res/drawable/weather_1.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/weather_2.png b/slice/slice-test/src/main/res/drawable/weather_2.png
similarity index 100%
rename from slice/test/src/main/res/drawable/weather_2.png
rename to slice/slice-test/src/main/res/drawable/weather_2.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/weather_3.png b/slice/slice-test/src/main/res/drawable/weather_3.png
similarity index 100%
rename from slice/test/src/main/res/drawable/weather_3.png
rename to slice/slice-test/src/main/res/drawable/weather_3.png
Binary files differ

diff --git a/slice/test/src/main/res/drawable/weather_4.png b/slice/slice-test/src/main/res/drawable/weather_4.png
similarity index 100%
rename from slice/test/src/main/res/drawable/weather_4.png
rename to slice/slice-test/src/main/res/drawable/weather_4.png
Binary files differ

diff --git a/slice/view/api/api_lint.ignore b/slice/slice-view/api/api_lint.ignore
similarity index 100%
rename from slice/view/api/api_lint.ignore
rename to slice/slice-view/api/api_lint.ignore

diff --git a/slice/view/api/current.txt b/slice/slice-view/api/current.txt
similarity index 100%
rename from slice/view/api/current.txt
rename to slice/slice-view/api/current.txt

diff --git a/slice/view/api/public_plus_experimental_1.0.0.txt b/slice/slice-view/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from slice/view/api/public_plus_experimental_1.0.0.txt
rename to slice/slice-view/api/public_plus_experimental_1.0.0.txt

diff --git a/slice/view/api/public_plus_experimental_current.txt b/slice/slice-view/api/public_plus_experimental_current.txt
similarity index 100%
rename from slice/view/api/public_plus_experimental_current.txt
rename to slice/slice-view/api/public_plus_experimental_current.txt

diff --git a/slice/view/api/removed_current.txt b/slice/slice-view/api/removed_current.txt
similarity index 100%
rename from slice/view/api/removed_current.txt
rename to slice/slice-view/api/removed_current.txt

diff --git a/slice/view/api/res-current.txt b/slice/slice-view/api/res-current.txt
similarity index 100%
rename from slice/view/api/res-current.txt
rename to slice/slice-view/api/res-current.txt

diff --git a/slice/view/api/restricted_1.0.0.txt b/slice/slice-view/api/restricted_1.0.0.txt
similarity index 100%
rename from slice/view/api/restricted_1.0.0.txt
rename to slice/slice-view/api/restricted_1.0.0.txt

diff --git a/slice/view/api/restricted_current.txt b/slice/slice-view/api/restricted_current.txt
similarity index 100%
rename from slice/view/api/restricted_current.txt
rename to slice/slice-view/api/restricted_current.txt

diff --git a/slice/view/build.gradle b/slice/slice-view/build.gradle
similarity index 100%
rename from slice/view/build.gradle
rename to slice/slice-view/build.gradle

diff --git a/slice/view/lint-baseline.xml b/slice/slice-view/lint-baseline.xml
similarity index 100%
rename from slice/view/lint-baseline.xml
rename to slice/slice-view/lint-baseline.xml

diff --git a/slice/view/src/androidTest/AndroidManifest.xml b/slice/slice-view/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from slice/view/src/androidTest/AndroidManifest.xml
rename to slice/slice-view/src/androidTest/AndroidManifest.xml

diff --git a/slice/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/SliceBuilderTest.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/SliceBuilderTest.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/SliceMetadataTest.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/SliceXmlTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/SliceXmlTest.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/SliceXmlTest.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/render/RenderTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/render/RenderTest.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/render/RenderTest.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/render/RenderTest.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java b/slice/slice-view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/render/SliceRenderer.java b/slice/slice-view/src/androidTest/java/androidx/slice/render/SliceRenderer.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/render/SliceRenderer.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/render/SliceRenderer.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/widget/CachedSliceLiveDataTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/widget/CachedSliceLiveDataTest.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/widget/CachedSliceLiveDataTest.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/widget/CachedSliceLiveDataTest.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/widget/SliceStyleTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/widget/SliceStyleTest.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/widget/SliceStyleTest.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/widget/SliceStyleTest.java

diff --git a/slice/view/src/androidTest/java/androidx/slice/widget/SliceViewTest.java b/slice/slice-view/src/androidTest/java/androidx/slice/widget/SliceViewTest.java
similarity index 100%
rename from slice/view/src/androidTest/java/androidx/slice/widget/SliceViewTest.java
rename to slice/slice-view/src/androidTest/java/androidx/slice/widget/SliceViewTest.java

diff --git a/slice/view/src/androidTest/res/layout/activity_demo.xml b/slice/slice-view/src/androidTest/res/layout/activity_demo.xml
similarity index 100%
rename from slice/view/src/androidTest/res/layout/activity_demo.xml
rename to slice/slice-view/src/androidTest/res/layout/activity_demo.xml

diff --git a/slice/view/src/androidTest/res/layout/hide_header_row_slice_view.xml b/slice/slice-view/src/androidTest/res/layout/hide_header_row_slice_view.xml
similarity index 100%
rename from slice/view/src/androidTest/res/layout/hide_header_row_slice_view.xml
rename to slice/slice-view/src/androidTest/res/layout/hide_header_row_slice_view.xml

diff --git a/slice/view/src/androidTest/res/layout/render_layout.xml b/slice/slice-view/src/androidTest/res/layout/render_layout.xml
similarity index 100%
rename from slice/view/src/androidTest/res/layout/render_layout.xml
rename to slice/slice-view/src/androidTest/res/layout/render_layout.xml

diff --git a/slice/view/src/androidTest/res/values/colors.xml b/slice/slice-view/src/androidTest/res/values/colors.xml
similarity index 100%
rename from slice/view/src/androidTest/res/values/colors.xml
rename to slice/slice-view/src/androidTest/res/values/colors.xml

diff --git a/slice/view/src/androidTest/res/values/donottranslate-strings.xml b/slice/slice-view/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from slice/view/src/androidTest/res/values/donottranslate-strings.xml
rename to slice/slice-view/src/androidTest/res/values/donottranslate-strings.xml

diff --git a/slice/view/src/androidTest/res/values/slice_style_test_colors.xml b/slice/slice-view/src/androidTest/res/values/slice_style_test_colors.xml
similarity index 100%
rename from slice/view/src/androidTest/res/values/slice_style_test_colors.xml
rename to slice/slice-view/src/androidTest/res/values/slice_style_test_colors.xml

diff --git a/slice/view/src/androidTest/res/values/slice_style_test_styles.xml b/slice/slice-view/src/androidTest/res/values/slice_style_test_styles.xml
similarity index 100%
rename from slice/view/src/androidTest/res/values/slice_style_test_styles.xml
rename to slice/slice-view/src/androidTest/res/values/slice_style_test_styles.xml

diff --git a/slice/view/src/androidTest/res/values/styles.xml b/slice/slice-view/src/androidTest/res/values/styles.xml
similarity index 100%
rename from slice/view/src/androidTest/res/values/styles.xml
rename to slice/slice-view/src/androidTest/res/values/styles.xml

diff --git a/slice/view/src/androidTest/res/xml/slice_style_test.xml b/slice/slice-view/src/androidTest/res/xml/slice_style_test.xml
similarity index 100%
rename from slice/view/src/androidTest/res/xml/slice_style_test.xml
rename to slice/slice-view/src/androidTest/res/xml/slice_style_test.xml

diff --git a/slice/view/src/main/AndroidManifest.xml b/slice/slice-view/src/main/AndroidManifest.xml
similarity index 100%
rename from slice/view/src/main/AndroidManifest.xml
rename to slice/slice-view/src/main/AndroidManifest.xml

diff --git a/slice/view/src/main/java/androidx/slice/SliceMetadata.java b/slice/slice-view/src/main/java/androidx/slice/SliceMetadata.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/SliceMetadata.java
rename to slice/slice-view/src/main/java/androidx/slice/SliceMetadata.java

diff --git a/slice/view/src/main/java/androidx/slice/SliceStructure.java b/slice/slice-view/src/main/java/androidx/slice/SliceStructure.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/SliceStructure.java
rename to slice/slice-view/src/main/java/androidx/slice/SliceStructure.java

diff --git a/slice/view/src/main/java/androidx/slice/SliceUtils.java b/slice/slice-view/src/main/java/androidx/slice/SliceUtils.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/SliceUtils.java
rename to slice/slice-view/src/main/java/androidx/slice/SliceUtils.java

diff --git a/slice/view/src/main/java/androidx/slice/SliceViewManager.java b/slice/slice-view/src/main/java/androidx/slice/SliceViewManager.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/SliceViewManager.java
rename to slice/slice-view/src/main/java/androidx/slice/SliceViewManager.java

diff --git a/slice/view/src/main/java/androidx/slice/SliceViewManagerBase.java b/slice/slice-view/src/main/java/androidx/slice/SliceViewManagerBase.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/SliceViewManagerBase.java
rename to slice/slice-view/src/main/java/androidx/slice/SliceViewManagerBase.java

diff --git a/slice/view/src/main/java/androidx/slice/SliceViewManagerCompat.java b/slice/slice-view/src/main/java/androidx/slice/SliceViewManagerCompat.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/SliceViewManagerCompat.java
rename to slice/slice-view/src/main/java/androidx/slice/SliceViewManagerCompat.java

diff --git a/slice/view/src/main/java/androidx/slice/SliceViewManagerWrapper.java b/slice/slice-view/src/main/java/androidx/slice/SliceViewManagerWrapper.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/SliceViewManagerWrapper.java
rename to slice/slice-view/src/main/java/androidx/slice/SliceViewManagerWrapper.java

diff --git a/slice/view/src/main/java/androidx/slice/SliceXml.java b/slice/slice-view/src/main/java/androidx/slice/SliceXml.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/SliceXml.java
rename to slice/slice-view/src/main/java/androidx/slice/SliceXml.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/ActionRow.java b/slice/slice-view/src/main/java/androidx/slice/widget/ActionRow.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/ActionRow.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/ActionRow.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/DisplayedListItems.java b/slice/slice-view/src/main/java/androidx/slice/widget/DisplayedListItems.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/DisplayedListItems.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/DisplayedListItems.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/EventInfo.java b/slice/slice-view/src/main/java/androidx/slice/widget/EventInfo.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/EventInfo.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/EventInfo.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/GridContent.java b/slice/slice-view/src/main/java/androidx/slice/widget/GridContent.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/GridContent.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/GridContent.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/GridRowView.java b/slice/slice-view/src/main/java/androidx/slice/widget/GridRowView.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/GridRowView.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/GridRowView.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/ListContent.java b/slice/slice-view/src/main/java/androidx/slice/widget/ListContent.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/ListContent.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/ListContent.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/LocationBasedViewTracker.java b/slice/slice-view/src/main/java/androidx/slice/widget/LocationBasedViewTracker.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/LocationBasedViewTracker.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/LocationBasedViewTracker.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/MessageView.java b/slice/slice-view/src/main/java/androidx/slice/widget/MessageView.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/MessageView.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/MessageView.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/RemoteInputView.java b/slice/slice-view/src/main/java/androidx/slice/widget/RemoteInputView.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/RemoteInputView.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/RemoteInputView.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/RowContent.java b/slice/slice-view/src/main/java/androidx/slice/widget/RowContent.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/RowContent.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/RowContent.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/RowStyle.java b/slice/slice-view/src/main/java/androidx/slice/widget/RowStyle.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/RowStyle.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/RowStyle.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/RowStyleFactory.java b/slice/slice-view/src/main/java/androidx/slice/widget/RowStyleFactory.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/RowStyleFactory.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/RowStyleFactory.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/RowView.java b/slice/slice-view/src/main/java/androidx/slice/widget/RowView.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/RowView.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/RowView.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/ShortcutView.java b/slice/slice-view/src/main/java/androidx/slice/widget/ShortcutView.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/ShortcutView.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/ShortcutView.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceActionView.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceActionView.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceActionView.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceActionView.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceAdapter.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceAdapter.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceAdapter.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceAdapter.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceChildView.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceChildView.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceChildView.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceChildView.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceContent.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceContent.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceContent.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceContent.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceLiveData.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceLiveData.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceLiveData.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceLiveData.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceMetrics.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceMetrics.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceMetrics.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceMetrics.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceMetricsWrapper.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceMetricsWrapper.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceMetricsWrapper.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceMetricsWrapper.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceStyle.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceStyle.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceStyle.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceStyle.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceView.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceView.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceView.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceView.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceViewPolicy.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceViewPolicy.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceViewPolicy.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceViewPolicy.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/SliceViewUtil.java b/slice/slice-view/src/main/java/androidx/slice/widget/SliceViewUtil.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/SliceViewUtil.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/SliceViewUtil.java

diff --git a/slice/view/src/main/java/androidx/slice/widget/TemplateView.java b/slice/slice-view/src/main/java/androidx/slice/widget/TemplateView.java
similarity index 100%
rename from slice/view/src/main/java/androidx/slice/widget/TemplateView.java
rename to slice/slice-view/src/main/java/androidx/slice/widget/TemplateView.java

diff --git a/slice/view/src/main/res-public/values/public_attrs.xml b/slice/slice-view/src/main/res-public/values/public_attrs.xml
similarity index 100%
rename from slice/view/src/main/res-public/values/public_attrs.xml
rename to slice/slice-view/src/main/res-public/values/public_attrs.xml

diff --git a/slice/view/src/main/res-public/values/public_styles.xml b/slice/slice-view/src/main/res-public/values/public_styles.xml
similarity index 100%
rename from slice/view/src/main/res-public/values/public_styles.xml
rename to slice/slice-view/src/main/res-public/values/public_styles.xml

diff --git a/slice/view/src/main/res/drawable/abc_ic_slice_send.xml b/slice/slice-view/src/main/res/drawable/abc_ic_slice_send.xml
similarity index 100%
rename from slice/view/src/main/res/drawable/abc_ic_slice_send.xml
rename to slice/slice-view/src/main/res/drawable/abc_ic_slice_send.xml

diff --git a/slice/view/src/main/res/drawable/abc_slice_gradient.xml b/slice/slice-view/src/main/res/drawable/abc_slice_gradient.xml
similarity index 100%
rename from slice/view/src/main/res/drawable/abc_slice_gradient.xml
rename to slice/slice-view/src/main/res/drawable/abc_slice_gradient.xml

diff --git a/slice/view/src/main/res/drawable/abc_slice_remote_input_bg.xml b/slice/slice-view/src/main/res/drawable/abc_slice_remote_input_bg.xml
similarity index 100%
rename from slice/view/src/main/res/drawable/abc_slice_remote_input_bg.xml
rename to slice/slice-view/src/main/res/drawable/abc_slice_remote_input_bg.xml

diff --git a/slice/view/src/main/res/drawable/abc_slice_ripple_drawable.xml b/slice/slice-view/src/main/res/drawable/abc_slice_ripple_drawable.xml
similarity index 100%
rename from slice/view/src/main/res/drawable/abc_slice_ripple_drawable.xml
rename to slice/slice-view/src/main/res/drawable/abc_slice_ripple_drawable.xml

diff --git a/slice/view/src/main/res/drawable/abc_slice_see_more_bg.xml b/slice/slice-view/src/main/res/drawable/abc_slice_see_more_bg.xml
similarity index 100%
rename from slice/view/src/main/res/drawable/abc_slice_see_more_bg.xml
rename to slice/slice-view/src/main/res/drawable/abc_slice_see_more_bg.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_grid.xml b/slice/slice-view/src/main/res/layout/abc_slice_grid.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_grid.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_grid.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_grid_see_more.xml b/slice/slice-view/src/main/res/layout/abc_slice_grid_see_more.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_grid_see_more.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_grid_see_more.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_grid_see_more_overlay.xml b/slice/slice-view/src/main/res/layout/abc_slice_grid_see_more_overlay.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_grid_see_more_overlay.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_grid_see_more_overlay.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_grid_text_overlay_image.xml b/slice/slice-view/src/main/res/layout/abc_slice_grid_text_overlay_image.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_grid_text_overlay_image.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_grid_text_overlay_image.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_message.xml b/slice/slice-view/src/main/res/layout/abc_slice_message.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_message.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_message.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_message_local.xml b/slice/slice-view/src/main/res/layout/abc_slice_message_local.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_message_local.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_message_local.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_progress_inline_view.xml b/slice/slice-view/src/main/res/layout/abc_slice_progress_inline_view.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_progress_inline_view.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_progress_inline_view.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_progress_view.xml b/slice/slice-view/src/main/res/layout/abc_slice_progress_view.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_progress_view.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_progress_view.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_remote_input.xml b/slice/slice-view/src/main/res/layout/abc_slice_remote_input.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_remote_input.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_remote_input.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_row_selection.xml b/slice/slice-view/src/main/res/layout/abc_slice_row_selection.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_row_selection.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_row_selection.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_row_selection_dropdown_text.xml b/slice/slice-view/src/main/res/layout/abc_slice_row_selection_dropdown_text.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_row_selection_dropdown_text.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_row_selection_dropdown_text.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_row_selection_text.xml b/slice/slice-view/src/main/res/layout/abc_slice_row_selection_text.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_row_selection_text.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_row_selection_text.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_row_show_more.xml b/slice/slice-view/src/main/res/layout/abc_slice_row_show_more.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_row_show_more.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_row_show_more.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_secondary_text.xml b/slice/slice-view/src/main/res/layout/abc_slice_secondary_text.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_secondary_text.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_secondary_text.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_seekbar_view.xml b/slice/slice-view/src/main/res/layout/abc_slice_seekbar_view.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_seekbar_view.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_seekbar_view.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_small_template.xml b/slice/slice-view/src/main/res/layout/abc_slice_small_template.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_small_template.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_small_template.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_switch.xml b/slice/slice-view/src/main/res/layout/abc_slice_switch.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_switch.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_switch.xml

diff --git a/slice/view/src/main/res/layout/abc_slice_title.xml b/slice/slice-view/src/main/res/layout/abc_slice_title.xml
similarity index 100%
rename from slice/view/src/main/res/layout/abc_slice_title.xml
rename to slice/slice-view/src/main/res/layout/abc_slice_title.xml

diff --git a/slice/view/src/main/res/values-af/strings.xml b/slice/slice-view/src/main/res/values-af/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-af/strings.xml
rename to slice/slice-view/src/main/res/values-af/strings.xml

diff --git a/slice/view/src/main/res/values-am/strings.xml b/slice/slice-view/src/main/res/values-am/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-am/strings.xml
rename to slice/slice-view/src/main/res/values-am/strings.xml

diff --git a/slice/view/src/main/res/values-ar/strings.xml b/slice/slice-view/src/main/res/values-ar/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ar/strings.xml
rename to slice/slice-view/src/main/res/values-ar/strings.xml

diff --git a/slice/view/src/main/res/values-as/strings.xml b/slice/slice-view/src/main/res/values-as/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-as/strings.xml
rename to slice/slice-view/src/main/res/values-as/strings.xml

diff --git a/slice/view/src/main/res/values-az/strings.xml b/slice/slice-view/src/main/res/values-az/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-az/strings.xml
rename to slice/slice-view/src/main/res/values-az/strings.xml

diff --git a/slice/view/src/main/res/values-b+sr+Latn/strings.xml b/slice/slice-view/src/main/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-b+sr+Latn/strings.xml
rename to slice/slice-view/src/main/res/values-b+sr+Latn/strings.xml

diff --git a/slice/view/src/main/res/values-be/strings.xml b/slice/slice-view/src/main/res/values-be/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-be/strings.xml
rename to slice/slice-view/src/main/res/values-be/strings.xml

diff --git a/slice/view/src/main/res/values-bg/strings.xml b/slice/slice-view/src/main/res/values-bg/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-bg/strings.xml
rename to slice/slice-view/src/main/res/values-bg/strings.xml

diff --git a/slice/view/src/main/res/values-bn/strings.xml b/slice/slice-view/src/main/res/values-bn/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-bn/strings.xml
rename to slice/slice-view/src/main/res/values-bn/strings.xml

diff --git a/slice/view/src/main/res/values-bs/strings.xml b/slice/slice-view/src/main/res/values-bs/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-bs/strings.xml
rename to slice/slice-view/src/main/res/values-bs/strings.xml

diff --git a/slice/view/src/main/res/values-ca/strings.xml b/slice/slice-view/src/main/res/values-ca/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ca/strings.xml
rename to slice/slice-view/src/main/res/values-ca/strings.xml

diff --git a/slice/view/src/main/res/values-cs/strings.xml b/slice/slice-view/src/main/res/values-cs/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-cs/strings.xml
rename to slice/slice-view/src/main/res/values-cs/strings.xml

diff --git a/slice/view/src/main/res/values-da/strings.xml b/slice/slice-view/src/main/res/values-da/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-da/strings.xml
rename to slice/slice-view/src/main/res/values-da/strings.xml

diff --git a/slice/view/src/main/res/values-de/strings.xml b/slice/slice-view/src/main/res/values-de/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-de/strings.xml
rename to slice/slice-view/src/main/res/values-de/strings.xml

diff --git a/slice/view/src/main/res/values-el/strings.xml b/slice/slice-view/src/main/res/values-el/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-el/strings.xml
rename to slice/slice-view/src/main/res/values-el/strings.xml

diff --git a/slice/view/src/main/res/values-en-rAU/strings.xml b/slice/slice-view/src/main/res/values-en-rAU/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-en-rAU/strings.xml
rename to slice/slice-view/src/main/res/values-en-rAU/strings.xml

diff --git a/slice/view/src/main/res/values-en-rCA/strings.xml b/slice/slice-view/src/main/res/values-en-rCA/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-en-rCA/strings.xml
rename to slice/slice-view/src/main/res/values-en-rCA/strings.xml

diff --git a/slice/view/src/main/res/values-en-rGB/strings.xml b/slice/slice-view/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-en-rGB/strings.xml
rename to slice/slice-view/src/main/res/values-en-rGB/strings.xml

diff --git a/slice/view/src/main/res/values-en-rIN/strings.xml b/slice/slice-view/src/main/res/values-en-rIN/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-en-rIN/strings.xml
rename to slice/slice-view/src/main/res/values-en-rIN/strings.xml

diff --git a/slice/view/src/main/res/values-en-rXC/strings.xml b/slice/slice-view/src/main/res/values-en-rXC/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-en-rXC/strings.xml
rename to slice/slice-view/src/main/res/values-en-rXC/strings.xml

diff --git a/slice/view/src/main/res/values-es-rUS/strings.xml b/slice/slice-view/src/main/res/values-es-rUS/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-es-rUS/strings.xml
rename to slice/slice-view/src/main/res/values-es-rUS/strings.xml

diff --git a/slice/view/src/main/res/values-es/strings.xml b/slice/slice-view/src/main/res/values-es/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-es/strings.xml
rename to slice/slice-view/src/main/res/values-es/strings.xml

diff --git a/slice/view/src/main/res/values-et/strings.xml b/slice/slice-view/src/main/res/values-et/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-et/strings.xml
rename to slice/slice-view/src/main/res/values-et/strings.xml

diff --git a/slice/view/src/main/res/values-eu/strings.xml b/slice/slice-view/src/main/res/values-eu/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-eu/strings.xml
rename to slice/slice-view/src/main/res/values-eu/strings.xml

diff --git a/slice/view/src/main/res/values-fa/strings.xml b/slice/slice-view/src/main/res/values-fa/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-fa/strings.xml
rename to slice/slice-view/src/main/res/values-fa/strings.xml

diff --git a/slice/view/src/main/res/values-fi/strings.xml b/slice/slice-view/src/main/res/values-fi/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-fi/strings.xml
rename to slice/slice-view/src/main/res/values-fi/strings.xml

diff --git a/slice/view/src/main/res/values-fr-rCA/strings.xml b/slice/slice-view/src/main/res/values-fr-rCA/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-fr-rCA/strings.xml
rename to slice/slice-view/src/main/res/values-fr-rCA/strings.xml

diff --git a/slice/view/src/main/res/values-fr/strings.xml b/slice/slice-view/src/main/res/values-fr/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-fr/strings.xml
rename to slice/slice-view/src/main/res/values-fr/strings.xml

diff --git a/slice/view/src/main/res/values-gl/strings.xml b/slice/slice-view/src/main/res/values-gl/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-gl/strings.xml
rename to slice/slice-view/src/main/res/values-gl/strings.xml

diff --git a/slice/view/src/main/res/values-gu/strings.xml b/slice/slice-view/src/main/res/values-gu/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-gu/strings.xml
rename to slice/slice-view/src/main/res/values-gu/strings.xml

diff --git a/slice/view/src/main/res/values-hi/strings.xml b/slice/slice-view/src/main/res/values-hi/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-hi/strings.xml
rename to slice/slice-view/src/main/res/values-hi/strings.xml

diff --git a/slice/view/src/main/res/values-hr/strings.xml b/slice/slice-view/src/main/res/values-hr/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-hr/strings.xml
rename to slice/slice-view/src/main/res/values-hr/strings.xml

diff --git a/slice/view/src/main/res/values-hu/strings.xml b/slice/slice-view/src/main/res/values-hu/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-hu/strings.xml
rename to slice/slice-view/src/main/res/values-hu/strings.xml

diff --git a/slice/view/src/main/res/values-hy/strings.xml b/slice/slice-view/src/main/res/values-hy/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-hy/strings.xml
rename to slice/slice-view/src/main/res/values-hy/strings.xml

diff --git a/slice/view/src/main/res/values-in/strings.xml b/slice/slice-view/src/main/res/values-in/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-in/strings.xml
rename to slice/slice-view/src/main/res/values-in/strings.xml

diff --git a/slice/view/src/main/res/values-is/strings.xml b/slice/slice-view/src/main/res/values-is/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-is/strings.xml
rename to slice/slice-view/src/main/res/values-is/strings.xml

diff --git a/slice/view/src/main/res/values-it/strings.xml b/slice/slice-view/src/main/res/values-it/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-it/strings.xml
rename to slice/slice-view/src/main/res/values-it/strings.xml

diff --git a/slice/view/src/main/res/values-iw/strings.xml b/slice/slice-view/src/main/res/values-iw/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-iw/strings.xml
rename to slice/slice-view/src/main/res/values-iw/strings.xml

diff --git a/slice/view/src/main/res/values-ja/strings.xml b/slice/slice-view/src/main/res/values-ja/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ja/strings.xml
rename to slice/slice-view/src/main/res/values-ja/strings.xml

diff --git a/slice/view/src/main/res/values-ka/strings.xml b/slice/slice-view/src/main/res/values-ka/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ka/strings.xml
rename to slice/slice-view/src/main/res/values-ka/strings.xml

diff --git a/slice/view/src/main/res/values-kk/strings.xml b/slice/slice-view/src/main/res/values-kk/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-kk/strings.xml
rename to slice/slice-view/src/main/res/values-kk/strings.xml

diff --git a/slice/view/src/main/res/values-km/strings.xml b/slice/slice-view/src/main/res/values-km/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-km/strings.xml
rename to slice/slice-view/src/main/res/values-km/strings.xml

diff --git a/slice/view/src/main/res/values-kn/strings.xml b/slice/slice-view/src/main/res/values-kn/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-kn/strings.xml
rename to slice/slice-view/src/main/res/values-kn/strings.xml

diff --git a/slice/view/src/main/res/values-ko/strings.xml b/slice/slice-view/src/main/res/values-ko/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ko/strings.xml
rename to slice/slice-view/src/main/res/values-ko/strings.xml

diff --git a/slice/view/src/main/res/values-ky/strings.xml b/slice/slice-view/src/main/res/values-ky/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ky/strings.xml
rename to slice/slice-view/src/main/res/values-ky/strings.xml

diff --git a/slice/view/src/main/res/values-lo/strings.xml b/slice/slice-view/src/main/res/values-lo/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-lo/strings.xml
rename to slice/slice-view/src/main/res/values-lo/strings.xml

diff --git a/slice/view/src/main/res/values-lt/strings.xml b/slice/slice-view/src/main/res/values-lt/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-lt/strings.xml
rename to slice/slice-view/src/main/res/values-lt/strings.xml

diff --git a/slice/view/src/main/res/values-lv/strings.xml b/slice/slice-view/src/main/res/values-lv/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-lv/strings.xml
rename to slice/slice-view/src/main/res/values-lv/strings.xml

diff --git a/slice/view/src/main/res/values-mk/strings.xml b/slice/slice-view/src/main/res/values-mk/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-mk/strings.xml
rename to slice/slice-view/src/main/res/values-mk/strings.xml

diff --git a/slice/view/src/main/res/values-ml/strings.xml b/slice/slice-view/src/main/res/values-ml/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ml/strings.xml
rename to slice/slice-view/src/main/res/values-ml/strings.xml

diff --git a/slice/view/src/main/res/values-mn/strings.xml b/slice/slice-view/src/main/res/values-mn/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-mn/strings.xml
rename to slice/slice-view/src/main/res/values-mn/strings.xml

diff --git a/slice/view/src/main/res/values-mr/strings.xml b/slice/slice-view/src/main/res/values-mr/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-mr/strings.xml
rename to slice/slice-view/src/main/res/values-mr/strings.xml

diff --git a/slice/view/src/main/res/values-ms/strings.xml b/slice/slice-view/src/main/res/values-ms/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ms/strings.xml
rename to slice/slice-view/src/main/res/values-ms/strings.xml

diff --git a/slice/view/src/main/res/values-my/strings.xml b/slice/slice-view/src/main/res/values-my/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-my/strings.xml
rename to slice/slice-view/src/main/res/values-my/strings.xml

diff --git a/slice/view/src/main/res/values-nb/strings.xml b/slice/slice-view/src/main/res/values-nb/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-nb/strings.xml
rename to slice/slice-view/src/main/res/values-nb/strings.xml

diff --git a/slice/view/src/main/res/values-ne/strings.xml b/slice/slice-view/src/main/res/values-ne/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ne/strings.xml
rename to slice/slice-view/src/main/res/values-ne/strings.xml

diff --git a/slice/view/src/main/res/values-nl/strings.xml b/slice/slice-view/src/main/res/values-nl/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-nl/strings.xml
rename to slice/slice-view/src/main/res/values-nl/strings.xml

diff --git a/slice/view/src/main/res/values-or/strings.xml b/slice/slice-view/src/main/res/values-or/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-or/strings.xml
rename to slice/slice-view/src/main/res/values-or/strings.xml

diff --git a/slice/view/src/main/res/values-pa/strings.xml b/slice/slice-view/src/main/res/values-pa/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-pa/strings.xml
rename to slice/slice-view/src/main/res/values-pa/strings.xml

diff --git a/slice/view/src/main/res/values-pl/strings.xml b/slice/slice-view/src/main/res/values-pl/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-pl/strings.xml
rename to slice/slice-view/src/main/res/values-pl/strings.xml

diff --git a/slice/view/src/main/res/values-pt-rBR/strings.xml b/slice/slice-view/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-pt-rBR/strings.xml
rename to slice/slice-view/src/main/res/values-pt-rBR/strings.xml

diff --git a/slice/view/src/main/res/values-pt-rPT/strings.xml b/slice/slice-view/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-pt-rPT/strings.xml
rename to slice/slice-view/src/main/res/values-pt-rPT/strings.xml

diff --git a/slice/view/src/main/res/values-pt/strings.xml b/slice/slice-view/src/main/res/values-pt/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-pt/strings.xml
rename to slice/slice-view/src/main/res/values-pt/strings.xml

diff --git a/slice/view/src/main/res/values-ro/strings.xml b/slice/slice-view/src/main/res/values-ro/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ro/strings.xml
rename to slice/slice-view/src/main/res/values-ro/strings.xml

diff --git a/slice/view/src/main/res/values-ru/strings.xml b/slice/slice-view/src/main/res/values-ru/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ru/strings.xml
rename to slice/slice-view/src/main/res/values-ru/strings.xml

diff --git a/slice/view/src/main/res/values-si/strings.xml b/slice/slice-view/src/main/res/values-si/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-si/strings.xml
rename to slice/slice-view/src/main/res/values-si/strings.xml

diff --git a/slice/view/src/main/res/values-sk/strings.xml b/slice/slice-view/src/main/res/values-sk/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-sk/strings.xml
rename to slice/slice-view/src/main/res/values-sk/strings.xml

diff --git a/slice/view/src/main/res/values-sl/strings.xml b/slice/slice-view/src/main/res/values-sl/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-sl/strings.xml
rename to slice/slice-view/src/main/res/values-sl/strings.xml

diff --git a/slice/view/src/main/res/values-sq/strings.xml b/slice/slice-view/src/main/res/values-sq/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-sq/strings.xml
rename to slice/slice-view/src/main/res/values-sq/strings.xml

diff --git a/slice/view/src/main/res/values-sr/strings.xml b/slice/slice-view/src/main/res/values-sr/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-sr/strings.xml
rename to slice/slice-view/src/main/res/values-sr/strings.xml

diff --git a/slice/view/src/main/res/values-sv/strings.xml b/slice/slice-view/src/main/res/values-sv/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-sv/strings.xml
rename to slice/slice-view/src/main/res/values-sv/strings.xml

diff --git a/slice/view/src/main/res/values-sw/strings.xml b/slice/slice-view/src/main/res/values-sw/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-sw/strings.xml
rename to slice/slice-view/src/main/res/values-sw/strings.xml

diff --git a/slice/view/src/main/res/values-ta/strings.xml b/slice/slice-view/src/main/res/values-ta/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ta/strings.xml
rename to slice/slice-view/src/main/res/values-ta/strings.xml

diff --git a/slice/view/src/main/res/values-te/strings.xml b/slice/slice-view/src/main/res/values-te/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-te/strings.xml
rename to slice/slice-view/src/main/res/values-te/strings.xml

diff --git a/slice/view/src/main/res/values-th/strings.xml b/slice/slice-view/src/main/res/values-th/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-th/strings.xml
rename to slice/slice-view/src/main/res/values-th/strings.xml

diff --git a/slice/view/src/main/res/values-tl/strings.xml b/slice/slice-view/src/main/res/values-tl/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-tl/strings.xml
rename to slice/slice-view/src/main/res/values-tl/strings.xml

diff --git a/slice/view/src/main/res/values-tr/strings.xml b/slice/slice-view/src/main/res/values-tr/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-tr/strings.xml
rename to slice/slice-view/src/main/res/values-tr/strings.xml

diff --git a/slice/view/src/main/res/values-uk/strings.xml b/slice/slice-view/src/main/res/values-uk/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-uk/strings.xml
rename to slice/slice-view/src/main/res/values-uk/strings.xml

diff --git a/slice/view/src/main/res/values-ur/strings.xml b/slice/slice-view/src/main/res/values-ur/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-ur/strings.xml
rename to slice/slice-view/src/main/res/values-ur/strings.xml

diff --git a/slice/view/src/main/res/values-uz/strings.xml b/slice/slice-view/src/main/res/values-uz/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-uz/strings.xml
rename to slice/slice-view/src/main/res/values-uz/strings.xml

diff --git a/slice/view/src/main/res/values-vi/strings.xml b/slice/slice-view/src/main/res/values-vi/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-vi/strings.xml
rename to slice/slice-view/src/main/res/values-vi/strings.xml

diff --git a/slice/view/src/main/res/values-zh-rCN/strings.xml b/slice/slice-view/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-zh-rCN/strings.xml
rename to slice/slice-view/src/main/res/values-zh-rCN/strings.xml

diff --git a/slice/view/src/main/res/values-zh-rHK/strings.xml b/slice/slice-view/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-zh-rHK/strings.xml
rename to slice/slice-view/src/main/res/values-zh-rHK/strings.xml

diff --git a/slice/view/src/main/res/values-zh-rTW/strings.xml b/slice/slice-view/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-zh-rTW/strings.xml
rename to slice/slice-view/src/main/res/values-zh-rTW/strings.xml

diff --git a/slice/view/src/main/res/values-zu/strings.xml b/slice/slice-view/src/main/res/values-zu/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values-zu/strings.xml
rename to slice/slice-view/src/main/res/values-zu/strings.xml

diff --git a/slice/view/src/main/res/values/attrs.xml b/slice/slice-view/src/main/res/values/attrs.xml
similarity index 100%
rename from slice/view/src/main/res/values/attrs.xml
rename to slice/slice-view/src/main/res/values/attrs.xml

diff --git a/slice/view/src/main/res/values/dimens.xml b/slice/slice-view/src/main/res/values/dimens.xml
similarity index 100%
rename from slice/view/src/main/res/values/dimens.xml
rename to slice/slice-view/src/main/res/values/dimens.xml

diff --git a/slice/view/src/main/res/values/strings.xml b/slice/slice-view/src/main/res/values/strings.xml
similarity index 100%
rename from slice/view/src/main/res/values/strings.xml
rename to slice/slice-view/src/main/res/values/strings.xml

diff --git a/slice/view/src/main/res/values/styles.xml b/slice/slice-view/src/main/res/values/styles.xml
similarity index 100%
rename from slice/view/src/main/res/values/styles.xml
rename to slice/slice-view/src/main/res/values/styles.xml

diff --git a/tvprovider/tv-provider/api/api_lint.ignore b/tvprovider/tvprovider/api/api_lint.ignore
similarity index 100%
rename from tvprovider/tv-provider/api/api_lint.ignore
rename to tvprovider/tvprovider/api/api_lint.ignore

diff --git a/tvprovider/tv-provider/api/current.txt b/tvprovider/tvprovider/api/current.txt
similarity index 100%
rename from tvprovider/tv-provider/api/current.txt
rename to tvprovider/tvprovider/api/current.txt

diff --git a/tvprovider/tv-provider/api/public_plus_experimental_1.0.0.txt b/tvprovider/tvprovider/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from tvprovider/tv-provider/api/public_plus_experimental_1.0.0.txt
rename to tvprovider/tvprovider/api/public_plus_experimental_1.0.0.txt

diff --git a/tvprovider/tv-provider/api/public_plus_experimental_current.txt b/tvprovider/tvprovider/api/public_plus_experimental_current.txt
similarity index 100%
rename from tvprovider/tv-provider/api/public_plus_experimental_current.txt
rename to tvprovider/tvprovider/api/public_plus_experimental_current.txt

diff --git a/tvprovider/tv-provider/api/res-1.0.0.txt b/tvprovider/tvprovider/api/res-1.0.0.txt
similarity index 100%
rename from tvprovider/tv-provider/api/res-1.0.0.txt
rename to tvprovider/tvprovider/api/res-1.0.0.txt

diff --git a/tvprovider/tv-provider/api/res-current.txt b/tvprovider/tvprovider/api/res-current.txt
similarity index 100%
rename from tvprovider/tv-provider/api/res-current.txt
rename to tvprovider/tvprovider/api/res-current.txt

diff --git a/tvprovider/tv-provider/api/restricted_1.0.0.txt b/tvprovider/tvprovider/api/restricted_1.0.0.txt
similarity index 100%
rename from tvprovider/tv-provider/api/restricted_1.0.0.txt
rename to tvprovider/tvprovider/api/restricted_1.0.0.txt

diff --git a/tvprovider/tv-provider/api/restricted_current.txt b/tvprovider/tvprovider/api/restricted_current.txt
similarity index 100%
rename from tvprovider/tv-provider/api/restricted_current.txt
rename to tvprovider/tvprovider/api/restricted_current.txt

diff --git a/tvprovider/tv-provider/build.gradle b/tvprovider/tvprovider/build.gradle
similarity index 100%
rename from tvprovider/tv-provider/build.gradle
rename to tvprovider/tvprovider/build.gradle

diff --git a/tvprovider/tv-provider/lint-baseline.xml b/tvprovider/tvprovider/lint-baseline.xml
similarity index 100%
rename from tvprovider/tv-provider/lint-baseline.xml
rename to tvprovider/tvprovider/lint-baseline.xml

diff --git a/tvprovider/tv-provider/src/androidTest/AndroidManifest.xml b/tvprovider/tvprovider/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/AndroidManifest.xml
rename to tvprovider/tvprovider/src/androidTest/AndroidManifest.xml

diff --git a/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java b/tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java
rename to tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java

diff --git a/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java b/tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java
rename to tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java

diff --git a/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java b/tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java
rename to tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java

diff --git a/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java b/tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java
rename to tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java

diff --git a/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java b/tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java
rename to tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java

diff --git a/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java b/tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java
rename to tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java

diff --git a/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java b/tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java
rename to tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java

diff --git a/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/Utils.java b/tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/Utils.java
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/Utils.java
rename to tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/Utils.java

diff --git a/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java b/tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java
rename to tvprovider/tvprovider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java

diff --git a/tvprovider/tv-provider/src/androidTest/res/drawable/test_icon.png b/tvprovider/tvprovider/src/androidTest/res/drawable/test_icon.png
similarity index 100%
rename from tvprovider/tv-provider/src/androidTest/res/drawable/test_icon.png
rename to tvprovider/tvprovider/src/androidTest/res/drawable/test_icon.png
Binary files differ

diff --git a/tvprovider/tv-provider/src/main/AndroidManifest.xml b/tvprovider/tvprovider/src/main/AndroidManifest.xml
similarity index 100%
rename from tvprovider/tv-provider/src/main/AndroidManifest.xml
rename to tvprovider/tvprovider/src/main/AndroidManifest.xml

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Channel.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/Channel.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Channel.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/Channel.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Program.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/Program.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Program.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/Program.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java

diff --git a/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java b/tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java
similarity index 100%
rename from tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java
rename to tvprovider/tvprovider/src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java