diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
index 995022ee..5983d985 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
@@ -69,6 +69,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
+import com.android.developers.androidify.customize.watchface.WatchFaceModalSheet
 import com.android.developers.androidify.results.PermissionRationaleDialog
 import com.android.developers.androidify.results.R
 import com.android.developers.androidify.results.shareImage
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index c8444670..25680de7 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.Modifier
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.android.developers.androidify.RemoteConfigDataSource
+import com.android.developers.androidify.customize.watchface.WatchFaceSelectionState
 import com.android.developers.androidify.data.ImageGenerationRepository
 import com.android.developers.androidify.util.LocalFileProvider
 import com.android.developers.androidify.watchface.WatchFaceAsset
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
index 06c9cc1a..780388de 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
@@ -21,6 +21,7 @@ import androidx.annotation.DrawableRes
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
+import com.android.developers.androidify.customize.watchface.WatchFaceSelectionState
 import com.android.developers.androidify.wear.common.ConnectedWatch
 import com.android.developers.androidify.wear.common.WatchFaceInstallationStatus
 
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/AllDoneWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/AllDoneWatchFacePanel.kt
similarity index 97%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/AllDoneWatchFacePanel.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/AllDoneWatchFacePanel.kt
index 46d19bd5..1a80194b 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/AllDoneWatchFacePanel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/AllDoneWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/ErrorWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/ErrorWatchFacePanel.kt
similarity index 98%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/ErrorWatchFacePanel.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/ErrorWatchFacePanel.kt
index 0ae80e28..059fb9b0 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/ErrorWatchFacePanel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/ErrorWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/GuidanceWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/GuidanceWatchFacePanel.kt
similarity index 98%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/GuidanceWatchFacePanel.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/GuidanceWatchFacePanel.kt
index fcf2688c..e53f0fb5 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/GuidanceWatchFacePanel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/GuidanceWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/InstallAndroidifyPanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallAndroidifyPanel.kt
similarity index 98%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/InstallAndroidifyPanel.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallAndroidifyPanel.kt
index 7a8f831c..1a9af1cf 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/InstallAndroidifyPanel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallAndroidifyPanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import android.content.Intent
 import androidx.compose.foundation.layout.Arrangement
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/InstallWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallWatchFacePanel.kt
similarity index 98%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/InstallWatchFacePanel.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallWatchFacePanel.kt
index 55a36fef..a42f3645 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/InstallWatchFacePanel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -115,12 +115,12 @@ private fun InstallWatchFacePanelPreview() {
 @Composable
 fun WatchFacesRow(
     watchFaces: List<WatchFaceAsset>,
+    modifier: Modifier = Modifier,
     selectedWatchFace: WatchFaceAsset? = null,
     onWatchFaceSelect: (WatchFaceAsset) -> Unit = {},
-    modifier: Modifier = Modifier,
 ) {
     LazyRow(
-        modifier = Modifier,
+        modifier = modifier,
         horizontalArrangement = Arrangement.spacedBy(8.dp),
         contentPadding = PaddingValues(horizontal = 8.dp),
     ) {
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/SendingWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/SendingWatchFacePanel.kt
similarity index 98%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/SendingWatchFacePanel.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/SendingWatchFacePanel.kt
index f474b005..0e582d7e 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/SendingWatchFacePanel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/SendingWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/WatchFaceModalSheet.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceModalSheet.kt
similarity index 99%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/WatchFaceModalSheet.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceModalSheet.kt
index c6046646..03c8891d 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/WatchFaceModalSheet.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceModalSheet.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ContentTransform
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/WatchFacePanelButton.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePanelButton.kt
similarity index 98%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/WatchFacePanelButton.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePanelButton.kt
index 706adf6f..899a7b84 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/WatchFacePanelButton.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePanelButton.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.BorderStroke
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/WatchFacePreviewItem.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePreviewItem.kt
similarity index 95%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/WatchFacePreviewItem.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePreviewItem.kt
index 6f7373e1..7d102110 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/WatchFacePreviewItem.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePreviewItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -31,7 +31,6 @@ import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import com.android.developers.androidify.watchface.R
 import com.android.developers.androidify.watchface.WatchFaceAsset
 
 @Composable
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/WatchFaceSelectionState.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceSelectionState.kt
similarity index 93%
rename from feature/results/src/main/java/com/android/developers/androidify/customize/WatchFaceSelectionState.kt
rename to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceSelectionState.kt
index 09e0c3d4..bf0cdf2d 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/WatchFaceSelectionState.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceSelectionState.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import com.android.developers.androidify.watchface.WatchFaceAsset