diff --git a/.idea/runConfigurations/android.xml b/.idea/runConfigurations/android.xml
index 282ec2c..49c6087 100644
--- a/.idea/runConfigurations/android.xml
+++ b/.idea/runConfigurations/android.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="android" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="NYTimes-KMP.client.android.main" />
+  <configuration default="false" name="android" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+    <module name="android.NYTimes-KMP.app.android.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
@@ -14,7 +14,6 @@
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="false" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
diff --git a/.idea/runConfigurations/desktop.xml b/.idea/runConfigurations/desktop.xml
index 9612502..308f4fa 100644
--- a/.idea/runConfigurations/desktop.xml
+++ b/.idea/runConfigurations/desktop.xml
@@ -3,7 +3,7 @@
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="io.github.xxfast.nytimes.desktop.ApplicationKt" />
-    <module name="NYTimes-KMP.client.desktop.main" />
+    <module name="NYTimes-KMP.app.desktop.main" />
     <shortenClasspath name="NONE" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/README.md b/README.md
index 1610de8..cf65751 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 # <img src=".idea/icon.svg" height="23"/>  NYTimes-KMP
 
 [![Build](https://github.com/xxfast/NYTimes-KMP/actions/workflows/build.yml/badge.svg)](https://github.com/xxfast/NYTimes-KMP/actions/workflows/build.yml)
-[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.20-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/Kotlin-2.0.10-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
 
 ![badge-android](http://img.shields.io/badge/platform-android-6EDB8D.svg?style=flat)
 ![badge-wearos](http://img.shields.io/badge/platform-wearos-8ECDA0.svg?style=flat)
diff --git a/client/android/build.gradle.kts b/app/android/build.gradle.kts
similarity index 98%
rename from client/android/build.gradle.kts
rename to app/android/build.gradle.kts
index fbd2f38..afe3477 100644
--- a/client/android/build.gradle.kts
+++ b/app/android/build.gradle.kts
@@ -68,7 +68,7 @@ android {
 }
 
 dependencies {
-  implementation(project(":client"))
+  implementation(project(":app"))
   implementation(compose.runtime)
   implementation(compose.foundation)
   implementation(compose.material3)
diff --git a/client/android/proguard-rules.pro b/app/android/proguard-rules.pro
similarity index 100%
rename from client/android/proguard-rules.pro
rename to app/android/proguard-rules.pro
diff --git a/client/android/src/main/AndroidManifest.xml b/app/android/src/main/AndroidManifest.xml
similarity index 100%
rename from client/android/src/main/AndroidManifest.xml
rename to app/android/src/main/AndroidManifest.xml
diff --git a/client/android/src/main/ic_launcher-playstore.png b/app/android/src/main/ic_launcher-playstore.png
similarity index 100%
rename from client/android/src/main/ic_launcher-playstore.png
rename to app/android/src/main/ic_launcher-playstore.png
diff --git a/client/android/src/main/java/io/github/xxfast/nytimes/android/MainActivity.kt b/app/android/src/main/java/io/github/xxfast/nytimes/android/MainActivity.kt
similarity index 100%
rename from client/android/src/main/java/io/github/xxfast/nytimes/android/MainActivity.kt
rename to app/android/src/main/java/io/github/xxfast/nytimes/android/MainActivity.kt
diff --git a/client/android/src/main/java/io/github/xxfast/nytimes/android/NyTimesTheme.kt b/app/android/src/main/java/io/github/xxfast/nytimes/android/NyTimesTheme.kt
similarity index 100%
rename from client/android/src/main/java/io/github/xxfast/nytimes/android/NyTimesTheme.kt
rename to app/android/src/main/java/io/github/xxfast/nytimes/android/NyTimesTheme.kt
diff --git a/client/android/src/main/res/drawable/ic_launcher_foreground.xml b/app/android/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from client/android/src/main/res/drawable/ic_launcher_foreground.xml
rename to app/android/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/client/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from client/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/client/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from client/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/client/android/src/main/res/mipmap-hdpi/ic_launcher.png b/app/android/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from client/android/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/android/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/client/android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from client/android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app/android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/client/android/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/android/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from client/android/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to app/android/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/client/android/src/main/res/mipmap-mdpi/ic_launcher.png b/app/android/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from client/android/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/android/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/client/android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from client/android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app/android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/client/android/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/android/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from client/android/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to app/android/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/client/android/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/android/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from client/android/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/android/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/client/android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from client/android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app/android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/client/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from client/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to app/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/client/android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from client/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/client/android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from client/android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app/android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/client/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from client/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/client/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from client/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/client/android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from client/android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app/android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/client/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from client/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/client/android/src/main/res/values/ic_launcher_background.xml b/app/android/src/main/res/values/ic_launcher_background.xml
similarity index 100%
rename from client/android/src/main/res/values/ic_launcher_background.xml
rename to app/android/src/main/res/values/ic_launcher_background.xml
diff --git a/client/android/src/main/res/values/strings.xml b/app/android/src/main/res/values/strings.xml
similarity index 100%
rename from client/android/src/main/res/values/strings.xml
rename to app/android/src/main/res/values/strings.xml
diff --git a/client/android/src/main/res/values/styles.xml b/app/android/src/main/res/values/styles.xml
similarity index 100%
rename from client/android/src/main/res/values/styles.xml
rename to app/android/src/main/res/values/styles.xml
diff --git a/client/build.gradle.kts b/app/build.gradle.kts
similarity index 100%
rename from client/build.gradle.kts
rename to app/build.gradle.kts
diff --git a/client/desktop/.gitignore b/app/desktop/.gitignore
similarity index 100%
rename from client/desktop/.gitignore
rename to app/desktop/.gitignore
diff --git a/client/desktop/build.gradle.kts b/app/desktop/build.gradle.kts
similarity index 98%
rename from client/desktop/build.gradle.kts
rename to app/desktop/build.gradle.kts
index 8b9eebf..488044a 100644
--- a/client/desktop/build.gradle.kts
+++ b/app/desktop/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":client"))
+  implementation(project(":app"))
   implementation(compose.desktop.currentOs)
   implementation(compose.runtime)
   implementation(compose.foundation)
diff --git a/client/desktop/proguard-rules.pro b/app/desktop/proguard-rules.pro
similarity index 100%
rename from client/desktop/proguard-rules.pro
rename to app/desktop/proguard-rules.pro
diff --git a/client/desktop/src/main/kotlin/io/github/xxfast/nytimes/desktop/Application.kt b/app/desktop/src/main/kotlin/io/github/xxfast/nytimes/desktop/Application.kt
similarity index 100%
rename from client/desktop/src/main/kotlin/io/github/xxfast/nytimes/desktop/Application.kt
rename to app/desktop/src/main/kotlin/io/github/xxfast/nytimes/desktop/Application.kt
diff --git a/client/desktop/src/main/resources/icons/nytimes-desktop.icns b/app/desktop/src/main/resources/icons/nytimes-desktop.icns
similarity index 100%
rename from client/desktop/src/main/resources/icons/nytimes-desktop.icns
rename to app/desktop/src/main/resources/icons/nytimes-desktop.icns
diff --git a/client/desktop/src/main/resources/icons/nytimes-desktop.ico b/app/desktop/src/main/resources/icons/nytimes-desktop.ico
similarity index 100%
rename from client/desktop/src/main/resources/icons/nytimes-desktop.ico
rename to app/desktop/src/main/resources/icons/nytimes-desktop.ico
diff --git a/client/desktop/src/main/resources/icons/nytimes-desktop.png b/app/desktop/src/main/resources/icons/nytimes-desktop.png
similarity index 100%
rename from client/desktop/src/main/resources/icons/nytimes-desktop.png
rename to app/desktop/src/main/resources/icons/nytimes-desktop.png
diff --git a/client/ios/ios.xcodeproj/project.pbxproj b/app/ios/ios.xcodeproj/project.pbxproj
similarity index 97%
rename from client/ios/ios.xcodeproj/project.pbxproj
rename to app/ios/ios.xcodeproj/project.pbxproj
index afbfd0d..72c75ae 100644
--- a/client/ios/ios.xcodeproj/project.pbxproj
+++ b/app/ios/ios.xcodeproj/project.pbxproj
@@ -179,7 +179,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/../..\"\n./gradlew :client:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "cd \"$SRCROOT/../..\"\n./gradlew :app:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -322,7 +322,7 @@
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/../../client/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../../app/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = ios/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NYTimes;
@@ -334,7 +334,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
-					NyTimes,
+					App,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.xxfast.nytimes.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -355,7 +355,7 @@
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/../../client/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../../app/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = ios/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NYTimes;
@@ -367,7 +367,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
-					NyTimes,
+					App,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.xxfast.nytimes.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/client/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/app/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from client/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to app/ios/ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/client/ios/ios.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/app/ios/ios.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from client/ios/ios.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to app/ios/ios.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/client/ios/ios.xcodeproj/xcshareddata/xcschemes/NYTimes.xcscheme b/app/ios/ios.xcodeproj/xcshareddata/xcschemes/NYTimes.xcscheme
similarity index 100%
rename from client/ios/ios.xcodeproj/xcshareddata/xcschemes/NYTimes.xcscheme
rename to app/ios/ios.xcodeproj/xcshareddata/xcschemes/NYTimes.xcscheme
diff --git a/client/ios/ios/AppDelegate.swift b/app/ios/ios/AppDelegate.swift
similarity index 100%
rename from client/ios/ios/AppDelegate.swift
rename to app/ios/ios/AppDelegate.swift
diff --git a/client/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json b/app/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json
similarity index 100%
rename from client/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json
rename to app/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json
diff --git a/client/ios/ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/app/ios/ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png
similarity index 100%
rename from client/ios/ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png
rename to app/ios/ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png
diff --git a/client/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/app/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from client/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to app/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/client/ios/ios/Assets.xcassets/Contents.json b/app/ios/ios/Assets.xcassets/Contents.json
similarity index 100%
rename from client/ios/ios/Assets.xcassets/Contents.json
rename to app/ios/ios/Assets.xcassets/Contents.json
diff --git a/client/ios/ios/Info.plist b/app/ios/ios/Info.plist
similarity index 100%
rename from client/ios/ios/Info.plist
rename to app/ios/ios/Info.plist
diff --git a/client/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json b/app/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json
similarity index 100%
rename from client/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json
rename to app/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json
diff --git a/client/src/androidMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt b/app/src/androidMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
similarity index 100%
rename from client/src/androidMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
rename to app/src/androidMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
diff --git a/client/src/androidMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt b/app/src/androidMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
similarity index 100%
rename from client/src/androidMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
rename to app/src/androidMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
diff --git a/client/src/androidMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt b/app/src/androidMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
similarity index 100%
rename from client/src/androidMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
rename to app/src/androidMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/androidx/compose/material3/windowsizeclass/LocalWindowSizeClass.kt b/app/src/commonMain/kotlin/io/github/xxfast/androidx/compose/material3/windowsizeclass/LocalWindowSizeClass.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/androidx/compose/material3/windowsizeclass/LocalWindowSizeClass.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/androidx/compose/material3/windowsizeclass/LocalWindowSizeClass.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/api/NyTimesWebService.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/api/NyTimesWebService.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/api/NyTimesWebService.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/api/NyTimesWebService.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/components/TwoPanelScaffold.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/components/TwoPanelScaffold.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/components/TwoPanelScaffold.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/components/TwoPanelScaffold.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/data/HttpClient.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/data/HttpClient.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/data/HttpClient.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/data/HttpClient.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/data/KStore.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/data/KStore.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/data/KStore.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/data/KStore.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/di/AppStorage.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/di/AppStorage.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/di/AppStorage.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/di/AppStorage.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/models/ApiModels.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/models/ApiModels.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/models/ApiModels.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/models/ApiModels.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/models/StorageModels.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/models/StorageModels.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/models/StorageModels.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/models/StorageModels.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/Icons.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/Icons.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/Icons.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/Icons.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/icons/MyTimesNews.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/icons/MyTimesNews.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/icons/MyTimesNews.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/icons/MyTimesNews.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/icons/NewYorkTimesAttribution.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/icons/NewYorkTimesAttribution.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/icons/NewYorkTimesAttribution.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/resources/icons/NewYorkTimesAttribution.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/home/HomeScreen.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/home/HomeScreen.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/home/HomeScreen.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/home/HomeScreen.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/home/HomeStateModels.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/home/HomeStateModels.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/home/HomeStateModels.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/home/HomeStateModels.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryDomain.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryDomain.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryDomain.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryDomain.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryScreen.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryScreen.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryScreen.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryScreen.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryStateModels.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryStateModels.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryStateModels.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryStateModels.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryViewModel.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryViewModel.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryViewModel.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/story/StoryViewModel.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/summary/StorySummaryView.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/summary/StorySummaryView.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/summary/StorySummaryView.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/summary/StorySummaryView.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/summary/SummaryStateModels.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/summary/SummaryStateModels.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/summary/SummaryStateModels.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/summary/SummaryStateModels.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesDomain.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesDomain.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesDomain.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesDomain.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesScreen.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesScreen.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesScreen.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesScreen.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesStateModels.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesStateModels.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesStateModels.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesStateModels.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesViewModel.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesViewModel.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesViewModel.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/screens/topStories/TopStoriesViewModel.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/utils/HttpClient.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/utils/HttpClient.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/utils/HttpClient.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/utils/HttpClient.kt
diff --git a/client/src/commonMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt b/app/src/commonMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
similarity index 100%
rename from client/src/commonMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
rename to app/src/commonMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
diff --git a/client/src/desktopMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt b/app/src/desktopMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
similarity index 100%
rename from client/src/desktopMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
rename to app/src/desktopMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
diff --git a/client/src/desktopMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt b/app/src/desktopMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
similarity index 100%
rename from client/src/desktopMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
rename to app/src/desktopMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
diff --git a/client/src/desktopMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt b/app/src/desktopMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
similarity index 100%
rename from client/src/desktopMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
rename to app/src/desktopMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
diff --git a/client/src/iosMain/kotlin/io/github/xxfast/nytimes/AppDelegate.kt b/app/src/iosMain/kotlin/io/github/xxfast/nytimes/AppDelegate.kt
similarity index 100%
rename from client/src/iosMain/kotlin/io/github/xxfast/nytimes/AppDelegate.kt
rename to app/src/iosMain/kotlin/io/github/xxfast/nytimes/AppDelegate.kt
diff --git a/client/src/iosMain/kotlin/io/github/xxfast/nytimes/Application.kt b/app/src/iosMain/kotlin/io/github/xxfast/nytimes/Application.kt
similarity index 100%
rename from client/src/iosMain/kotlin/io/github/xxfast/nytimes/Application.kt
rename to app/src/iosMain/kotlin/io/github/xxfast/nytimes/Application.kt
diff --git a/client/src/iosMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt b/app/src/iosMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
similarity index 100%
rename from client/src/iosMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
rename to app/src/iosMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
diff --git a/client/src/iosMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt b/app/src/iosMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
similarity index 100%
rename from client/src/iosMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
rename to app/src/iosMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
diff --git a/client/src/iosMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt b/app/src/iosMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
similarity index 100%
rename from client/src/iosMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
rename to app/src/iosMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
diff --git a/client/src/jsMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt b/app/src/jsMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
similarity index 100%
rename from client/src/jsMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
rename to app/src/jsMain/kotlin/io/github/xxfast/nytimes/data/Storage.kt
diff --git a/client/src/jsMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt b/app/src/jsMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
similarity index 100%
rename from client/src/jsMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
rename to app/src/jsMain/kotlin/io/github/xxfast/nytimes/navigation/ViewModel.kt
diff --git a/client/src/jsMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt b/app/src/jsMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
similarity index 100%
rename from client/src/jsMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
rename to app/src/jsMain/kotlin/io/github/xxfast/nytimes/utils/WindowInsets.kt
diff --git a/client/wear/.gitignore b/app/wear/.gitignore
similarity index 100%
rename from client/wear/.gitignore
rename to app/wear/.gitignore
diff --git a/client/wear/build.gradle.kts b/app/wear/build.gradle.kts
similarity index 98%
rename from client/wear/build.gradle.kts
rename to app/wear/build.gradle.kts
index 12dfdbf..7c86e35 100644
--- a/client/wear/build.gradle.kts
+++ b/app/wear/build.gradle.kts
@@ -73,7 +73,7 @@ android {
 }
 
 dependencies {
-  implementation(project(":client"))
+  implementation(project(":app"))
   implementation(compose.uiTooling)
   implementation(compose.materialIconsExtended)
   implementation(libs.horologist.compose.layouts)
diff --git a/client/wear/proguard-rules.pro b/app/wear/proguard-rules.pro
similarity index 100%
rename from client/wear/proguard-rules.pro
rename to app/wear/proguard-rules.pro
diff --git a/client/wear/src/main/AndroidManifest.xml b/app/wear/src/main/AndroidManifest.xml
similarity index 100%
rename from client/wear/src/main/AndroidManifest.xml
rename to app/wear/src/main/AndroidManifest.xml
diff --git a/client/wear/src/main/ic_launcher-playstore.png b/app/wear/src/main/ic_launcher-playstore.png
similarity index 100%
rename from client/wear/src/main/ic_launcher-playstore.png
rename to app/wear/src/main/ic_launcher-playstore.png
diff --git a/client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/NewsActivity.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/NewsActivity.kt
similarity index 100%
rename from client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/NewsActivity.kt
rename to app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/NewsActivity.kt
diff --git a/client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/navigation/NavigationBox.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/navigation/NavigationBox.kt
similarity index 100%
rename from client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/navigation/NavigationBox.kt
rename to app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/navigation/NavigationBox.kt
diff --git a/client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/home/HomeScreen.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/home/HomeScreen.kt
similarity index 100%
rename from client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/home/HomeScreen.kt
rename to app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/home/HomeScreen.kt
diff --git a/client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/story/StoryScreen.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/story/StoryScreen.kt
similarity index 100%
rename from client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/story/StoryScreen.kt
rename to app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/story/StoryScreen.kt
diff --git a/client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/topStories/TopStoriesScreen.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/topStories/TopStoriesScreen.kt
similarity index 100%
rename from client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/topStories/TopStoriesScreen.kt
rename to app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/topStories/TopStoriesScreen.kt
diff --git a/client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Color.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Color.kt
similarity index 100%
rename from client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Color.kt
rename to app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Color.kt
diff --git a/client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Theme.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Theme.kt
similarity index 100%
rename from client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Theme.kt
rename to app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Theme.kt
diff --git a/client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Type.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Type.kt
similarity index 100%
rename from client/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Type.kt
rename to app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/theme/Type.kt
diff --git a/client/wear/src/main/res/drawable/ic_launcher_foreground.xml b/app/wear/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from client/wear/src/main/res/drawable/ic_launcher_foreground.xml
rename to app/wear/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/client/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from client/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/client/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from client/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/client/wear/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/wear/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to app/wear/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/client/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to app/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/client/wear/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/wear/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to app/wear/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/client/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to app/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/client/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to app/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/client/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to app/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/client/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to app/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/client/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to app/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/client/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to app/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/client/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from client/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to app/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/client/wear/src/main/res/values/ic_launcher_background.xml b/app/wear/src/main/res/values/ic_launcher_background.xml
similarity index 100%
rename from client/wear/src/main/res/values/ic_launcher_background.xml
rename to app/wear/src/main/res/values/ic_launcher_background.xml
diff --git a/client/web/.gitignore b/app/web/.gitignore
similarity index 100%
rename from client/web/.gitignore
rename to app/web/.gitignore
diff --git a/client/web/build.gradle.kts b/app/web/build.gradle.kts
similarity index 93%
rename from client/web/build.gradle.kts
rename to app/web/build.gradle.kts
index 8e12201..3909603 100644
--- a/client/web/build.gradle.kts
+++ b/app/web/build.gradle.kts
@@ -13,7 +13,7 @@ kotlin {
   sourceSets {
     val jsMain by getting {
       dependencies {
-        implementation(project(":client"))
+        implementation(project(":app"))
         implementation(compose.runtime)
         implementation(compose.foundation)
         implementation(compose.material3)
diff --git a/client/web/src/jsMain/kotlin/io/github/xxfast/nytimes/web/Application.kt b/app/web/src/jsMain/kotlin/io/github/xxfast/nytimes/web/Application.kt
similarity index 92%
rename from client/web/src/jsMain/kotlin/io/github/xxfast/nytimes/web/Application.kt
rename to app/web/src/jsMain/kotlin/io/github/xxfast/nytimes/web/Application.kt
index 5cac477..e75f820 100644
--- a/client/web/src/jsMain/kotlin/io/github/xxfast/nytimes/web/Application.kt
+++ b/app/web/src/jsMain/kotlin/io/github/xxfast/nytimes/web/Application.kt
@@ -8,11 +8,13 @@ import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.window.CanvasBasedWindow
+import androidx.compose.ui.window.ComposeViewport
 import io.github.xxfast.androidx.compose.material3.windowsizeclass.LocalWindowSizeClass
 import io.github.xxfast.decompose.router.LocalRouterContext
 import io.github.xxfast.decompose.router.RouterContext
 import io.github.xxfast.decompose.router.defaultRouterContext
 import io.github.xxfast.nytimes.screens.home.HomeScreen
+import kotlinx.browser.document
 import org.jetbrains.skiko.wasm.onWasmReady
 
 @OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3WindowSizeClassApi::class)
@@ -20,7 +22,7 @@ fun main() {
   onWasmReady {
     val rootRouterContext: RouterContext = defaultRouterContext()
 
-    CanvasBasedWindow(title = "NYTime-KMP", canvasElementId = "ComposeTargetContainer") {
+    ComposeViewport(document.body!!) {
       BoxWithConstraints {
         val windowSizeClass: WindowSizeClass = calculateWindowSizeClass()
         CompositionLocalProvider(
diff --git a/client/web/src/jsMain/resources/favicon.png b/app/web/src/jsMain/resources/favicon.png
similarity index 100%
rename from client/web/src/jsMain/resources/favicon.png
rename to app/web/src/jsMain/resources/favicon.png
diff --git a/client/web/src/jsMain/resources/index.html b/app/web/src/jsMain/resources/index.html
similarity index 100%
rename from client/web/src/jsMain/resources/index.html
rename to app/web/src/jsMain/resources/index.html
diff --git a/client/web/src/jsMain/resources/styles.css b/app/web/src/jsMain/resources/styles.css
similarity index 100%
rename from client/web/src/jsMain/resources/styles.css
rename to app/web/src/jsMain/resources/styles.css
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 955e6da..401f72c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,8 +15,8 @@ dependencyResolutionManagement {
 
 rootProject.name = "NYTimes-KMP"
 
-include(":client")
-include(":client:android")
-include(":client:desktop")
-include(":client:web")
-include(":client:wear")
+include(":app")
+include(":app:android")
+include(":app:desktop")
+include(":app:web")
+include(":app:wear")