diff --git a/.gitignore b/.gitignore
index e0096772..bf38cff5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@
 .cxx
 
 local.properties
+keystore.properties
+metasearch.jks
 
 **/*.pro
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bed5104c..73f59c9c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch"
+    namespace = "com.metasearch.android"
 }
 
 ksp {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 982dadea..4a095984 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 
     <application
-        android:name="com.example.metasearch.App"
+        android:name="com.metasearch.android.App"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -24,6 +24,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MetaSearch"
+        android:usesCleartextTraffic="true"
         android:networkSecurityConfig="@xml/network_security_config">
 
     </application>
diff --git a/app/src/main/java/com/example/metasearch/App.kt b/app/src/main/java/com/metasearch/android/App.kt
similarity index 75%
rename from app/src/main/java/com/example/metasearch/App.kt
rename to app/src/main/java/com/metasearch/android/App.kt
index 2495cbc7..a83edf89 100644
--- a/app/src/main/java/com/example/metasearch/App.kt
+++ b/app/src/main/java/com/metasearch/android/App.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch
+package com.metasearch.android
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
diff --git a/app/src/main/java/com/example/metasearch/di/CircuitModule.kt b/app/src/main/java/com/metasearch/android/di/CircuitModule.kt
similarity index 93%
rename from app/src/main/java/com/example/metasearch/di/CircuitModule.kt
rename to app/src/main/java/com/metasearch/android/di/CircuitModule.kt
index 441a515d..2d24163c 100644
--- a/app/src/main/java/com/example/metasearch/di/CircuitModule.kt
+++ b/app/src/main/java/com/metasearch/android/di/CircuitModule.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.di
+package com.metasearch.android.di
 
 import com.slack.circuit.foundation.Circuit
 import com.slack.circuit.runtime.presenter.Presenter
diff --git a/build-logic/src/main/java/AndroidApplicationComposeConventionPlugin.kt b/build-logic/src/main/java/AndroidApplicationComposeConventionPlugin.kt
index efd31e81..51814d36 100644
--- a/build-logic/src/main/java/AndroidApplicationComposeConventionPlugin.kt
+++ b/build-logic/src/main/java/AndroidApplicationComposeConventionPlugin.kt
@@ -1,6 +1,6 @@
 import com.android.build.api.dsl.ApplicationExtension
-import com.example.metasearch.convention.Plugins
-import com.example.metasearch.convention.configureCompose
+import com.metasearch.android.convention.Plugins
+import com.metasearch.android.convention.configureCompose
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
diff --git a/build-logic/src/main/java/AndroidApplicationConventionPlugin.kt b/build-logic/src/main/java/AndroidApplicationConventionPlugin.kt
index fc3d6482..0247c41c 100644
--- a/build-logic/src/main/java/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/src/main/java/AndroidApplicationConventionPlugin.kt
@@ -1,9 +1,9 @@
 import com.android.build.api.dsl.ApplicationExtension
-import com.example.metasearch.convention.ExtensionType
-import com.example.metasearch.convention.Plugins
-import com.example.metasearch.convention.configureBuildTypes
-import com.example.metasearch.convention.configureKotlinAndroid
-import com.example.metasearch.convention.libs
+import com.metasearch.android.convention.ExtensionType
+import com.metasearch.android.convention.Plugins
+import com.metasearch.android.convention.configureBuildTypes
+import com.metasearch.android.convention.configureKotlinAndroid
+import com.metasearch.android.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
diff --git a/build-logic/src/main/java/AndroidFeatureConventionPlugin.kt b/build-logic/src/main/java/AndroidFeatureConventionPlugin.kt
index 1a3a1fc9..aadcf2b6 100644
--- a/build-logic/src/main/java/AndroidFeatureConventionPlugin.kt
+++ b/build-logic/src/main/java/AndroidFeatureConventionPlugin.kt
@@ -1,11 +1,11 @@
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
-import com.example.metasearch.convention.implementation
-import com.example.metasearch.convention.api
-import com.example.metasearch.convention.implementationProject
-import com.example.metasearch.convention.libs
-import com.example.metasearch.convention.ksp
+import com.metasearch.android.convention.implementation
+import com.metasearch.android.convention.api
+import com.metasearch.android.convention.implementationProject
+import com.metasearch.android.convention.libs
+import com.metasearch.android.convention.ksp
 
 internal class AndroidFeatureConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
diff --git a/build-logic/src/main/java/AndroidHiltConventionPlugin.kt b/build-logic/src/main/java/AndroidHiltConventionPlugin.kt
index a11ff807..93205402 100644
--- a/build-logic/src/main/java/AndroidHiltConventionPlugin.kt
+++ b/build-logic/src/main/java/AndroidHiltConventionPlugin.kt
@@ -1,7 +1,7 @@
-import com.example.metasearch.convention.Plugins
-import com.example.metasearch.convention.implementation
-import com.example.metasearch.convention.libs
-import com.example.metasearch.convention.ksp
+import com.metasearch.android.convention.Plugins
+import com.metasearch.android.convention.implementation
+import com.metasearch.android.convention.libs
+import com.metasearch.android.convention.ksp
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
diff --git a/build-logic/src/main/java/AndroidLibraryComposeConventionPlugin.kt b/build-logic/src/main/java/AndroidLibraryComposeConventionPlugin.kt
index 891364d2..8dc87fca 100644
--- a/build-logic/src/main/java/AndroidLibraryComposeConventionPlugin.kt
+++ b/build-logic/src/main/java/AndroidLibraryComposeConventionPlugin.kt
@@ -1,6 +1,6 @@
 import com.android.build.api.dsl.LibraryExtension
-import com.example.metasearch.convention.Plugins
-import com.example.metasearch.convention.configureCompose
+import com.metasearch.android.convention.Plugins
+import com.metasearch.android.convention.configureCompose
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
diff --git a/build-logic/src/main/java/AndroidLibraryConventionPlugin.kt b/build-logic/src/main/java/AndroidLibraryConventionPlugin.kt
index 6adf4b39..0c28fa4c 100644
--- a/build-logic/src/main/java/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/src/main/java/AndroidLibraryConventionPlugin.kt
@@ -1,13 +1,12 @@
 import com.android.build.gradle.LibraryExtension
-import com.example.metasearch.convention.ExtensionType
-import com.example.metasearch.convention.Plugins
-import com.example.metasearch.convention.configureBuildTypes
-import com.example.metasearch.convention.libs
-import com.example.metasearch.convention.configureKotlinAndroid
+import com.metasearch.android.convention.ExtensionType
+import com.metasearch.android.convention.Plugins
+import com.metasearch.android.convention.configureBuildTypes
+import com.metasearch.android.convention.libs
+import com.metasearch.android.convention.configureKotlinAndroid
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.dependencies
 import kotlin.text.toInt
 
 internal class AndroidLibraryConventionPlugin : Plugin<Project> {
diff --git a/build-logic/src/main/java/AndroidRetrofitConventionPlugin.kt b/build-logic/src/main/java/AndroidRetrofitConventionPlugin.kt
index f7be6e76..b8eee67a 100644
--- a/build-logic/src/main/java/AndroidRetrofitConventionPlugin.kt
+++ b/build-logic/src/main/java/AndroidRetrofitConventionPlugin.kt
@@ -1,8 +1,8 @@
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
-import com.example.metasearch.convention.libs
-import com.example.metasearch.convention.implementation
+import com.metasearch.android.convention.libs
+import com.metasearch.android.convention.implementation
 
 internal class AndroidRetrofitConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
diff --git a/build-logic/src/main/java/JvmLibraryConventionPlugin.kt b/build-logic/src/main/java/JvmLibraryConventionPlugin.kt
index 5ef061db..013f56dc 100644
--- a/build-logic/src/main/java/JvmLibraryConventionPlugin.kt
+++ b/build-logic/src/main/java/JvmLibraryConventionPlugin.kt
@@ -1,8 +1,7 @@
-import com.example.metasearch.convention.Plugins
-import com.example.metasearch.convention.configureKotlinJvm
+import com.metasearch.android.convention.Plugins
+import com.metasearch.android.convention.configureKotlinJvm
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.dependencies
 
 internal class JvmLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
diff --git a/build-logic/src/main/java/KotlinLibrarySerializationConventionPlugin.kt b/build-logic/src/main/java/KotlinLibrarySerializationConventionPlugin.kt
index 249fe740..1e2ee3a2 100644
--- a/build-logic/src/main/java/KotlinLibrarySerializationConventionPlugin.kt
+++ b/build-logic/src/main/java/KotlinLibrarySerializationConventionPlugin.kt
@@ -1,6 +1,6 @@
-import com.example.metasearch.convention.Plugins
-import com.example.metasearch.convention.implementation
-import com.example.metasearch.convention.libs
+import com.metasearch.android.convention.Plugins
+import com.metasearch.android.convention.implementation
+import com.metasearch.android.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
diff --git a/build-logic/src/main/java/com/example/metasearch/convention/BuildTypes.kt b/build-logic/src/main/java/com/example/metasearch/convention/BuildTypes.kt
deleted file mode 100644
index 561f7de7..00000000
--- a/build-logic/src/main/java/com/example/metasearch/convention/BuildTypes.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.example.metasearch.convention
-
-import com.android.build.api.dsl.ApplicationExtension
-import com.android.build.api.dsl.BuildType
-import com.android.build.api.dsl.CommonExtension
-import com.android.build.api.dsl.LibraryExtension
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
-
-internal fun Project.configureBuildTypes(
-    commonExtension: CommonExtension<*, *, *, *, *, *>,
-    extensionType: ExtensionType
-) {
-    commonExtension.run {
-        buildFeatures {
-            buildConfig = true
-        }
-    }
-
-    when (extensionType) {
-        ExtensionType.APPLICATION -> {
-            extensions.configure<ApplicationExtension> {
-                buildTypes {
-                    debug { configureDebugBuildType() }
-                    release { configureReleaseBuildType(commonExtension, extensionType) }
-                }
-            }
-        }
-
-        ExtensionType.LIBRARY -> {
-            extensions.configure<LibraryExtension> {
-                buildTypes {
-                    debug { configureDebugBuildType() }
-                    release { configureReleaseBuildType(commonExtension, extensionType) }
-                }
-            }
-        }
-    }
-}
-
-private fun BuildType.configureDebugBuildType() {
-    buildConfigField("String", "BASE_URL", "\"DEBUG_API_URL\"")
-}
-
-private fun BuildType.configureReleaseBuildType(
-    commonExtension: CommonExtension<*, *, *, *, *, *>,
-    extensionType: ExtensionType
-) {
-    buildConfigField("String", "BASE_URL", "\"RELEASE_API_URL\"")
-
-    isMinifyEnabled = true
-
-    if (extensionType == ExtensionType.APPLICATION) {
-        isShrinkResources = true
-    }
-
-    proguardFiles(
-        commonExtension.getDefaultProguardFile("proguard-android-optimize.txt"),
-        "proguard-rules.pro"
-    )
-}
\ No newline at end of file
diff --git a/build-logic/src/main/java/com/metasearch/android/convention/BuildTypes.kt b/build-logic/src/main/java/com/metasearch/android/convention/BuildTypes.kt
new file mode 100644
index 00000000..f0cce570
--- /dev/null
+++ b/build-logic/src/main/java/com/metasearch/android/convention/BuildTypes.kt
@@ -0,0 +1,64 @@
+package com.metasearch.android.convention
+
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.LibraryExtension
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import java.util.Properties
+
+internal fun Project.configureBuildTypes(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+    extensionType: ExtensionType
+) {
+    commonExtension.run {
+        buildFeatures {
+            buildConfig = true
+        }
+
+        buildTypes {
+            getByName("release") {
+                isMinifyEnabled = false
+                proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+                )
+            }
+        }
+    }
+
+    when (extensionType) {
+        ExtensionType.APPLICATION -> {
+            extensions.configure<ApplicationExtension> {
+                signingConfigs {
+                    create("release") {
+                        val propertiesFile = rootProject.file("keystore.properties")
+                        if (propertiesFile.exists()) {
+                            val properties = Properties()
+                            properties.load(propertiesFile.inputStream())
+                            storeFile = rootProject.file(properties["STORE_FILE"] as String)
+                            storePassword = properties["STORE_PASSWORD"] as String
+                            keyAlias = properties["KEY_ALIAS"] as String
+                            keyPassword = properties["KEY_PASSWORD"] as String
+                        }
+                    }
+                }
+
+                buildTypes {
+                    getByName("release") {
+                        isShrinkResources = false
+                        signingConfig = signingConfigs.getByName("release")
+                    }
+                }
+            }
+        }
+
+        ExtensionType.LIBRARY -> {
+            extensions.configure<LibraryExtension> {
+                buildTypes {
+                    getByName("release") { }
+                }
+            }
+        }
+    }
+}
diff --git a/build-logic/src/main/java/com/example/metasearch/convention/Compose.kt b/build-logic/src/main/java/com/metasearch/android/convention/Compose.kt
similarity index 89%
rename from build-logic/src/main/java/com/example/metasearch/convention/Compose.kt
rename to build-logic/src/main/java/com/metasearch/android/convention/Compose.kt
index 095f7314..0783893e 100644
--- a/build-logic/src/main/java/com/example/metasearch/convention/Compose.kt
+++ b/build-logic/src/main/java/com/metasearch/android/convention/Compose.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.convention
+package com.metasearch.android.convention
 
 import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
@@ -18,4 +18,4 @@ internal fun Project.configureCompose(
             debugImplementation(libs.androidx.compose.ui.tooling)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build-logic/src/main/java/com/example/metasearch/convention/Dependencies.kt b/build-logic/src/main/java/com/metasearch/android/convention/Dependencies.kt
similarity index 92%
rename from build-logic/src/main/java/com/example/metasearch/convention/Dependencies.kt
rename to build-logic/src/main/java/com/metasearch/android/convention/Dependencies.kt
index 71daeba8..92f224ff 100644
--- a/build-logic/src/main/java/com/example/metasearch/convention/Dependencies.kt
+++ b/build-logic/src/main/java/com/metasearch/android/convention/Dependencies.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.convention
+package com.metasearch.android.convention
 
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
@@ -26,4 +26,4 @@ fun DependencyHandler.debugImplementation(dependencyNotation: Any): Dependency?
 
 fun DependencyHandler.implementationProject(path: String): Dependency? {
     return add("implementation", project(path))
-}
\ No newline at end of file
+}
diff --git a/build-logic/src/main/java/com/example/metasearch/convention/ExtensionType.kt b/build-logic/src/main/java/com/metasearch/android/convention/ExtensionType.kt
similarity index 53%
rename from build-logic/src/main/java/com/example/metasearch/convention/ExtensionType.kt
rename to build-logic/src/main/java/com/metasearch/android/convention/ExtensionType.kt
index 36526396..872a0091 100644
--- a/build-logic/src/main/java/com/example/metasearch/convention/ExtensionType.kt
+++ b/build-logic/src/main/java/com/metasearch/android/convention/ExtensionType.kt
@@ -1,6 +1,6 @@
-package com.example.metasearch.convention
+package com.metasearch.android.convention
 
 enum class ExtensionType {
     APPLICATION,
     LIBRARY
-}
\ No newline at end of file
+}
diff --git a/build-logic/src/main/java/com/example/metasearch/convention/Extensions.kt b/build-logic/src/main/java/com/metasearch/android/convention/Extensions.kt
similarity index 61%
rename from build-logic/src/main/java/com/example/metasearch/convention/Extensions.kt
rename to build-logic/src/main/java/com/metasearch/android/convention/Extensions.kt
index 4f13d7da..9c5943e6 100644
--- a/build-logic/src/main/java/com/example/metasearch/convention/Extensions.kt
+++ b/build-logic/src/main/java/com/metasearch/android/convention/Extensions.kt
@@ -1,8 +1,8 @@
-package com.example.metasearch.convention
+package com.metasearch.android.convention
 
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.the
 
 internal val Project.libs
-    get() = the<LibrariesForLibs>()
\ No newline at end of file
+    get() = the<LibrariesForLibs>()
diff --git a/build-logic/src/main/java/com/example/metasearch/convention/Kotlin.kt b/build-logic/src/main/java/com/metasearch/android/convention/Kotlin.kt
similarity index 96%
rename from build-logic/src/main/java/com/example/metasearch/convention/Kotlin.kt
rename to build-logic/src/main/java/com/metasearch/android/convention/Kotlin.kt
index 61be8aac..43869124 100644
--- a/build-logic/src/main/java/com/example/metasearch/convention/Kotlin.kt
+++ b/build-logic/src/main/java/com/metasearch/android/convention/Kotlin.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.convention
+package com.metasearch.android.convention
 
 import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
@@ -40,4 +40,4 @@ private fun Project.configureKotlin() {
             jvmTarget.set(JvmTarget.JVM_11)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build-logic/src/main/java/com/example/metasearch/convention/Plugins.kt b/build-logic/src/main/java/com/metasearch/android/convention/Plugins.kt
similarity index 89%
rename from build-logic/src/main/java/com/example/metasearch/convention/Plugins.kt
rename to build-logic/src/main/java/com/metasearch/android/convention/Plugins.kt
index e73a7510..4dddb7e4 100644
--- a/build-logic/src/main/java/com/example/metasearch/convention/Plugins.kt
+++ b/build-logic/src/main/java/com/metasearch/android/convention/Plugins.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.convention
+package com.metasearch.android.convention
 
 object Plugins {
     const val ANDROID_APPLICATION = "com.android.application"
@@ -11,4 +11,4 @@ object Plugins {
 
     const val KSP = "com.google.devtools.ksp"
     const val HILT = "dagger.hilt.android.plugin"
-}
\ No newline at end of file
+}
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
index af93dc06..afa09179 100644
--- a/core/common/build.gradle.kts
+++ b/core/common/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.core.common"
+    namespace = "com.metasearch.android.core.common"
 }
 
 dependencies {
diff --git a/core/common/src/main/java/com/example/metasearch/core/common/constants/ErrorScope.kt b/core/common/src/main/java/com/metasearch/android/core/common/constants/ErrorScope.kt
similarity index 50%
rename from core/common/src/main/java/com/example/metasearch/core/common/constants/ErrorScope.kt
rename to core/common/src/main/java/com/metasearch/android/core/common/constants/ErrorScope.kt
index 618a57b1..945e43e0 100644
--- a/core/common/src/main/java/com/example/metasearch/core/common/constants/ErrorScope.kt
+++ b/core/common/src/main/java/com/metasearch/android/core/common/constants/ErrorScope.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.common.constants
+package com.metasearch.android.core.common.constants
 
 enum class ErrorScope {
     GLOBAL,
diff --git a/core/common/src/main/java/com/example/metasearch/core/common/constants/PromptConstants.kt b/core/common/src/main/java/com/metasearch/android/core/common/constants/PromptConstants.kt
similarity index 95%
rename from core/common/src/main/java/com/example/metasearch/core/common/constants/PromptConstants.kt
rename to core/common/src/main/java/com/metasearch/android/core/common/constants/PromptConstants.kt
index 6df1acd5..fa8606ec 100644
--- a/core/common/src/main/java/com/example/metasearch/core/common/constants/PromptConstants.kt
+++ b/core/common/src/main/java/com/metasearch/android/core/common/constants/PromptConstants.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.common.constants
+package com.metasearch.android.core.common.constants
 
 object PromptConstants {
     const val NL_SEARCH_BASIC_PROMPT = """
diff --git a/core/common/src/main/java/com/example/metasearch/core/common/extensions/ModifierExt.kt b/core/common/src/main/java/com/metasearch/android/core/common/extensions/ModifierExt.kt
similarity index 78%
rename from core/common/src/main/java/com/example/metasearch/core/common/extensions/ModifierExt.kt
rename to core/common/src/main/java/com/metasearch/android/core/common/extensions/ModifierExt.kt
index d4a1d9e2..15fac940 100644
--- a/core/common/src/main/java/com/example/metasearch/core/common/extensions/ModifierExt.kt
+++ b/core/common/src/main/java/com/metasearch/android/core/common/extensions/ModifierExt.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.common.extensions
+package com.metasearch.android.core.common.extensions
 
 import androidx.compose.foundation.clickable
 import androidx.compose.ui.Modifier
diff --git a/core/common/src/main/java/com/example/metasearch/core/common/extensions/UriExt.kt b/core/common/src/main/java/com/metasearch/android/core/common/extensions/UriExt.kt
similarity index 85%
rename from core/common/src/main/java/com/example/metasearch/core/common/extensions/UriExt.kt
rename to core/common/src/main/java/com/metasearch/android/core/common/extensions/UriExt.kt
index 420ccef4..37628669 100644
--- a/core/common/src/main/java/com/example/metasearch/core/common/extensions/UriExt.kt
+++ b/core/common/src/main/java/com/metasearch/android/core/common/extensions/UriExt.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.common.extensions
+package com.metasearch.android.core.common.extensions
 
 import android.content.Context
 import android.net.Uri
diff --git a/core/common/src/main/java/com/example/metasearch/core/common/utils/EventHandler.kt b/core/common/src/main/java/com/metasearch/android/core/common/utils/EventHandler.kt
similarity index 91%
rename from core/common/src/main/java/com/example/metasearch/core/common/utils/EventHandler.kt
rename to core/common/src/main/java/com/metasearch/android/core/common/utils/EventHandler.kt
index 0250d617..4dae7979 100644
--- a/core/common/src/main/java/com/example/metasearch/core/common/utils/EventHandler.kt
+++ b/core/common/src/main/java/com/metasearch/android/core/common/utils/EventHandler.kt
@@ -1,6 +1,6 @@
-package com.example.metasearch.core.common.utils
+package com.metasearch.android.core.common.utils
 
-import com.example.metasearch.core.common.constants.ErrorScope
+import com.metasearch.android.core.common.constants.ErrorScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
 import retrofit2.HttpException
diff --git a/core/common/src/main/java/com/example/metasearch/core/common/utils/Exception.kt b/core/common/src/main/java/com/metasearch/android/core/common/utils/Exception.kt
similarity index 88%
rename from core/common/src/main/java/com/example/metasearch/core/common/utils/Exception.kt
rename to core/common/src/main/java/com/metasearch/android/core/common/utils/Exception.kt
index 83cdf108..f7bc1c85 100644
--- a/core/common/src/main/java/com/example/metasearch/core/common/utils/Exception.kt
+++ b/core/common/src/main/java/com/metasearch/android/core/common/utils/Exception.kt
@@ -1,6 +1,6 @@
-package com.example.metasearch.core.common.utils
+package com.metasearch.android.core.common.utils
 
-import com.example.metasearch.core.common.constants.ErrorScope
+import com.metasearch.android.core.common.constants.ErrorScope
 import retrofit2.HttpException
 import java.io.IOException
 import java.net.ConnectException
diff --git a/core/common/src/main/java/com/example/metasearch/core/common/utils/Normalize.kt b/core/common/src/main/java/com/metasearch/android/core/common/utils/Normalize.kt
similarity index 67%
rename from core/common/src/main/java/com/example/metasearch/core/common/utils/Normalize.kt
rename to core/common/src/main/java/com/metasearch/android/core/common/utils/Normalize.kt
index ad542c26..fa2436ee 100644
--- a/core/common/src/main/java/com/example/metasearch/core/common/utils/Normalize.kt
+++ b/core/common/src/main/java/com/metasearch/android/core/common/utils/Normalize.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.common.utils
+package com.metasearch.android.core.common.utils
 
 fun normalizePhoneNumber(phoneNumber: String): String {
     return phoneNumber.replace("[^0-9]".toRegex(), "")
diff --git a/core/common/src/main/java/com/example/metasearch/core/common/utils/RunCatching.kt b/core/common/src/main/java/com/metasearch/android/core/common/utils/RunCatching.kt
similarity index 92%
rename from core/common/src/main/java/com/example/metasearch/core/common/utils/RunCatching.kt
rename to core/common/src/main/java/com/metasearch/android/core/common/utils/RunCatching.kt
index 032d68ec..3cc0b3bb 100644
--- a/core/common/src/main/java/com/example/metasearch/core/common/utils/RunCatching.kt
+++ b/core/common/src/main/java/com/metasearch/android/core/common/utils/RunCatching.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.common.utils
+package com.metasearch.android.core.common.utils
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.TimeoutCancellationException
diff --git a/core/data/api/build.gradle.kts b/core/data/api/build.gradle.kts
index f88cf0be..b2bc4342 100644
--- a/core/data/api/build.gradle.kts
+++ b/core/data/api/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.core.data.api"
+    namespace = "com.metasearch.android.core.data.api"
 }
 
 dependencies {
diff --git a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/DatabaseNameRepository.kt b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/DatabaseNameRepository.kt
similarity index 73%
rename from core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/DatabaseNameRepository.kt
rename to core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/DatabaseNameRepository.kt
index b458b9c5..41395856 100644
--- a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/DatabaseNameRepository.kt
+++ b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/DatabaseNameRepository.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.data.api.repository
+package com.metasearch.android.core.data.api.repository
 
 interface DatabaseNameRepository {
     /**
diff --git a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/GalleryRepository.kt b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/GalleryRepository.kt
similarity index 76%
rename from core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/GalleryRepository.kt
rename to core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/GalleryRepository.kt
index 654ddc90..fd631a8a 100644
--- a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/GalleryRepository.kt
+++ b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/GalleryRepository.kt
@@ -1,8 +1,8 @@
-package com.example.metasearch.core.data.api.repository
+package com.metasearch.android.core.data.api.repository
 
 import android.net.Uri
 import androidx.paging.PagingData
-import com.example.metasearch.core.model.GalleryImageModel
+import com.metasearch.android.core.model.GalleryImageModel
 import kotlinx.coroutines.flow.Flow
 
 interface GalleryRepository {
diff --git a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/GraphRepository.kt b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/GraphRepository.kt
similarity index 83%
rename from core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/GraphRepository.kt
rename to core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/GraphRepository.kt
index 10b8095a..ad97680a 100644
--- a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/GraphRepository.kt
+++ b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/GraphRepository.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.data.api.repository
+package com.metasearch.android.core.data.api.repository
 
 import android.net.Uri
 
diff --git a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/ImageAnalysisRepository.kt b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/ImageAnalysisRepository.kt
similarity index 80%
rename from core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/ImageAnalysisRepository.kt
rename to core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/ImageAnalysisRepository.kt
index cbab4e4f..580e8a29 100644
--- a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/ImageAnalysisRepository.kt
+++ b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/ImageAnalysisRepository.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.data.api.repository
+package com.metasearch.android.core.data.api.repository
 
 import android.content.Context
 import kotlinx.coroutines.flow.Flow
diff --git a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/PersonRepository.kt b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/PersonRepository.kt
similarity index 90%
rename from core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/PersonRepository.kt
rename to core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/PersonRepository.kt
index 4a4fc5a1..8c53c238 100644
--- a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/PersonRepository.kt
+++ b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/PersonRepository.kt
@@ -1,6 +1,6 @@
-package com.example.metasearch.core.data.api.repository
+package com.metasearch.android.core.data.api.repository
 
-import com.example.metasearch.core.model.PersonModel
+import com.metasearch.android.core.model.PersonModel
 import kotlinx.coroutines.flow.Flow
 
 interface PersonRepository {
diff --git a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/SearchRepository.kt b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/SearchRepository.kt
similarity index 51%
rename from core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/SearchRepository.kt
rename to core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/SearchRepository.kt
index 14bc0950..ed095e34 100644
--- a/core/data/api/src/main/java/com/example/metasearch/core/data/api/repository/SearchRepository.kt
+++ b/core/data/api/src/main/java/com/metasearch/android/core/data/api/repository/SearchRepository.kt
@@ -1,8 +1,8 @@
-package com.example.metasearch.core.data.api.repository
+package com.metasearch.android.core.data.api.repository
 
-import com.example.metasearch.core.model.CircleModel
-import com.example.metasearch.core.model.NLSearchResult
-import com.example.metasearch.core.model.SearchResult
+import com.metasearch.android.core.model.CircleModel
+import com.metasearch.android.core.model.NLSearchResult
+import com.metasearch.android.core.model.SearchResult
 import java.io.File
 
 interface SearchRepository {
diff --git a/core/data/impl/build.gradle.kts b/core/data/impl/build.gradle.kts
index cf150649..cb3205d2 100644
--- a/core/data/impl/build.gradle.kts
+++ b/core/data/impl/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.core.data.impl"
+    namespace = "com.metasearch.android.core.data.impl"
 
     buildFeatures {
         buildConfig = true
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/datasource/GalleryPagingSource.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/datasource/GalleryPagingSource.kt
similarity index 91%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/datasource/GalleryPagingSource.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/datasource/GalleryPagingSource.kt
index 2a54270f..0d425abe 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/datasource/GalleryPagingSource.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/datasource/GalleryPagingSource.kt
@@ -1,12 +1,13 @@
-package com.example.metasearch.core.data.impl.datasource
+package com.metasearch.android.core.data.impl.datasource
 
 import android.content.ContentResolver
 import android.content.ContentUris
 import android.content.Context
+import android.os.Bundle
 import android.provider.MediaStore
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import com.example.metasearch.core.model.GalleryImageModel
+import com.metasearch.android.core.model.GalleryImageModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
@@ -27,7 +28,7 @@ class GalleryPagingSource(
                     MediaStore.Images.Media.DATE_ADDED,
                 )
 
-                val queryArgs = android.os.Bundle().apply {
+                val queryArgs = Bundle().apply {
                     putInt(ContentResolver.QUERY_ARG_LIMIT, limit)
                     putInt(ContentResolver.QUERY_ARG_OFFSET, offset)
                     putStringArray(ContentResolver.QUERY_ARG_SORT_COLUMNS, arrayOf(MediaStore.Images.Media.DATE_ADDED))
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/di/CoroutineModule.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/di/CoroutineModule.kt
similarity index 88%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/di/CoroutineModule.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/di/CoroutineModule.kt
index 6a63ec5e..b3661189 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/di/CoroutineModule.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/di/CoroutineModule.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.data.impl.di
+package com.metasearch.android.core.data.impl.di
 
 import dagger.Module
 import dagger.Provides
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/di/RepositoryModule.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/di/RepositoryModule.kt
similarity index 58%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/di/RepositoryModule.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/di/RepositoryModule.kt
index 9dd6e06c..3ad5031c 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/di/RepositoryModule.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/di/RepositoryModule.kt
@@ -1,17 +1,17 @@
-package com.example.metasearch.core.data.impl.di
+package com.metasearch.android.core.data.impl.di
 
-import com.example.metasearch.core.data.api.repository.DatabaseNameRepository
-import com.example.metasearch.core.data.api.repository.GalleryRepository
-import com.example.metasearch.core.data.api.repository.GraphRepository
-import com.example.metasearch.core.data.api.repository.ImageAnalysisRepository
-import com.example.metasearch.core.data.api.repository.PersonRepository
-import com.example.metasearch.core.data.api.repository.SearchRepository
-import com.example.metasearch.core.data.impl.repository.DatabaseNameRepositoryImpl
-import com.example.metasearch.core.data.impl.repository.GalleryRepositoryImpl
-import com.example.metasearch.core.data.impl.repository.GraphRepositoryImpl
-import com.example.metasearch.core.data.impl.repository.ImageAnalysisRepositoryImpl
-import com.example.metasearch.core.data.impl.repository.PersonRepositoryImpl
-import com.example.metasearch.core.data.impl.repository.SearchRepositoryImpl
+import com.metasearch.android.core.data.api.repository.DatabaseNameRepository
+import com.metasearch.android.core.data.api.repository.GalleryRepository
+import com.metasearch.android.core.data.api.repository.GraphRepository
+import com.metasearch.android.core.data.api.repository.ImageAnalysisRepository
+import com.metasearch.android.core.data.api.repository.PersonRepository
+import com.metasearch.android.core.data.api.repository.SearchRepository
+import com.metasearch.android.core.data.impl.repository.DatabaseNameRepositoryImpl
+import com.metasearch.android.core.data.impl.repository.GalleryRepositoryImpl
+import com.metasearch.android.core.data.impl.repository.GraphRepositoryImpl
+import com.metasearch.android.core.data.impl.repository.ImageAnalysisRepositoryImpl
+import com.metasearch.android.core.data.impl.repository.PersonRepositoryImpl
+import com.metasearch.android.core.data.impl.repository.SearchRepositoryImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/mapper/ResponseToModel.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/mapper/ResponseToModel.kt
similarity index 75%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/mapper/ResponseToModel.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/mapper/ResponseToModel.kt
index 93c15148..75d1580e 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/mapper/ResponseToModel.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/mapper/ResponseToModel.kt
@@ -1,14 +1,14 @@
-package com.example.metasearch.core.data.impl.mapper
+package com.metasearch.android.core.data.impl.mapper
 
-import com.example.metasearch.core.model.FaceModel
-import com.example.metasearch.core.model.PersonModel
-import com.example.metasearch.core.model.PhotoGroup
-import com.example.metasearch.core.model.SearchResult
-import com.example.metasearch.core.network.response.PhotoNameResponse
-import com.example.metasearch.core.network.response.PhotoResponse
-import com.example.metasearch.core.room.api.entity.FaceEntity
-import com.example.metasearch.core.room.api.entity.PersonEntity
-import com.example.metasearch.core.room.api.relations.PersonWithFaces
+import com.metasearch.android.core.model.FaceModel
+import com.metasearch.android.core.model.PersonModel
+import com.metasearch.android.core.model.PhotoGroup
+import com.metasearch.android.core.model.SearchResult
+import com.metasearch.android.core.network.response.PhotoNameResponse
+import com.metasearch.android.core.network.response.PhotoResponse
+import com.metasearch.android.core.room.api.entity.FaceEntity
+import com.metasearch.android.core.room.api.entity.PersonEntity
+import com.metasearch.android.core.room.api.relations.PersonWithFaces
 import kotlin.collections.map
 
 internal fun PhotoResponse.toModel(): SearchResult {
@@ -30,7 +30,7 @@ internal fun PhotoResponse.toModel(): SearchResult {
         if (filteredNames.isNotEmpty()) {
             resultGroups.add(
                 PhotoGroup(
-                    categoryName = "#$category",
+                    categoryName = "# $category",
                     photoNames = filteredNames,
                 ),
             )
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/DatabaseNameRepositoryImpl.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/DatabaseNameRepositoryImpl.kt
similarity index 74%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/DatabaseNameRepositoryImpl.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/DatabaseNameRepositoryImpl.kt
index 0a815ba8..a2b2bdaa 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/DatabaseNameRepositoryImpl.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/DatabaseNameRepositoryImpl.kt
@@ -1,7 +1,7 @@
-package com.example.metasearch.core.data.impl.repository
+package com.metasearch.android.core.data.impl.repository
 
-import com.example.metasearch.core.data.api.repository.DatabaseNameRepository
-import com.example.metasearch.core.datastore.api.datasource.DeviceIdDataSource
+import com.metasearch.android.core.data.api.repository.DatabaseNameRepository
+import com.metasearch.android.core.datastore.api.datasource.DeviceIdDataSource
 import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/GalleryRepositoryImpl.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/GalleryRepositoryImpl.kt
similarity index 90%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/GalleryRepositoryImpl.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/GalleryRepositoryImpl.kt
index ce911f74..3f25ec57 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/GalleryRepositoryImpl.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/GalleryRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.data.impl.repository
+package com.metasearch.android.core.data.impl.repository
 
 import android.content.ContentUris
 import android.content.Context
@@ -7,10 +7,10 @@ import android.provider.MediaStore
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
-import com.example.metasearch.core.data.api.repository.GalleryRepository
-import com.example.metasearch.core.data.impl.datasource.GalleryPagingSource
-import com.example.metasearch.core.data.impl.di.IoDispatcher
-import com.example.metasearch.core.model.GalleryImageModel
+import com.metasearch.android.core.data.api.repository.GalleryRepository
+import com.metasearch.android.core.data.impl.datasource.GalleryPagingSource
+import com.metasearch.android.core.data.impl.di.IoDispatcher
+import com.metasearch.android.core.model.GalleryImageModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/GraphRepositoryImpl.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/GraphRepositoryImpl.kt
similarity index 72%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/GraphRepositoryImpl.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/GraphRepositoryImpl.kt
index 34c8e66c..fd7a3a8d 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/GraphRepositoryImpl.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/GraphRepositoryImpl.kt
@@ -1,11 +1,12 @@
-package com.example.metasearch.core.data.impl.repository
+package com.metasearch.android.core.data.impl.repository
 
 import android.net.Uri
 import androidx.core.net.toUri
-import com.example.metasearch.core.data.api.repository.DatabaseNameRepository
-import com.example.metasearch.core.data.api.repository.GalleryRepository
-import com.example.metasearch.core.data.api.repository.GraphRepository
-import com.example.metasearch.core.network.service.WebService
+import com.metasearch.android.core.data.api.repository.DatabaseNameRepository
+import com.metasearch.android.core.data.api.repository.GalleryRepository
+import com.metasearch.android.core.data.api.repository.GraphRepository
+import com.metasearch.android.core.network.BuildConfig
+import com.metasearch.android.core.network.service.WebService
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -15,7 +16,7 @@ internal class GraphRepositoryImpl @Inject constructor(
     private val galleryRepository: GalleryRepository,
     private val webService: WebService,
 ) : GraphRepository {
-    private val webServerBaseUrl = com.example.metasearch.core.network.BuildConfig.WEB_SERVER_BASE_URL
+    private val webServerBaseUrl = BuildConfig.WEB_SERVER_BASE_URL
 
     override suspend fun getFullGraphWebViewUrl(): String {
         val dbName = databaseNameRepository.getPersistentDeviceDatabaseName()
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/ImageAnalysisRepositoryImpl.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/ImageAnalysisRepositoryImpl.kt
similarity index 88%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/ImageAnalysisRepositoryImpl.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/ImageAnalysisRepositoryImpl.kt
index 24924936..80d40f0c 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/ImageAnalysisRepositoryImpl.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/ImageAnalysisRepositoryImpl.kt
@@ -1,29 +1,30 @@
-package com.example.metasearch.core.data.impl.repository
+package com.metasearch.android.core.data.impl.repository
 
 import android.content.Context
 import android.net.Uri
+import android.util.Base64
 import android.util.Base64.decode
 import android.util.Log
 import androidx.core.net.toUri
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
-import com.example.metasearch.core.common.constants.PromptConstants
-import com.example.metasearch.core.common.extensions.toFile
-import com.example.metasearch.core.common.utils.runSuspendCatching
-import com.example.metasearch.core.data.api.repository.DatabaseNameRepository
-import com.example.metasearch.core.data.api.repository.GalleryRepository
-import com.example.metasearch.core.data.api.repository.ImageAnalysisRepository
-import com.example.metasearch.core.data.api.repository.PersonRepository
-import com.example.metasearch.core.datastore.api.datasource.PersonIndexDataSource
-import com.example.metasearch.core.network.request.ChangeNameRequest
-import com.example.metasearch.core.network.request.DeleteImageRequest
-import com.example.metasearch.core.network.request.OpenAIMessage
-import com.example.metasearch.core.network.request.OpenAIRequest
-import com.example.metasearch.core.network.service.AIService
-import com.example.metasearch.core.network.service.OpenAIService
-import com.example.metasearch.core.network.service.WebService
-import com.example.metasearch.core.room.api.dao.AnalyzedImageDao
-import com.example.metasearch.core.room.api.entity.AnalyzedImageEntity
+import com.metasearch.android.core.common.constants.PromptConstants
+import com.metasearch.android.core.common.extensions.toFile
+import com.metasearch.android.core.common.utils.runSuspendCatching
+import com.metasearch.android.core.data.api.repository.DatabaseNameRepository
+import com.metasearch.android.core.data.api.repository.GalleryRepository
+import com.metasearch.android.core.data.api.repository.ImageAnalysisRepository
+import com.metasearch.android.core.data.api.repository.PersonRepository
+import com.metasearch.android.core.datastore.api.datasource.PersonIndexDataSource
+import com.metasearch.android.core.network.request.ChangeNameRequest
+import com.metasearch.android.core.network.request.DeleteImageRequest
+import com.metasearch.android.core.network.request.OpenAIMessage
+import com.metasearch.android.core.network.request.OpenAIRequest
+import com.metasearch.android.core.network.service.AIService
+import com.metasearch.android.core.network.service.OpenAIService
+import com.metasearch.android.core.network.service.WebService
+import com.metasearch.android.core.room.api.dao.AnalyzedImageDao
+import com.metasearch.android.core.room.api.entity.AnalyzedImageEntity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -209,7 +210,7 @@ class ImageAnalysisRepositoryImpl @Inject constructor(
                     response.images.forEach { person ->
                         runCatching {
                             if (person.isFaceExit && person.imageName != null && person.imageBytes != null) {
-                                val decodedBytes = decode(person.imageBytes, android.util.Base64.DEFAULT)
+                                val decodedBytes = decode(person.imageBytes, Base64.DEFAULT)
 
                                 val existingPersonId = personRepository.getPersonIdByImageName(person.imageName!!)
 
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/PersonRepositoryImpl.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/PersonRepositoryImpl.kt
similarity index 87%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/PersonRepositoryImpl.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/PersonRepositoryImpl.kt
index 3d1c212b..fd7ba875 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/PersonRepositoryImpl.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/PersonRepositoryImpl.kt
@@ -1,24 +1,24 @@
-package com.example.metasearch.core.data.impl.repository
+package com.metasearch.android.core.data.impl.repository
 
 import android.content.Context
 import android.database.Cursor
 import android.provider.CallLog
 import android.util.Log
-import com.example.metasearch.core.common.utils.normalizePhoneNumber
-import com.example.metasearch.core.common.utils.runSuspendCatching
-import com.example.metasearch.core.data.api.repository.DatabaseNameRepository
-import com.example.metasearch.core.data.api.repository.PersonRepository
-import com.example.metasearch.core.data.impl.di.IoDispatcher
-import com.example.metasearch.core.data.impl.mapper.toModel
-import com.example.metasearch.core.model.PersonModel
-import com.example.metasearch.core.network.request.ChangeNameRequest
-import com.example.metasearch.core.network.request.DeleteEntityRequest
-import com.example.metasearch.core.network.request.PersonFrequencyRequest
-import com.example.metasearch.core.network.request.PersonSearchRequest
-import com.example.metasearch.core.network.service.AIService
-import com.example.metasearch.core.network.service.WebService
-import com.example.metasearch.core.room.api.dao.PersonDao
-import com.example.metasearch.core.room.api.entity.FaceEntity
+import com.metasearch.android.core.common.utils.normalizePhoneNumber
+import com.metasearch.android.core.common.utils.runSuspendCatching
+import com.metasearch.android.core.data.api.repository.DatabaseNameRepository
+import com.metasearch.android.core.data.api.repository.PersonRepository
+import com.metasearch.android.core.data.impl.di.IoDispatcher
+import com.metasearch.android.core.data.impl.mapper.toModel
+import com.metasearch.android.core.model.PersonModel
+import com.metasearch.android.core.network.request.ChangeNameRequest
+import com.metasearch.android.core.network.request.DeleteEntityRequest
+import com.metasearch.android.core.network.request.PersonFrequencyRequest
+import com.metasearch.android.core.network.request.PersonSearchRequest
+import com.metasearch.android.core.network.service.AIService
+import com.metasearch.android.core.network.service.WebService
+import com.metasearch.android.core.room.api.dao.PersonDao
+import com.metasearch.android.core.room.api.entity.FaceEntity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/SearchRepositoryImpl.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/SearchRepositoryImpl.kt
similarity index 77%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/SearchRepositoryImpl.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/SearchRepositoryImpl.kt
index 8b7b0825..39e89bea 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/repository/SearchRepositoryImpl.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/repository/SearchRepositoryImpl.kt
@@ -1,23 +1,23 @@
-package com.example.metasearch.core.data.impl.repository
-
-import com.example.metasearch.core.common.constants.PromptConstants
-import com.example.metasearch.core.common.utils.runSuspendCatching
-import com.example.metasearch.core.data.api.repository.DatabaseNameRepository
-import com.example.metasearch.core.data.api.repository.GalleryRepository
-import com.example.metasearch.core.data.api.repository.SearchRepository
-import com.example.metasearch.core.data.impl.mapper.toModel
-import com.example.metasearch.core.data.impl.util.CypherQueryGenerator
-import com.example.metasearch.core.model.CircleModel
-import com.example.metasearch.core.model.NLSearchResult
-import com.example.metasearch.core.model.SearchResult
-import com.example.metasearch.core.network.request.DetectedObjectsRequest
-import com.example.metasearch.core.network.request.FocusingSearchRequest
-import com.example.metasearch.core.network.request.NLQueryRequest
-import com.example.metasearch.core.network.request.OpenAIMessage
-import com.example.metasearch.core.network.request.OpenAIRequest
-import com.example.metasearch.core.network.service.AIService
-import com.example.metasearch.core.network.service.OpenAIService
-import com.example.metasearch.core.network.service.WebService
+package com.metasearch.android.core.data.impl.repository
+
+import com.metasearch.android.core.common.constants.PromptConstants
+import com.metasearch.android.core.common.utils.runSuspendCatching
+import com.metasearch.android.core.data.api.repository.DatabaseNameRepository
+import com.metasearch.android.core.data.api.repository.GalleryRepository
+import com.metasearch.android.core.data.api.repository.SearchRepository
+import com.metasearch.android.core.data.impl.mapper.toModel
+import com.metasearch.android.core.data.impl.util.CypherQueryGenerator
+import com.metasearch.android.core.model.CircleModel
+import com.metasearch.android.core.model.NLSearchResult
+import com.metasearch.android.core.model.SearchResult
+import com.metasearch.android.core.network.request.DetectedObjectsRequest
+import com.metasearch.android.core.network.request.FocusingSearchRequest
+import com.metasearch.android.core.network.request.NLQueryRequest
+import com.metasearch.android.core.network.request.OpenAIMessage
+import com.metasearch.android.core.network.request.OpenAIRequest
+import com.metasearch.android.core.network.service.AIService
+import com.metasearch.android.core.network.service.OpenAIService
+import com.metasearch.android.core.network.service.WebService
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
@@ -28,7 +28,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
-import com.example.metasearch.core.network.request.Circle as RequestCircle
+import com.metasearch.android.core.network.request.Circle as RequestCircle
 
 @Singleton
 internal class SearchRepositoryImpl @Inject constructor(
diff --git a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/util/CypherQueryGenerator.kt b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/util/CypherQueryGenerator.kt
similarity index 93%
rename from core/data/impl/src/main/java/com/example/metasearch/core/data/impl/util/CypherQueryGenerator.kt
rename to core/data/impl/src/main/java/com/metasearch/android/core/data/impl/util/CypherQueryGenerator.kt
index 3792aa61..76477b2e 100644
--- a/core/data/impl/src/main/java/com/example/metasearch/core/data/impl/util/CypherQueryGenerator.kt
+++ b/core/data/impl/src/main/java/com/metasearch/android/core/data/impl/util/CypherQueryGenerator.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.data.impl.util
+package com.metasearch.android.core.data.impl.util
 
 internal object CypherQueryGenerator {
 
diff --git a/core/data/impl/src/test/java/com/example/metasearch/core/data/impl/repository/DatabaseNameRepositoryImplTest.kt b/core/data/impl/src/test/java/com/metasearch/android/core/data/impl/repository/DatabaseNameRepositoryImplTest.kt
similarity index 89%
rename from core/data/impl/src/test/java/com/example/metasearch/core/data/impl/repository/DatabaseNameRepositoryImplTest.kt
rename to core/data/impl/src/test/java/com/metasearch/android/core/data/impl/repository/DatabaseNameRepositoryImplTest.kt
index 5648bce6..55758e05 100644
--- a/core/data/impl/src/test/java/com/example/metasearch/core/data/impl/repository/DatabaseNameRepositoryImplTest.kt
+++ b/core/data/impl/src/test/java/com/metasearch/android/core/data/impl/repository/DatabaseNameRepositoryImplTest.kt
@@ -1,6 +1,6 @@
-package com.example.metasearch.core.data.impl.repository
+package com.metasearch.android.core.data.impl.repository
 
-import com.example.metasearch.core.datastore.api.datasource.DeviceIdDataSource
+import com.metasearch.android.core.datastore.api.datasource.DeviceIdDataSource
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
diff --git a/core/data/impl/src/test/java/com/example/metasearch/core/data/impl/repository/PersonRepositoryImplTest.kt b/core/data/impl/src/test/java/com/metasearch/android/core/data/impl/repository/PersonRepositoryImplTest.kt
similarity index 86%
rename from core/data/impl/src/test/java/com/example/metasearch/core/data/impl/repository/PersonRepositoryImplTest.kt
rename to core/data/impl/src/test/java/com/metasearch/android/core/data/impl/repository/PersonRepositoryImplTest.kt
index 0149506f..5b78a37a 100644
--- a/core/data/impl/src/test/java/com/example/metasearch/core/data/impl/repository/PersonRepositoryImplTest.kt
+++ b/core/data/impl/src/test/java/com/metasearch/android/core/data/impl/repository/PersonRepositoryImplTest.kt
@@ -1,11 +1,11 @@
-package com.example.metasearch.core.data.impl.repository
+package com.metasearch.android.core.data.impl.repository
 
 import android.content.Context
-import com.example.metasearch.core.data.api.repository.DatabaseNameRepository
-import com.example.metasearch.core.model.PersonModel
-import com.example.metasearch.core.network.service.AIService
-import com.example.metasearch.core.network.service.WebService
-import com.example.metasearch.core.room.api.dao.PersonDao
+import com.metasearch.android.core.data.api.repository.DatabaseNameRepository
+import com.metasearch.android.core.model.PersonModel
+import com.metasearch.android.core.network.service.AIService
+import com.metasearch.android.core.network.service.WebService
+import com.metasearch.android.core.room.api.dao.PersonDao
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.advanceUntilIdle
diff --git a/core/datastore/api/build.gradle.kts b/core/datastore/api/build.gradle.kts
index ae3d405d..8c66e55c 100644
--- a/core/datastore/api/build.gradle.kts
+++ b/core/datastore/api/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     alias(libs.plugins.metasearch.android.library)
 }
 android {
-    namespace = "com.example.metasearch.core.datastore.api"
+    namespace = "com.metasearch.android.core.datastore.api"
 }
 
 dependencies {
diff --git a/core/datastore/api/src/main/java/com/example/metasearch/core/datastore/api/datasource/DeviceIdDataSource.kt b/core/datastore/api/src/main/java/com/metasearch/android/core/datastore/api/datasource/DeviceIdDataSource.kt
similarity index 72%
rename from core/datastore/api/src/main/java/com/example/metasearch/core/datastore/api/datasource/DeviceIdDataSource.kt
rename to core/datastore/api/src/main/java/com/metasearch/android/core/datastore/api/datasource/DeviceIdDataSource.kt
index 9e3c8056..0f5a07bf 100644
--- a/core/datastore/api/src/main/java/com/example/metasearch/core/datastore/api/datasource/DeviceIdDataSource.kt
+++ b/core/datastore/api/src/main/java/com/metasearch/android/core/datastore/api/datasource/DeviceIdDataSource.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.datastore.api.datasource
+package com.metasearch.android.core.datastore.api.datasource
 
 import kotlinx.coroutines.flow.Flow
 
diff --git a/core/datastore/api/src/main/java/com/example/metasearch/core/datastore/api/datasource/PersonIndexDataSource.kt b/core/datastore/api/src/main/java/com/metasearch/android/core/datastore/api/datasource/PersonIndexDataSource.kt
similarity index 73%
rename from core/datastore/api/src/main/java/com/example/metasearch/core/datastore/api/datasource/PersonIndexDataSource.kt
rename to core/datastore/api/src/main/java/com/metasearch/android/core/datastore/api/datasource/PersonIndexDataSource.kt
index febb6555..a353d86c 100644
--- a/core/datastore/api/src/main/java/com/example/metasearch/core/datastore/api/datasource/PersonIndexDataSource.kt
+++ b/core/datastore/api/src/main/java/com/metasearch/android/core/datastore/api/datasource/PersonIndexDataSource.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.datastore.api.datasource
+package com.metasearch.android.core.datastore.api.datasource
 
 import kotlinx.coroutines.flow.Flow
 
diff --git a/core/datastore/impl/build.gradle.kts b/core/datastore/impl/build.gradle.kts
index 7ebb8a75..c3ff4247 100644
--- a/core/datastore/impl/build.gradle.kts
+++ b/core/datastore/impl/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.datastore.impl"
+    namespace = "com.metasearch.android.datastore.impl"
 }
 
 dependencies {
diff --git a/core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/datasource/DeviceIdDataSourceImpl.kt b/core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/datasource/DeviceIdDataSourceImpl.kt
similarity index 81%
rename from core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/datasource/DeviceIdDataSourceImpl.kt
rename to core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/datasource/DeviceIdDataSourceImpl.kt
index 6e80f64c..9e944f11 100644
--- a/core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/datasource/DeviceIdDataSourceImpl.kt
+++ b/core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/datasource/DeviceIdDataSourceImpl.kt
@@ -1,11 +1,11 @@
-package com.example.metasearch.datastore.impl.datasource
+package com.metasearch.android.datastore.impl.datasource
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
-import com.example.metasearch.core.datastore.api.datasource.DeviceIdDataSource
-import com.example.metasearch.datastore.impl.di.DeviceDatastore
+import com.metasearch.android.core.datastore.api.datasource.DeviceIdDataSource
+import com.metasearch.android.datastore.impl.di.DeviceDatastore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
diff --git a/core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/datasource/PersonIndexDataSourceImpl.kt b/core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/datasource/PersonIndexDataSourceImpl.kt
similarity index 82%
rename from core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/datasource/PersonIndexDataSourceImpl.kt
rename to core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/datasource/PersonIndexDataSourceImpl.kt
index 340f86b5..6d4321bb 100644
--- a/core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/datasource/PersonIndexDataSourceImpl.kt
+++ b/core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/datasource/PersonIndexDataSourceImpl.kt
@@ -1,11 +1,11 @@
-package com.example.metasearch.datastore.impl.datasource
+package com.metasearch.android.datastore.impl.datasource
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
-import com.example.metasearch.core.datastore.api.datasource.PersonIndexDataSource
-import com.example.metasearch.datastore.impl.di.DeviceDatastore
+import com.metasearch.android.core.datastore.api.datasource.PersonIndexDataSource
+import com.metasearch.android.datastore.impl.di.DeviceDatastore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
diff --git a/core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/di/DataSourceModule.kt b/core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/di/DataSourceModule.kt
similarity index 80%
rename from core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/di/DataSourceModule.kt
rename to core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/di/DataSourceModule.kt
index 87c02966..bdf0a223 100644
--- a/core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/di/DataSourceModule.kt
+++ b/core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/di/DataSourceModule.kt
@@ -1,13 +1,13 @@
-package com.example.metasearch.datastore.impl.di
+package com.metasearch.android.datastore.impl.di
 
 import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStore
-import com.example.metasearch.core.datastore.api.datasource.DeviceIdDataSource
-import com.example.metasearch.core.datastore.api.datasource.PersonIndexDataSource
-import com.example.metasearch.datastore.impl.datasource.DeviceIdDataSourceImpl
-import com.example.metasearch.datastore.impl.datasource.PersonIndexDataSourceImpl
+import com.metasearch.android.core.datastore.api.datasource.DeviceIdDataSource
+import com.metasearch.android.core.datastore.api.datasource.PersonIndexDataSource
+import com.metasearch.android.datastore.impl.datasource.DeviceIdDataSourceImpl
+import com.metasearch.android.datastore.impl.datasource.PersonIndexDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
diff --git a/core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/di/DataStoreQualifier.kt b/core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/di/DataStoreQualifier.kt
similarity index 68%
rename from core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/di/DataStoreQualifier.kt
rename to core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/di/DataStoreQualifier.kt
index ea188981..d6a758b2 100644
--- a/core/datastore/impl/src/main/java/com/example/metasearch/datastore/impl/di/DataStoreQualifier.kt
+++ b/core/datastore/impl/src/main/java/com/metasearch/android/datastore/impl/di/DataStoreQualifier.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.datastore.impl.di
+package com.metasearch.android.datastore.impl.di
 
 import javax.inject.Qualifier
 
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
index 6b1a7f82..eb68f95d 100644
--- a/core/designsystem/build.gradle.kts
+++ b/core/designsystem/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.core.designsystem"
+    namespace = "com.metasearch.android.core.designsystem"
 }
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/annotation/ComponentPreview.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/annotation/ComponentPreview.kt
similarity index 81%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/annotation/ComponentPreview.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/annotation/ComponentPreview.kt
index b01c12b9..88441a69 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/annotation/ComponentPreview.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/annotation/ComponentPreview.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.annotation
+package com.metasearch.android.core.designsystem.annotation
 
 import android.content.res.Configuration
 import androidx.compose.ui.tooling.preview.Preview
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/annotation/DevicePreview.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/annotation/DevicePreview.kt
similarity index 84%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/annotation/DevicePreview.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/annotation/DevicePreview.kt
index a633a088..d49d5090 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/annotation/DevicePreview.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/annotation/DevicePreview.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.annotation
+package com.metasearch.android.core.designsystem.annotation
 
 import android.content.res.Configuration
 import androidx.compose.ui.tooling.preview.Preview
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/component/MetaSearchButton.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/component/MetaSearchButton.kt
similarity index 83%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/component/MetaSearchButton.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/component/MetaSearchButton.kt
index 23def9ae..039301c2 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/component/MetaSearchButton.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/component/MetaSearchButton.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.component
+package com.metasearch.android.core.designsystem.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -14,9 +14,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Pink
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Pink
 
 @Composable
 fun MetaSearchButton(
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/component/MetaSearchTextField.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/component/MetaSearchTextField.kt
similarity index 78%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/component/MetaSearchTextField.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/component/MetaSearchTextField.kt
index 3cf8e25f..db0850c8 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/component/MetaSearchTextField.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/component/MetaSearchTextField.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.component
+package com.metasearch.android.core.designsystem.component
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
@@ -7,10 +7,10 @@ import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.LightPink
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Rose
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.LightPink
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Rose
 
 @Composable
 fun MetaSearchTextField(
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/component/MetaSearchToast.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/component/MetaSearchToast.kt
similarity index 87%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/component/MetaSearchToast.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/component/MetaSearchToast.kt
index 8276dd49..c40cf6a2 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/component/MetaSearchToast.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/component/MetaSearchToast.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.component
+package com.metasearch.android.core.designsystem.component
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
@@ -15,9 +15,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.LightPink
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.LightPink
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
 
 @Composable
 fun MetaSearchToast(
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Border.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Border.kt
similarity index 81%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Border.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Border.kt
index 85ff65ca..92460324 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Border.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Border.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.theme
+package com.metasearch.android.core.designsystem.theme
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.unit.Dp
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Color.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Color.kt
similarity index 91%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Color.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Color.kt
index a3193d31..915b0022 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Color.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Color.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.theme
+package com.metasearch.android.core.designsystem.theme
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Radius.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Radius.kt
similarity index 83%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Radius.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Radius.kt
index 658378ca..add799ec 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Radius.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Radius.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.theme
+package com.metasearch.android.core.designsystem.theme
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.unit.Dp
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Spacing.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Spacing.kt
similarity index 87%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Spacing.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Spacing.kt
index de6bf458..1d86fb0b 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Spacing.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Spacing.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.theme
+package com.metasearch.android.core.designsystem.theme
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.unit.Dp
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Theme.kt
similarity index 93%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Theme.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Theme.kt
index d6b79204..6a66f55c 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Theme.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Theme.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.theme
+package com.metasearch.android.core.designsystem.theme
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
diff --git a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Typography.kt b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Typography.kt
similarity index 93%
rename from core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Typography.kt
rename to core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Typography.kt
index f2043cc3..06e8f62e 100644
--- a/core/designsystem/src/main/java/com/example/metasearch/core/designsystem/theme/Typography.kt
+++ b/core/designsystem/src/main/java/com/metasearch/android/core/designsystem/theme/Typography.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.designsystem.theme
+package com.metasearch.android.core.designsystem.theme
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.TextStyle
@@ -8,7 +8,7 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.LineHeightStyle
 import androidx.compose.ui.unit.sp
-import com.example.metasearch.core.designsystem.R
+import com.metasearch.android.core.designsystem.R
 
 val fontFamily =
     FontFamily(
diff --git a/core/model/src/main/java/com/example/metasearch/core/model/CircleModel.kt b/core/model/src/main/java/com/metasearch/android/core/model/CircleModel.kt
similarity index 73%
rename from core/model/src/main/java/com/example/metasearch/core/model/CircleModel.kt
rename to core/model/src/main/java/com/metasearch/android/core/model/CircleModel.kt
index a72c35c1..a650624c 100644
--- a/core/model/src/main/java/com/example/metasearch/core/model/CircleModel.kt
+++ b/core/model/src/main/java/com/metasearch/android/core/model/CircleModel.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.model
+package com.metasearch.android.core.model
 
 import androidx.compose.runtime.Stable
 
diff --git a/core/model/src/main/java/com/example/metasearch/core/model/GalleryImageModel.kt b/core/model/src/main/java/com/metasearch/android/core/model/GalleryImageModel.kt
similarity index 76%
rename from core/model/src/main/java/com/example/metasearch/core/model/GalleryImageModel.kt
rename to core/model/src/main/java/com/metasearch/android/core/model/GalleryImageModel.kt
index 8677ca14..392c373a 100644
--- a/core/model/src/main/java/com/example/metasearch/core/model/GalleryImageModel.kt
+++ b/core/model/src/main/java/com/metasearch/android/core/model/GalleryImageModel.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.model
+package com.metasearch.android.core.model
 
 import androidx.compose.runtime.Stable
 
diff --git a/core/model/src/main/java/com/example/metasearch/core/model/PersonModel.kt b/core/model/src/main/java/com/metasearch/android/core/model/PersonModel.kt
similarity index 93%
rename from core/model/src/main/java/com/example/metasearch/core/model/PersonModel.kt
rename to core/model/src/main/java/com/metasearch/android/core/model/PersonModel.kt
index b1eb0813..87a6e5dd 100644
--- a/core/model/src/main/java/com/example/metasearch/core/model/PersonModel.kt
+++ b/core/model/src/main/java/com/metasearch/android/core/model/PersonModel.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.model
+package com.metasearch.android.core.model
 
 import androidx.compose.runtime.Stable
 
diff --git a/core/model/src/main/java/com/example/metasearch/core/model/SearchResult.kt b/core/model/src/main/java/com/metasearch/android/core/model/SearchResult.kt
similarity index 82%
rename from core/model/src/main/java/com/example/metasearch/core/model/SearchResult.kt
rename to core/model/src/main/java/com/metasearch/android/core/model/SearchResult.kt
index 8201f498..482603e0 100644
--- a/core/model/src/main/java/com/example/metasearch/core/model/SearchResult.kt
+++ b/core/model/src/main/java/com/metasearch/android/core/model/SearchResult.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.model
+package com.metasearch.android.core.model
 
 import androidx.compose.runtime.Stable
 
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
index 24c7cb58..d8330260 100644
--- a/core/network/build.gradle.kts
+++ b/core/network/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.core.network"
+    namespace = "com.metasearch.android.core.network"
 
     buildFeatures {
         buildConfig = true
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/di/NetworkModule.kt b/core/network/src/main/java/com/metasearch/android/core/network/di/NetworkModule.kt
similarity index 91%
rename from core/network/src/main/java/com/example/metasearch/core/network/di/NetworkModule.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/di/NetworkModule.kt
index 347441b1..a0369c8b 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/di/NetworkModule.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/di/NetworkModule.kt
@@ -1,9 +1,9 @@
-package com.example.metasearch.core.network.di
+package com.metasearch.android.core.network.di
 
-import com.example.metasearch.core.network.BuildConfig
-import com.example.metasearch.core.network.service.AIService
-import com.example.metasearch.core.network.service.OpenAIService
-import com.example.metasearch.core.network.service.WebService
+import com.metasearch.android.core.network.BuildConfig
+import com.metasearch.android.core.network.service.AIService
+import com.metasearch.android.core.network.service.OpenAIService
+import com.metasearch.android.core.network.service.WebService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/request/ChangeNameRequest.kt b/core/network/src/main/java/com/metasearch/android/core/network/request/ChangeNameRequest.kt
similarity index 72%
rename from core/network/src/main/java/com/example/metasearch/core/network/request/ChangeNameRequest.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/request/ChangeNameRequest.kt
index a14c13b1..92618b0e 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/request/ChangeNameRequest.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/request/ChangeNameRequest.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.request
+package com.metasearch.android.core.network.request
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/request/DeleteEntityRequest.kt b/core/network/src/main/java/com/metasearch/android/core/network/request/DeleteEntityRequest.kt
similarity index 70%
rename from core/network/src/main/java/com/example/metasearch/core/network/request/DeleteEntityRequest.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/request/DeleteEntityRequest.kt
index 9cba1747..33b87c5c 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/request/DeleteEntityRequest.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/request/DeleteEntityRequest.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.request
+package com.metasearch.android.core.network.request
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/request/DeleteImageRequest.kt b/core/network/src/main/java/com/metasearch/android/core/network/request/DeleteImageRequest.kt
similarity index 70%
rename from core/network/src/main/java/com/example/metasearch/core/network/request/DeleteImageRequest.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/request/DeleteImageRequest.kt
index 4384b157..85c4933e 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/request/DeleteImageRequest.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/request/DeleteImageRequest.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.request
+package com.metasearch.android.core.network.request
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/request/DetectedObjectsRequest.kt b/core/network/src/main/java/com/metasearch/android/core/network/request/DetectedObjectsRequest.kt
similarity index 71%
rename from core/network/src/main/java/com/example/metasearch/core/network/request/DetectedObjectsRequest.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/request/DetectedObjectsRequest.kt
index c1681668..5d444563 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/request/DetectedObjectsRequest.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/request/DetectedObjectsRequest.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.request
+package com.metasearch.android.core.network.request
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/request/FocusingSearchRequest.kt b/core/network/src/main/java/com/metasearch/android/core/network/request/FocusingSearchRequest.kt
similarity index 77%
rename from core/network/src/main/java/com/example/metasearch/core/network/request/FocusingSearchRequest.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/request/FocusingSearchRequest.kt
index a630619e..a52602cd 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/request/FocusingSearchRequest.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/request/FocusingSearchRequest.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.request
+package com.metasearch.android.core.network.request
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/request/NLQueryRequest.kt b/core/network/src/main/java/com/metasearch/android/core/network/request/NLQueryRequest.kt
similarity index 68%
rename from core/network/src/main/java/com/example/metasearch/core/network/request/NLQueryRequest.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/request/NLQueryRequest.kt
index 8b18863e..4a1d077f 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/request/NLQueryRequest.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/request/NLQueryRequest.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.request
+package com.metasearch.android.core.network.request
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/request/OpenAIRequest.kt b/core/network/src/main/java/com/metasearch/android/core/network/request/OpenAIRequest.kt
similarity index 78%
rename from core/network/src/main/java/com/example/metasearch/core/network/request/OpenAIRequest.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/request/OpenAIRequest.kt
index f513d050..f1a1405e 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/request/OpenAIRequest.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/request/OpenAIRequest.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.request
+package com.metasearch.android.core.network.request
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/request/PersonFrequencyRequest.kt b/core/network/src/main/java/com/metasearch/android/core/network/request/PersonFrequencyRequest.kt
similarity index 71%
rename from core/network/src/main/java/com/example/metasearch/core/network/request/PersonFrequencyRequest.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/request/PersonFrequencyRequest.kt
index f3304ad7..669b22fc 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/request/PersonFrequencyRequest.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/request/PersonFrequencyRequest.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.request
+package com.metasearch.android.core.network.request
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/request/PersonSearchRequest.kt b/core/network/src/main/java/com/metasearch/android/core/network/request/PersonSearchRequest.kt
similarity index 70%
rename from core/network/src/main/java/com/example/metasearch/core/network/request/PersonSearchRequest.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/request/PersonSearchRequest.kt
index 444f0789..27af38fc 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/request/PersonSearchRequest.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/request/PersonSearchRequest.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.request
+package com.metasearch.android.core.network.request
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/ChangeNameResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/ChangeNameResponse.kt
similarity index 65%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/ChangeNameResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/ChangeNameResponse.kt
index f60b077c..46670bdf 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/ChangeNameResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/ChangeNameResponse.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/CircleDetectionResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/CircleDetectionResponse.kt
similarity index 78%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/CircleDetectionResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/CircleDetectionResponse.kt
index 6df13f71..6d560abe 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/CircleDetectionResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/CircleDetectionResponse.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/CommonResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/CommonResponse.kt
similarity index 70%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/CommonResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/CommonResponse.kt
index c88a18b7..5df10299 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/CommonResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/CommonResponse.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/DeleteEntityResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/DeleteEntityResponse.kt
similarity index 65%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/DeleteEntityResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/DeleteEntityResponse.kt
index 4d1ed591..72525834 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/DeleteEntityResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/DeleteEntityResponse.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/OpenAIResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/OpenAIResponse.kt
similarity index 60%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/OpenAIResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/OpenAIResponse.kt
index 2b760f70..29c6c770 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/OpenAIResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/OpenAIResponse.kt
@@ -1,6 +1,6 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
-import com.example.metasearch.core.network.request.OpenAIMessage
+import com.metasearch.android.core.network.request.OpenAIMessage
 import kotlinx.serialization.Serializable
 
 @Serializable
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/PersonFrequencyResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/PersonFrequencyResponse.kt
similarity index 83%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/PersonFrequencyResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/PersonFrequencyResponse.kt
index 788ae100..e9e1939c 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/PersonFrequencyResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/PersonFrequencyResponse.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/PhotoNameResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/PhotoNameResponse.kt
similarity index 75%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/PhotoNameResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/PhotoNameResponse.kt
index b2c44426..4114dfb4 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/PhotoNameResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/PhotoNameResponse.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/PhotoResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/PhotoResponse.kt
similarity index 83%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/PhotoResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/PhotoResponse.kt
index 7faa16df..1ef79a58 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/PhotoResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/PhotoResponse.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/TripleResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/TripleResponse.kt
similarity index 64%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/TripleResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/TripleResponse.kt
index 68f9fe66..72c20873 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/TripleResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/TripleResponse.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/response/UploadResponse.kt b/core/network/src/main/java/com/metasearch/android/core/network/response/UploadResponse.kt
similarity index 80%
rename from core/network/src/main/java/com/example/metasearch/core/network/response/UploadResponse.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/response/UploadResponse.kt
index c3263c2e..216766da 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/response/UploadResponse.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/response/UploadResponse.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.network.response
+package com.metasearch.android.core.network.response
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/service/AIService.kt b/core/network/src/main/java/com/metasearch/android/core/network/service/AIService.kt
similarity index 81%
rename from core/network/src/main/java/com/example/metasearch/core/network/service/AIService.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/service/AIService.kt
index 79fdfa21..1455479c 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/service/AIService.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/service/AIService.kt
@@ -1,9 +1,9 @@
-package com.example.metasearch.core.network.service
+package com.metasearch.android.core.network.service
 
-import com.example.metasearch.core.network.request.FocusingSearchRequest
-import com.example.metasearch.core.network.response.CircleDetectionResponse
-import com.example.metasearch.core.network.response.CommonResponse
-import com.example.metasearch.core.network.response.UploadResponse
+import com.metasearch.android.core.network.request.FocusingSearchRequest
+import com.metasearch.android.core.network.response.CircleDetectionResponse
+import com.metasearch.android.core.network.response.CommonResponse
+import com.metasearch.android.core.network.response.UploadResponse
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.http.Multipart
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/service/OpenAIService.kt b/core/network/src/main/java/com/metasearch/android/core/network/service/OpenAIService.kt
similarity index 54%
rename from core/network/src/main/java/com/example/metasearch/core/network/service/OpenAIService.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/service/OpenAIService.kt
index a3458e16..f9d1e39f 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/service/OpenAIService.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/service/OpenAIService.kt
@@ -1,7 +1,7 @@
-package com.example.metasearch.core.network.service
+package com.metasearch.android.core.network.service
 
-import com.example.metasearch.core.network.request.OpenAIRequest
-import com.example.metasearch.core.network.response.OpenAIResponse
+import com.metasearch.android.core.network.request.OpenAIRequest
+import com.metasearch.android.core.network.response.OpenAIResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
 
diff --git a/core/network/src/main/java/com/example/metasearch/core/network/service/WebService.kt b/core/network/src/main/java/com/metasearch/android/core/network/service/WebService.kt
similarity index 62%
rename from core/network/src/main/java/com/example/metasearch/core/network/service/WebService.kt
rename to core/network/src/main/java/com/metasearch/android/core/network/service/WebService.kt
index 014f0f9a..f630f14b 100644
--- a/core/network/src/main/java/com/example/metasearch/core/network/service/WebService.kt
+++ b/core/network/src/main/java/com/metasearch/android/core/network/service/WebService.kt
@@ -1,18 +1,18 @@
-package com.example.metasearch.core.network.service
+package com.metasearch.android.core.network.service
 
-import com.example.metasearch.core.network.request.ChangeNameRequest
-import com.example.metasearch.core.network.request.DeleteEntityRequest
-import com.example.metasearch.core.network.request.DeleteImageRequest
-import com.example.metasearch.core.network.request.DetectedObjectsRequest
-import com.example.metasearch.core.network.request.NLQueryRequest
-import com.example.metasearch.core.network.request.PersonFrequencyRequest
-import com.example.metasearch.core.network.request.PersonSearchRequest
-import com.example.metasearch.core.network.response.ChangeNameResponse
-import com.example.metasearch.core.network.response.DeleteEntityResponse
-import com.example.metasearch.core.network.response.PersonFrequencyResponse
-import com.example.metasearch.core.network.response.PhotoNameResponse
-import com.example.metasearch.core.network.response.PhotoResponse
-import com.example.metasearch.core.network.response.TripleResponse
+import com.metasearch.android.core.network.request.ChangeNameRequest
+import com.metasearch.android.core.network.request.DeleteEntityRequest
+import com.metasearch.android.core.network.request.DeleteImageRequest
+import com.metasearch.android.core.network.request.DetectedObjectsRequest
+import com.metasearch.android.core.network.request.NLQueryRequest
+import com.metasearch.android.core.network.request.PersonFrequencyRequest
+import com.metasearch.android.core.network.request.PersonSearchRequest
+import com.metasearch.android.core.network.response.ChangeNameResponse
+import com.metasearch.android.core.network.response.DeleteEntityResponse
+import com.metasearch.android.core.network.response.PersonFrequencyResponse
+import com.metasearch.android.core.network.response.PhotoNameResponse
+import com.metasearch.android.core.network.response.PhotoResponse
+import com.metasearch.android.core.network.response.TripleResponse
 import okhttp3.MultipartBody
 import retrofit2.http.Body
 import retrofit2.http.GET
diff --git a/core/notification/build.gradle.kts b/core/notification/build.gradle.kts
index a9ce1098..411223a0 100644
--- a/core/notification/build.gradle.kts
+++ b/core/notification/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.core.notification"
+    namespace = "com.metasearch.android.core.notification"
 }
diff --git a/core/notification/src/main/java/com/example/metasearch/core/notification/di/NotificationModule.kt b/core/notification/src/main/java/com/metasearch/android/core/notification/di/NotificationModule.kt
similarity index 78%
rename from core/notification/src/main/java/com/example/metasearch/core/notification/di/NotificationModule.kt
rename to core/notification/src/main/java/com/metasearch/android/core/notification/di/NotificationModule.kt
index 326ca1e7..849ffefb 100644
--- a/core/notification/src/main/java/com/example/metasearch/core/notification/di/NotificationModule.kt
+++ b/core/notification/src/main/java/com/metasearch/android/core/notification/di/NotificationModule.kt
@@ -1,7 +1,7 @@
-package com.example.metasearch.core.notification.di
+package com.metasearch.android.core.notification.di
 
 import android.content.Context
-import com.example.metasearch.core.notification.notifier.AnalysisNotifier
+import com.metasearch.android.core.notification.notifier.AnalysisNotifier
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/core/notification/src/main/java/com/example/metasearch/core/notification/notifier/AnalysisNotifier.kt b/core/notification/src/main/java/com/metasearch/android/core/notification/notifier/AnalysisNotifier.kt
similarity index 87%
rename from core/notification/src/main/java/com/example/metasearch/core/notification/notifier/AnalysisNotifier.kt
rename to core/notification/src/main/java/com/metasearch/android/core/notification/notifier/AnalysisNotifier.kt
index 91c2c705..fad02b4c 100644
--- a/core/notification/src/main/java/com/example/metasearch/core/notification/notifier/AnalysisNotifier.kt
+++ b/core/notification/src/main/java/com/metasearch/android/core/notification/notifier/AnalysisNotifier.kt
@@ -1,5 +1,6 @@
-package com.example.metasearch.core.notification.notifier
+package com.metasearch.android.core.notification.notifier
 
+import android.R
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
@@ -31,7 +32,7 @@ class AnalysisNotifier @Inject constructor(
 
     fun notifyComplete() {
         val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(android.R.drawable.ic_dialog_info)
+            .setSmallIcon(R.drawable.ic_dialog_info)
             .setContentTitle("갤러리 이미지 분석 완료")
             .setContentText("갤러리 탐색을 시작할 수 있어요.")
             .setAutoCancel(true)
diff --git a/core/room/api/build.gradle.kts b/core/room/api/build.gradle.kts
index 564ed82c..c53ba379 100644
--- a/core/room/api/build.gradle.kts
+++ b/core/room/api/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.core.room.api"
+    namespace = "com.metasearch.android.core.room.api"
 }
 
 dependencies {
diff --git a/core/room/api/src/main/java/com/example/metasearch/core/room/api/dao/AnalyzedImageDao.kt b/core/room/api/src/main/java/com/metasearch/android/core/room/api/dao/AnalyzedImageDao.kt
similarity index 86%
rename from core/room/api/src/main/java/com/example/metasearch/core/room/api/dao/AnalyzedImageDao.kt
rename to core/room/api/src/main/java/com/metasearch/android/core/room/api/dao/AnalyzedImageDao.kt
index e647d9fe..33090fc6 100644
--- a/core/room/api/src/main/java/com/example/metasearch/core/room/api/dao/AnalyzedImageDao.kt
+++ b/core/room/api/src/main/java/com/metasearch/android/core/room/api/dao/AnalyzedImageDao.kt
@@ -1,11 +1,11 @@
-package com.example.metasearch.core.room.api.dao
+package com.metasearch.android.core.room.api.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
-import com.example.metasearch.core.room.api.entity.AnalyzedImageEntity
+import com.metasearch.android.core.room.api.entity.AnalyzedImageEntity
 
 @Dao
 interface AnalyzedImageDao {
diff --git a/core/room/api/src/main/java/com/example/metasearch/core/room/api/dao/PersonDao.kt b/core/room/api/src/main/java/com/metasearch/android/core/room/api/dao/PersonDao.kt
similarity index 92%
rename from core/room/api/src/main/java/com/example/metasearch/core/room/api/dao/PersonDao.kt
rename to core/room/api/src/main/java/com/metasearch/android/core/room/api/dao/PersonDao.kt
index 62a1c589..0b74b167 100644
--- a/core/room/api/src/main/java/com/example/metasearch/core/room/api/dao/PersonDao.kt
+++ b/core/room/api/src/main/java/com/metasearch/android/core/room/api/dao/PersonDao.kt
@@ -1,12 +1,12 @@
-package com.example.metasearch.core.room.api.dao
+package com.metasearch.android.core.room.api.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Transaction
-import com.example.metasearch.core.room.api.entity.FaceEntity
-import com.example.metasearch.core.room.api.entity.PersonEntity
-import com.example.metasearch.core.room.api.relations.PersonWithFaces
+import com.metasearch.android.core.room.api.entity.FaceEntity
+import com.metasearch.android.core.room.api.entity.PersonEntity
+import com.metasearch.android.core.room.api.relations.PersonWithFaces
 import kotlinx.coroutines.flow.Flow
 
 data class NameMapping(
diff --git a/core/room/api/src/main/java/com/example/metasearch/core/room/api/entity/AnalyzedImageEntity.kt b/core/room/api/src/main/java/com/metasearch/android/core/room/api/entity/AnalyzedImageEntity.kt
similarity index 84%
rename from core/room/api/src/main/java/com/example/metasearch/core/room/api/entity/AnalyzedImageEntity.kt
rename to core/room/api/src/main/java/com/metasearch/android/core/room/api/entity/AnalyzedImageEntity.kt
index 95e74ee9..df4c3fe5 100644
--- a/core/room/api/src/main/java/com/example/metasearch/core/room/api/entity/AnalyzedImageEntity.kt
+++ b/core/room/api/src/main/java/com/metasearch/android/core/room/api/entity/AnalyzedImageEntity.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.room.api.entity
+package com.metasearch.android.core.room.api.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/core/room/api/src/main/java/com/example/metasearch/core/room/api/entity/FaceEntity.kt b/core/room/api/src/main/java/com/metasearch/android/core/room/api/entity/FaceEntity.kt
similarity index 92%
rename from core/room/api/src/main/java/com/example/metasearch/core/room/api/entity/FaceEntity.kt
rename to core/room/api/src/main/java/com/metasearch/android/core/room/api/entity/FaceEntity.kt
index 1a7152a0..c06a7906 100644
--- a/core/room/api/src/main/java/com/example/metasearch/core/room/api/entity/FaceEntity.kt
+++ b/core/room/api/src/main/java/com/metasearch/android/core/room/api/entity/FaceEntity.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.room.api.entity
+package com.metasearch.android.core.room.api.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/core/room/api/src/main/java/com/example/metasearch/core/room/api/entity/PersonEntity.kt b/core/room/api/src/main/java/com/metasearch/android/core/room/api/entity/PersonEntity.kt
similarity index 88%
rename from core/room/api/src/main/java/com/example/metasearch/core/room/api/entity/PersonEntity.kt
rename to core/room/api/src/main/java/com/metasearch/android/core/room/api/entity/PersonEntity.kt
index ecac2568..9f710788 100644
--- a/core/room/api/src/main/java/com/example/metasearch/core/room/api/entity/PersonEntity.kt
+++ b/core/room/api/src/main/java/com/metasearch/android/core/room/api/entity/PersonEntity.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.room.api.entity
+package com.metasearch.android.core.room.api.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/core/room/api/src/main/java/com/example/metasearch/core/room/api/relations/PersonWithFaces.kt b/core/room/api/src/main/java/com/metasearch/android/core/room/api/relations/PersonWithFaces.kt
similarity index 56%
rename from core/room/api/src/main/java/com/example/metasearch/core/room/api/relations/PersonWithFaces.kt
rename to core/room/api/src/main/java/com/metasearch/android/core/room/api/relations/PersonWithFaces.kt
index f591e5c1..aaed3bfd 100644
--- a/core/room/api/src/main/java/com/example/metasearch/core/room/api/relations/PersonWithFaces.kt
+++ b/core/room/api/src/main/java/com/metasearch/android/core/room/api/relations/PersonWithFaces.kt
@@ -1,9 +1,9 @@
-package com.example.metasearch.core.room.api.relations
+package com.metasearch.android.core.room.api.relations
 
 import androidx.room.Embedded
 import androidx.room.Relation
-import com.example.metasearch.core.room.api.entity.FaceEntity
-import com.example.metasearch.core.room.api.entity.PersonEntity
+import com.metasearch.android.core.room.api.entity.FaceEntity
+import com.metasearch.android.core.room.api.entity.PersonEntity
 
 data class PersonWithFaces(
     @Embedded
diff --git a/core/room/impl/build.gradle.kts b/core/room/impl/build.gradle.kts
index 207a11ce..61031236 100644
--- a/core/room/impl/build.gradle.kts
+++ b/core/room/impl/build.gradle.kts
@@ -1,12 +1,10 @@
-import com.example.metasearch.convention.ksp
-
 plugins {
     alias(libs.plugins.metasearch.android.library)
     alias(libs.plugins.metasearch.android.hilt)
 }
 
 android {
-    namespace = "com.example.metasearch.core.room.impl"
+    namespace = "com.metasearch.android.core.room.impl"
 
     defaultConfig {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/core/room/impl/src/androidTest/java/com/example/metasearch/core/room/impl/PersonDaoTest.kt b/core/room/impl/src/androidTest/java/com/example/metasearch/core/room/impl/PersonDaoTest.kt
deleted file mode 100644
index 3a0afe6e..00000000
--- a/core/room/impl/src/androidTest/java/com/example/metasearch/core/room/impl/PersonDaoTest.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.example.metasearch.core.room.impl
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.example.metasearch.core.room.api.dao.PersonDao
-import com.example.metasearch.core.room.api.entity.FaceEntity
-import com.example.metasearch.core.room.api.entity.PersonEntity
-import com.example.metasearch.core.room.impl.database.AppDatabase
-import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.io.IOException
-import kotlin.jvm.java
-
-private val TEST_PERSON_ENTITY = PersonEntity(
-    inputName = "홍길동",
-    phoneNumber = "010-1234-5678",
-    isHomeDisplay = true,
-)
-
-private val TEST_FACE_ENTITY = FaceEntity(
-    personId = 1L,
-    imageName = "face_1.jpg",
-    imageData = byteArrayOf(0x01, 0x02, 0x03),
-    thumbnailData = byteArrayOf(0x04),
-    phoneNumber = "",
-)
-
-private val TEST_FACE_ENTITY_2 = FaceEntity(
-    personId = 1L,
-    imageName = "face_2.jpg",
-    imageData = byteArrayOf(0x05, 0x06),
-    thumbnailData = byteArrayOf(0x07),
-    phoneNumber = "",
-)
-
-@RunWith(AndroidJUnit4::class)
-class PersonDaoTest {
-    private lateinit var db: AppDatabase
-    private lateinit var personDao: PersonDao
-
-    @Before
-    fun createDb() {
-        db = Room.inMemoryDatabaseBuilder(
-            ApplicationProvider.getApplicationContext(),
-            AppDatabase::class.java,
-        )
-            .allowMainThreadQueries() // 테스트에서는 메인 스레드 쿼리를 허용하여 runBlocking과 함께 사용
-            .build()
-        personDao = db.personDao()
-    }
-
-    @After
-    @Throws(IOException::class)
-    fun closeDb() {
-        db.close()
-    }
-
-    @Test
-    fun insertAndReadPerson() = runBlocking {
-        val personId = personDao.insertPerson(TEST_PERSON_ENTITY)
-
-        val faceEntity1 = TEST_FACE_ENTITY.copy(personId = personId)
-        val faceEntity2 = TEST_FACE_ENTITY_2.copy(personId = personId)
-        personDao.insertFace(faceEntity1)
-        personDao.insertFace(faceEntity2)
-
-        // PersonWithFaces 관계를 통해 데이터 조회
-        val loadedPersonWithFaces = personDao.getPersonWithFacesById(personId)
-
-        assertThat(loadedPersonWithFaces).isNotNull()
-        assertThat(loadedPersonWithFaces?.person?.inputName).isEqualTo("홍길동")
-        assertThat(loadedPersonWithFaces?.faces).hasSize(2)
-        assertThat(loadedPersonWithFaces?.faces?.first()?.imageName).isEqualTo("face_1.jpg")
-    }
-
-    @Test
-    fun deletePerson_shouldRemoveAllAssociatedFaces() = runBlocking {
-        val personId = personDao.insertPerson(TEST_PERSON_ENTITY)
-        val faceEntity1 = TEST_FACE_ENTITY.copy(personId = personId)
-        personDao.insertFace(faceEntity1)
-
-        // 삭제 전 확인
-        assertThat(personDao.getPersonWithFacesById(personId)).isNotNull()
-
-        // Person 삭제
-        personDao.deletePersonByInputName(TEST_PERSON_ENTITY.inputName)
-
-        // 삭제 후 검증
-        assertThat(personDao.getPersonWithFacesById(personId)).isNull()
-    }
-
-    @Test
-    fun updatePersonInfoByName_updatesAllRecords() = runBlocking {
-        val personId1 = personDao.insertPerson(TEST_PERSON_ENTITY)
-        val personId2 = personDao.insertPerson(TEST_PERSON_ENTITY.copy(id = 0, inputName = "이름2")) // 다른 레코드 삽입
-
-        val rowsAffected = personDao.updatePersonInfoByName(
-            oldName = "홍길동",
-            newName = "김철수",
-            newPhoneNumber = "010-9999-8888",
-            homeDisplay = false,
-        )
-
-        // 1개 이상의 행이 업데이트되었는지 검증
-        assertThat(rowsAffected).isGreaterThan(0)
-
-        val updatedPerson = personDao.getPersonWithFacesByInputName("김철수")
-        assertThat(updatedPerson?.person?.phoneNumber).isEqualTo("010-9999-8888")
-        assertThat(updatedPerson?.person?.isHomeDisplay).isFalse()
-        assertThat(personDao.getPersonWithFacesByInputName("홍길동")).isNull() // 이름이 바뀌었으므로 이전 이름으로는 조회되면 안됨
-    }
-
-    @Test
-    fun getPersonsWithFaces_emitsFlow() = runBlocking {
-        personDao.insertPerson(TEST_PERSON_ENTITY)
-
-        // Flow 수집 및 검증
-        val persons = personDao.getPersonsWithFaces().first()
-
-        assertThat(persons).hasSize(1)
-        assertThat(persons.first().person.inputName).isEqualTo("홍길동")
-    }
-}
diff --git a/core/room/impl/src/main/java/com/example/metasearch/core/room/impl/database/AppDatabase.kt b/core/room/impl/src/main/java/com/metasearch/android/core/room/impl/database/AppDatabase.kt
similarity index 71%
rename from core/room/impl/src/main/java/com/example/metasearch/core/room/impl/database/AppDatabase.kt
rename to core/room/impl/src/main/java/com/metasearch/android/core/room/impl/database/AppDatabase.kt
index b1f91555..8bb8f8a0 100644
--- a/core/room/impl/src/main/java/com/example/metasearch/core/room/impl/database/AppDatabase.kt
+++ b/core/room/impl/src/main/java/com/metasearch/android/core/room/impl/database/AppDatabase.kt
@@ -1,14 +1,14 @@
-package com.example.metasearch.core.room.impl.database
+package com.metasearch.android.core.room.impl.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import com.example.metasearch.core.room.api.dao.AnalyzedImageDao
-import com.example.metasearch.core.room.api.dao.PersonDao
-import com.example.metasearch.core.room.api.entity.AnalyzedImageEntity
-import com.example.metasearch.core.room.api.entity.FaceEntity
-import com.example.metasearch.core.room.api.entity.PersonEntity
+import com.metasearch.android.core.room.api.dao.AnalyzedImageDao
+import com.metasearch.android.core.room.api.dao.PersonDao
+import com.metasearch.android.core.room.api.entity.AnalyzedImageEntity
+import com.metasearch.android.core.room.api.entity.FaceEntity
+import com.metasearch.android.core.room.api.entity.PersonEntity
 
 @Database(
     entities = [
diff --git a/core/room/impl/src/main/java/com/example/metasearch/core/room/impl/di/DatabaseModule.kt b/core/room/impl/src/main/java/com/metasearch/android/core/room/impl/di/DatabaseModule.kt
similarity index 79%
rename from core/room/impl/src/main/java/com/example/metasearch/core/room/impl/di/DatabaseModule.kt
rename to core/room/impl/src/main/java/com/metasearch/android/core/room/impl/di/DatabaseModule.kt
index 90c9323d..fa50ec49 100644
--- a/core/room/impl/src/main/java/com/example/metasearch/core/room/impl/di/DatabaseModule.kt
+++ b/core/room/impl/src/main/java/com/metasearch/android/core/room/impl/di/DatabaseModule.kt
@@ -1,10 +1,10 @@
-package com.example.metasearch.core.room.impl.di
+package com.metasearch.android.core.room.impl.di
 
 import android.content.Context
 import androidx.room.Room
-import com.example.metasearch.core.room.api.dao.AnalyzedImageDao
-import com.example.metasearch.core.room.api.dao.PersonDao
-import com.example.metasearch.core.room.impl.database.AppDatabase
+import com.metasearch.android.core.room.api.dao.AnalyzedImageDao
+import com.metasearch.android.core.room.api.dao.PersonDao
+import com.metasearch.android.core.room.impl.database.AppDatabase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index b42d68c7..4b70b15d 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.core.ui"
+    namespace = "com.metasearch.android.core.ui"
 }
 
 dependencies {
diff --git a/core/ui/src/main/java/com/example/metasearch/core/ui/MetaSearchScaffold.kt b/core/ui/src/main/java/com/metasearch/android/core/ui/MetaSearchScaffold.kt
similarity index 88%
rename from core/ui/src/main/java/com/example/metasearch/core/ui/MetaSearchScaffold.kt
rename to core/ui/src/main/java/com/metasearch/android/core/ui/MetaSearchScaffold.kt
index d85153d7..255ab034 100644
--- a/core/ui/src/main/java/com/example/metasearch/core/ui/MetaSearchScaffold.kt
+++ b/core/ui/src/main/java/com/metasearch/android/core/ui/MetaSearchScaffold.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.ui
+package com.metasearch.android.core.ui
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
@@ -7,7 +7,7 @@ import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.example.metasearch.core.designsystem.theme.Neutral50
+import com.metasearch.android.core.designsystem.theme.Neutral50
 
 @Composable
 fun MetaSearchScaffold(
diff --git a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchCircleImage.kt b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchCircleImage.kt
similarity index 77%
rename from core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchCircleImage.kt
rename to core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchCircleImage.kt
index 1658a37f..25baced8 100644
--- a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchCircleImage.kt
+++ b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchCircleImage.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.ui.component
+package com.metasearch.android.core.ui.component
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.size
@@ -11,10 +11,10 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import com.example.metasearch.core.common.extensions.clickableIfNotNull
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.LightGrey
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.common.extensions.clickableIfNotNull
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.LightGrey
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
 
 @Composable
 fun MetaSearchCircleImage(
diff --git a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchDialog.kt b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchDialog.kt
similarity index 86%
rename from core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchDialog.kt
rename to core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchDialog.kt
index 7783613c..d15e2077 100644
--- a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchDialog.kt
+++ b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchDialog.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.ui.component
+package com.metasearch.android.core.ui.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -18,13 +18,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.component.MetaSearchButton
-import com.example.metasearch.core.designsystem.theme.LightPink
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.core.designsystem.theme.Rose
-import com.example.metasearch.core.designsystem.theme.White
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.component.MetaSearchButton
+import com.metasearch.android.core.designsystem.theme.LightPink
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.core.designsystem.theme.Rose
+import com.metasearch.android.core.designsystem.theme.White
 
 @Composable
 fun MetaSearchDialog(
diff --git a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchDivider.kt b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchDivider.kt
similarity index 70%
rename from core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchDivider.kt
rename to core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchDivider.kt
index 180b56ba..1432e362 100644
--- a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchDivider.kt
+++ b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchDivider.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.ui.component
+package com.metasearch.android.core.ui.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Spacer
@@ -6,9 +6,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.LightGrey
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.LightGrey
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
 
 @Composable
 fun MetaSearchDivider(
diff --git a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchLoadingIndicator.kt b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchLoadingIndicator.kt
similarity index 72%
rename from core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchLoadingIndicator.kt
rename to core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchLoadingIndicator.kt
index 1c67ee7b..1b2f2223 100644
--- a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchLoadingIndicator.kt
+++ b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchLoadingIndicator.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.ui.component
+package com.metasearch.android.core.ui.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -8,10 +8,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.zIndex
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.Black
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral300
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.Black
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral300
 
 @Composable
 fun MetaSearchLoadingIndicator(
diff --git a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchSquareImage.kt b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchSquareImage.kt
similarity index 76%
rename from core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchSquareImage.kt
rename to core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchSquareImage.kt
index d1f97bf1..1f72dbbc 100644
--- a/core/ui/src/main/java/com/example/metasearch/core/ui/component/MetaSearchSquareImage.kt
+++ b/core/ui/src/main/java/com/metasearch/android/core/ui/component/MetaSearchSquareImage.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.core.ui.component
+package com.metasearch.android.core.ui.component
 
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.padding
@@ -7,9 +7,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import com.example.metasearch.core.common.extensions.clickableIfNotNull
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.common.extensions.clickableIfNotNull
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
 
 @Composable
 fun MetaSearchSquareImage(
diff --git a/feature/detail/build.gradle.kts b/feature/detail/build.gradle.kts
index 3cd83b1d..17f562bf 100644
--- a/feature/detail/build.gradle.kts
+++ b/feature/detail/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.feature.detail"
+    namespace = "com.metasearch.android.feature.detail"
 }
 
 ksp {
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/GraphDetailPresenter.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/GraphDetailPresenter.kt
similarity index 86%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/GraphDetailPresenter.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/GraphDetailPresenter.kt
index 7d5a148e..d5497c81 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/GraphDetailPresenter.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/GraphDetailPresenter.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.graph
+package com.metasearch.android.feature.detail.graph
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -7,10 +7,10 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
-import com.example.metasearch.core.data.api.repository.GraphRepository
-import com.example.metasearch.feature.detail.R
-import com.example.metasearch.feature.screens.GraphDetailScreen
-import com.example.metasearch.feature.screens.PhotoDetailScreen
+import com.metasearch.android.core.data.api.repository.GraphRepository
+import com.metasearch.android.feature.detail.R
+import com.metasearch.android.feature.screens.GraphDetailScreen
+import com.metasearch.android.feature.screens.PhotoDetailScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
@@ -18,6 +18,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.components.ActivityRetainedComponent
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 
 class GraphDetailPresenter @AssistedInject constructor(
@@ -50,7 +51,7 @@ class GraphDetailPresenter @AssistedInject constructor(
         fun handleEvent(event: GraphDetailUiEvent) {
             when (event) {
                 is GraphDetailUiEvent.OnPhotoSelected -> {
-                    val scope = kotlinx.coroutines.MainScope()
+                    val scope = MainScope()
                     scope.launch {
                         val uri = graphRepository.findMatchedUri(event.photoName)
                         if (uri != null) {
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/GraphDetailUi.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/GraphDetailUi.kt
similarity index 87%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/GraphDetailUi.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/GraphDetailUi.kt
index 0601766b..472fb028 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/GraphDetailUi.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/GraphDetailUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.graph
+package com.metasearch.android.feature.detail.graph
 
 import android.annotation.SuppressLint
 import android.webkit.JavascriptInterface
@@ -25,14 +25,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import coil3.compose.AsyncImage
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.core.ui.MetaSearchScaffold
-import com.example.metasearch.core.ui.component.MetaSearchDialog
-import com.example.metasearch.feature.detail.R
-import com.example.metasearch.feature.detail.graph.component.GraphDetailHeader
-import com.example.metasearch.feature.screens.GraphDetailScreen
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.core.ui.MetaSearchScaffold
+import com.metasearch.android.core.ui.component.MetaSearchDialog
+import com.metasearch.android.feature.detail.R
+import com.metasearch.android.feature.detail.graph.component.GraphDetailHeader
+import com.metasearch.android.feature.screens.GraphDetailScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/GraphDetailUiState.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/GraphDetailUiState.kt
similarity index 90%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/GraphDetailUiState.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/GraphDetailUiState.kt
index 4224cce1..3b3ad299 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/GraphDetailUiState.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/GraphDetailUiState.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.graph
+package com.metasearch.android.feature.detail.graph
 
 import com.slack.circuit.runtime.CircuitUiState
 
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/component/GraphDetailHeader.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/component/GraphDetailHeader.kt
similarity index 81%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/component/GraphDetailHeader.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/component/GraphDetailHeader.kt
index 628f76f5..7bfc342d 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/graph/component/GraphDetailHeader.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/graph/component/GraphDetailHeader.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.graph.component
+package com.metasearch.android.feature.detail.graph.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -15,11 +15,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.ui.component.MetaSearchDivider
-import com.example.metasearch.feature.detail.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.ui.component.MetaSearchDivider
+import com.metasearch.android.feature.detail.R
 
 @Composable
 fun GraphDetailHeader(
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/PersonDetailPresenter.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/PersonDetailPresenter.kt
similarity index 93%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/person/PersonDetailPresenter.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/person/PersonDetailPresenter.kt
index cf0d58a3..9ea9f256 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/PersonDetailPresenter.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/PersonDetailPresenter.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.person
+package com.metasearch.android.feature.detail.person
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -10,10 +10,10 @@ import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import com.example.metasearch.core.data.api.repository.GalleryRepository
-import com.example.metasearch.core.data.api.repository.PersonRepository
-import com.example.metasearch.feature.screens.PersonDetailScreen
-import com.example.metasearch.feature.screens.PhotoDetailScreen
+import com.metasearch.android.core.data.api.repository.GalleryRepository
+import com.metasearch.android.core.data.api.repository.PersonRepository
+import com.metasearch.android.feature.screens.PersonDetailScreen
+import com.metasearch.android.feature.screens.PhotoDetailScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.Navigator
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/PersonDetailUi.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/PersonDetailUi.kt
similarity index 87%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/person/PersonDetailUi.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/person/PersonDetailUi.kt
index ad123cc4..6ad94f67 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/PersonDetailUi.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/PersonDetailUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.person
+package com.metasearch.android.feature.detail.person
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -23,19 +23,19 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.core.model.PersonModel
-import com.example.metasearch.core.ui.MetaSearchScaffold
-import com.example.metasearch.core.ui.component.MetaSearchCircleImage
-import com.example.metasearch.core.ui.component.MetaSearchDialog
-import com.example.metasearch.core.ui.component.MetaSearchLoadingIndicator
-import com.example.metasearch.core.ui.component.MetaSearchSquareImage
-import com.example.metasearch.feature.detail.R
-import com.example.metasearch.feature.detail.person.component.PersonDetailHeader
-import com.example.metasearch.feature.detail.person.component.PersonEditDialogContent
-import com.example.metasearch.feature.screens.PersonDetailScreen
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.core.model.PersonModel
+import com.metasearch.android.core.ui.MetaSearchScaffold
+import com.metasearch.android.core.ui.component.MetaSearchCircleImage
+import com.metasearch.android.core.ui.component.MetaSearchDialog
+import com.metasearch.android.core.ui.component.MetaSearchLoadingIndicator
+import com.metasearch.android.core.ui.component.MetaSearchSquareImage
+import com.metasearch.android.feature.detail.R
+import com.metasearch.android.feature.detail.person.component.PersonDetailHeader
+import com.metasearch.android.feature.detail.person.component.PersonEditDialogContent
+import com.metasearch.android.feature.screens.PersonDetailScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/PersonDetailUiState.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/PersonDetailUiState.kt
similarity index 92%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/person/PersonDetailUiState.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/person/PersonDetailUiState.kt
index bfa58af9..71817e79 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/PersonDetailUiState.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/PersonDetailUiState.kt
@@ -1,7 +1,7 @@
-package com.example.metasearch.feature.detail.person
+package com.metasearch.android.feature.detail.person
 
 import android.net.Uri
-import com.example.metasearch.core.model.PersonModel
+import com.metasearch.android.core.model.PersonModel
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/component/PersonDetailHeader.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/component/PersonDetailHeader.kt
similarity index 82%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/person/component/PersonDetailHeader.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/person/component/PersonDetailHeader.kt
index 156dd839..aa3e7cf0 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/component/PersonDetailHeader.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/component/PersonDetailHeader.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.person.component
+package com.metasearch.android.feature.detail.person.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -14,11 +14,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.ui.component.MetaSearchDivider
-import com.example.metasearch.feature.detail.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.ui.component.MetaSearchDivider
+import com.metasearch.android.feature.detail.R
 
 @Composable
 fun PersonDetailHeader(
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/component/PersonEditDialogContent.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/component/PersonEditDialogContent.kt
similarity index 86%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/person/component/PersonEditDialogContent.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/person/component/PersonEditDialogContent.kt
index d6fa342a..fd670ed7 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/person/component/PersonEditDialogContent.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/person/component/PersonEditDialogContent.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.person.component
+package com.metasearch.android.feature.detail.person.component
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -16,11 +16,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.component.MetaSearchTextField
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.feature.detail.R
-import com.example.metasearch.feature.detail.person.PersonDetailUiEvent
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.component.MetaSearchTextField
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.feature.detail.R
+import com.metasearch.android.feature.detail.person.PersonDetailUiEvent
 
 @Composable
 internal fun PersonEditDialogContent(
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailPresenter.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailPresenter.kt
similarity index 88%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailPresenter.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailPresenter.kt
index 3bd00e9f..84d3f92a 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailPresenter.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailPresenter.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.photo
+package com.metasearch.android.feature.detail.photo
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -6,11 +6,11 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import com.example.metasearch.core.common.utils.handleException
-import com.example.metasearch.core.data.api.repository.ImageAnalysisRepository
-import com.example.metasearch.feature.screens.FocusingSearchScreen
-import com.example.metasearch.feature.screens.GraphDetailScreen
-import com.example.metasearch.feature.screens.PhotoDetailScreen
+import com.metasearch.android.core.common.utils.handleException
+import com.metasearch.android.core.data.api.repository.ImageAnalysisRepository
+import com.metasearch.android.feature.screens.FocusingSearchScreen
+import com.metasearch.android.feature.screens.GraphDetailScreen
+import com.metasearch.android.feature.screens.PhotoDetailScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailToastEffect.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailToastEffect.kt
similarity index 85%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailToastEffect.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailToastEffect.kt
index 523607c3..b4fbc15b 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailToastEffect.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailToastEffect.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.photo
+package com.metasearch.android.feature.detail.photo
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailUi.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailUi.kt
similarity index 82%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailUi.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailUi.kt
index 792da71f..cf9d104d 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailUi.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.photo
+package com.metasearch.android.feature.detail.photo
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -18,17 +18,17 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import coil3.compose.AsyncImage
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.component.MetaSearchToast
-import com.example.metasearch.core.designsystem.theme.LightPink
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.ui.MetaSearchScaffold
-import com.example.metasearch.core.ui.component.MetaSearchLoadingIndicator
-import com.example.metasearch.feature.detail.photo.component.ImageDescriptionBottomSheetContent
-import com.example.metasearch.feature.detail.photo.component.PhotoDetailBottomBar
-import com.example.metasearch.feature.detail.photo.component.PhotoDetailBottomBarItem
-import com.example.metasearch.feature.detail.photo.component.PhotoDetailHeader
-import com.example.metasearch.feature.screens.PhotoDetailScreen
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.component.MetaSearchToast
+import com.metasearch.android.core.designsystem.theme.LightPink
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.ui.MetaSearchScaffold
+import com.metasearch.android.core.ui.component.MetaSearchLoadingIndicator
+import com.metasearch.android.feature.detail.photo.component.ImageDescriptionBottomSheetContent
+import com.metasearch.android.feature.detail.photo.component.PhotoDetailBottomBar
+import com.metasearch.android.feature.detail.photo.component.PhotoDetailBottomBarItem
+import com.metasearch.android.feature.detail.photo.component.PhotoDetailHeader
+import com.metasearch.android.feature.screens.PhotoDetailScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailUiState.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailUiState.kt
similarity index 92%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailUiState.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailUiState.kt
index 44211753..3377c3a9 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/PhotoDetailUiState.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/PhotoDetailUiState.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.photo
+package com.metasearch.android.feature.detail.photo
 
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/ImageDescriptionBottomSheetContent.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/ImageDescriptionBottomSheetContent.kt
similarity index 83%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/ImageDescriptionBottomSheetContent.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/ImageDescriptionBottomSheetContent.kt
index 02e5d2b1..89726c99 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/ImageDescriptionBottomSheetContent.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/ImageDescriptionBottomSheetContent.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.photo.component
+package com.metasearch.android.feature.detail.photo.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -9,8 +9,8 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.feature.detail.R
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.feature.detail.R
 
 @Composable
 internal fun ImageDescriptionBottomSheetContent(description: String) {
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/PhotoDetailBottomBar.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/PhotoDetailBottomBar.kt
similarity index 87%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/PhotoDetailBottomBar.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/PhotoDetailBottomBar.kt
index 222293bd..6f5bf3d9 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/PhotoDetailBottomBar.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/PhotoDetailBottomBar.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.photo.component
+package com.metasearch.android.feature.detail.photo.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -25,12 +25,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.Black
-import com.example.metasearch.core.designsystem.theme.LightPink
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.designsystem.theme.White
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.Black
+import com.metasearch.android.core.designsystem.theme.LightPink
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.designsystem.theme.White
 
 @Composable
 fun PhotoDetailBottomBar(
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/PhotoDetailBottomBarItem.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/PhotoDetailBottomBarItem.kt
similarity index 87%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/PhotoDetailBottomBarItem.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/PhotoDetailBottomBarItem.kt
index 357b6e1c..252496f2 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/PhotoDetailBottomBarItem.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/PhotoDetailBottomBarItem.kt
@@ -1,8 +1,8 @@
-package com.example.metasearch.feature.detail.photo.component
+package com.metasearch.android.feature.detail.photo.component
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import com.example.metasearch.feature.detail.R
+import com.metasearch.android.feature.detail.R
 
 enum class PhotoDetailBottomBarItem(
     @DrawableRes val iconResId: Int,
diff --git a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/PhotoDetailHeader.kt b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/PhotoDetailHeader.kt
similarity index 81%
rename from feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/PhotoDetailHeader.kt
rename to feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/PhotoDetailHeader.kt
index 8c6b1bbd..73c83283 100644
--- a/feature/detail/src/main/java/com/example/metasearch/feature/detail/photo/component/PhotoDetailHeader.kt
+++ b/feature/detail/src/main/java/com/metasearch/android/feature/detail/photo/component/PhotoDetailHeader.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.detail.photo.component
+package com.metasearch.android.feature.detail.photo.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -15,11 +15,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.ui.component.MetaSearchDivider
-import com.example.metasearch.feature.detail.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.ui.component.MetaSearchDivider
+import com.metasearch.android.feature.detail.R
 
 @Composable
 fun PhotoDetailHeader(
diff --git a/feature/graph/build.gradle.kts b/feature/graph/build.gradle.kts
index 32a8c523..cc3a3928 100644
--- a/feature/graph/build.gradle.kts
+++ b/feature/graph/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.feature.graph"
+    namespace = "com.metasearch.android.feature.graph"
 }
 
 ksp {
diff --git a/feature/graph/src/main/java/com/example/metasearch/feature/graph/GraphPresenter.kt b/feature/graph/src/main/java/com/metasearch/android/feature/graph/GraphPresenter.kt
similarity index 90%
rename from feature/graph/src/main/java/com/example/metasearch/feature/graph/GraphPresenter.kt
rename to feature/graph/src/main/java/com/metasearch/android/feature/graph/GraphPresenter.kt
index 14a00053..9538f486 100644
--- a/feature/graph/src/main/java/com/example/metasearch/feature/graph/GraphPresenter.kt
+++ b/feature/graph/src/main/java/com/metasearch/android/feature/graph/GraphPresenter.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.graph
+package com.metasearch.android.feature.graph
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -8,9 +8,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
-import com.example.metasearch.core.data.api.repository.GraphRepository
-import com.example.metasearch.feature.screens.GraphDetailScreen
-import com.example.metasearch.feature.screens.GraphScreen
+import com.metasearch.android.core.data.api.repository.GraphRepository
+import com.metasearch.android.feature.screens.GraphDetailScreen
+import com.metasearch.android.feature.screens.GraphScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
diff --git a/feature/graph/src/main/java/com/example/metasearch/feature/graph/GraphUi.kt b/feature/graph/src/main/java/com/metasearch/android/feature/graph/GraphUi.kt
similarity index 87%
rename from feature/graph/src/main/java/com/example/metasearch/feature/graph/GraphUi.kt
rename to feature/graph/src/main/java/com/metasearch/android/feature/graph/GraphUi.kt
index f8a7c7cd..d2da0199 100644
--- a/feature/graph/src/main/java/com/example/metasearch/feature/graph/GraphUi.kt
+++ b/feature/graph/src/main/java/com/metasearch/android/feature/graph/GraphUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.graph
+package com.metasearch.android.feature.graph
 
 import android.annotation.SuppressLint
 import android.net.http.SslError
@@ -27,15 +27,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import coil3.compose.AsyncImage
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.core.ui.MetaSearchScaffold
-import com.example.metasearch.core.ui.component.MetaSearchDialog
-import com.example.metasearch.feature.graph.component.GraphHeader
-import com.example.metasearch.feature.screens.GraphScreen
-import com.example.metasearch.feature.screens.component.MetaSearchMainBottomBar
-import com.example.metasearch.feature.screens.component.MetaSearchMainTabItem
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.core.ui.MetaSearchScaffold
+import com.metasearch.android.core.ui.component.MetaSearchDialog
+import com.metasearch.android.feature.graph.component.GraphHeader
+import com.metasearch.android.feature.screens.GraphScreen
+import com.metasearch.android.feature.screens.component.MetaSearchMainBottomBar
+import com.metasearch.android.feature.screens.component.MetaSearchMainTabItem
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 
diff --git a/feature/graph/src/main/java/com/example/metasearch/feature/graph/GraphUiState.kt b/feature/graph/src/main/java/com/metasearch/android/feature/graph/GraphUiState.kt
similarity index 91%
rename from feature/graph/src/main/java/com/example/metasearch/feature/graph/GraphUiState.kt
rename to feature/graph/src/main/java/com/metasearch/android/feature/graph/GraphUiState.kt
index 35a35c8b..b9af3d8e 100644
--- a/feature/graph/src/main/java/com/example/metasearch/feature/graph/GraphUiState.kt
+++ b/feature/graph/src/main/java/com/metasearch/android/feature/graph/GraphUiState.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.graph
+package com.metasearch.android.feature.graph
 
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
diff --git a/feature/graph/src/main/java/com/example/metasearch/feature/graph/component/GraphHeader.kt b/feature/graph/src/main/java/com/metasearch/android/feature/graph/component/GraphHeader.kt
similarity index 72%
rename from feature/graph/src/main/java/com/example/metasearch/feature/graph/component/GraphHeader.kt
rename to feature/graph/src/main/java/com/metasearch/android/feature/graph/component/GraphHeader.kt
index dc439f2d..550b09b5 100644
--- a/feature/graph/src/main/java/com/example/metasearch/feature/graph/component/GraphHeader.kt
+++ b/feature/graph/src/main/java/com/metasearch/android/feature/graph/component/GraphHeader.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.graph.component
+package com.metasearch.android.feature.graph.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -9,11 +9,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.ui.component.MetaSearchDivider
-import com.example.metasearch.feature.graph.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.ui.component.MetaSearchDivider
+import com.metasearch.android.feature.graph.R
 
 @Composable
 fun GraphHeader(
diff --git a/feature/home/build.gradle.kts b/feature/home/build.gradle.kts
index c3f0a5ba..28cd8e74 100644
--- a/feature/home/build.gradle.kts
+++ b/feature/home/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.feature.home"
+    namespace = "com.metasearch.android.feature.home"
 }
 
 ksp {
diff --git a/feature/home/src/main/java/com/example/metasearch/feature/home/HomePresenter.kt b/feature/home/src/main/java/com/metasearch/android/feature/home/HomePresenter.kt
similarity index 86%
rename from feature/home/src/main/java/com/example/metasearch/feature/home/HomePresenter.kt
rename to feature/home/src/main/java/com/metasearch/android/feature/home/HomePresenter.kt
index 68097407..14783053 100644
--- a/feature/home/src/main/java/com/example/metasearch/feature/home/HomePresenter.kt
+++ b/feature/home/src/main/java/com/metasearch/android/feature/home/HomePresenter.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.home
+package com.metasearch.android.feature.home
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -15,14 +15,14 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.metasearch.core.data.api.repository.GalleryRepository
-import com.example.metasearch.core.data.api.repository.ImageAnalysisRepository
-import com.example.metasearch.core.data.api.repository.PersonRepository
-import com.example.metasearch.core.model.PersonModel
-import com.example.metasearch.feature.home.worker.ImageAnalysisWorker
-import com.example.metasearch.feature.screens.HomeScreen
-import com.example.metasearch.feature.screens.PersonDetailScreen
-import com.example.metasearch.feature.screens.PhotoDetailScreen
+import com.metasearch.android.core.data.api.repository.GalleryRepository
+import com.metasearch.android.core.data.api.repository.ImageAnalysisRepository
+import com.metasearch.android.core.data.api.repository.PersonRepository
+import com.metasearch.android.core.model.PersonModel
+import com.metasearch.android.feature.home.worker.ImageAnalysisWorker
+import com.metasearch.android.feature.screens.HomeScreen
+import com.metasearch.android.feature.screens.PersonDetailScreen
+import com.metasearch.android.feature.screens.PhotoDetailScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
diff --git a/feature/home/src/main/java/com/example/metasearch/feature/home/HomeUi.kt b/feature/home/src/main/java/com/metasearch/android/feature/home/HomeUi.kt
similarity index 92%
rename from feature/home/src/main/java/com/example/metasearch/feature/home/HomeUi.kt
rename to feature/home/src/main/java/com/metasearch/android/feature/home/HomeUi.kt
index fda7d926..f7d74957 100644
--- a/feature/home/src/main/java/com/example/metasearch/feature/home/HomeUi.kt
+++ b/feature/home/src/main/java/com/metasearch/android/feature/home/HomeUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.home
+package com.metasearch.android.feature.home
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.clickable
@@ -32,18 +32,18 @@ import androidx.paging.LoadState
 import androidx.paging.PagingData.Companion.from
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.core.model.GalleryImageModel
-import com.example.metasearch.core.ui.MetaSearchScaffold
-import com.example.metasearch.core.ui.component.MetaSearchLoadingIndicator
-import com.example.metasearch.core.ui.component.MetaSearchSquareImage
-import com.example.metasearch.feature.home.component.HomeHeader
-import com.example.metasearch.feature.home.component.PersonCircleItem
-import com.example.metasearch.feature.screens.HomeScreen
-import com.example.metasearch.feature.screens.component.MetaSearchMainBottomBar
-import com.example.metasearch.feature.screens.component.MetaSearchMainTabItem
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.core.model.GalleryImageModel
+import com.metasearch.android.core.ui.MetaSearchScaffold
+import com.metasearch.android.core.ui.component.MetaSearchLoadingIndicator
+import com.metasearch.android.core.ui.component.MetaSearchSquareImage
+import com.metasearch.android.feature.home.component.HomeHeader
+import com.metasearch.android.feature.home.component.PersonCircleItem
+import com.metasearch.android.feature.screens.HomeScreen
+import com.metasearch.android.feature.screens.component.MetaSearchMainBottomBar
+import com.metasearch.android.feature.screens.component.MetaSearchMainTabItem
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 import kotlinx.coroutines.flow.flowOf
diff --git a/feature/home/src/main/java/com/example/metasearch/feature/home/HomeUiState.kt b/feature/home/src/main/java/com/metasearch/android/feature/home/HomeUiState.kt
similarity index 85%
rename from feature/home/src/main/java/com/example/metasearch/feature/home/HomeUiState.kt
rename to feature/home/src/main/java/com/metasearch/android/feature/home/HomeUiState.kt
index fa6fc4a6..8cc0ebbc 100644
--- a/feature/home/src/main/java/com/example/metasearch/feature/home/HomeUiState.kt
+++ b/feature/home/src/main/java/com/metasearch/android/feature/home/HomeUiState.kt
@@ -1,8 +1,8 @@
-package com.example.metasearch.feature.home
+package com.metasearch.android.feature.home
 
 import androidx.paging.PagingData
-import com.example.metasearch.core.model.GalleryImageModel
-import com.example.metasearch.core.model.PersonModel
+import com.metasearch.android.core.model.GalleryImageModel
+import com.metasearch.android.core.model.PersonModel
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import com.slack.circuit.runtime.screen.Screen
diff --git a/feature/home/src/main/java/com/example/metasearch/feature/home/component/HomeHeader.kt b/feature/home/src/main/java/com/metasearch/android/feature/home/component/HomeHeader.kt
similarity index 83%
rename from feature/home/src/main/java/com/example/metasearch/feature/home/component/HomeHeader.kt
rename to feature/home/src/main/java/com/metasearch/android/feature/home/component/HomeHeader.kt
index 1292c21e..abedcf80 100644
--- a/feature/home/src/main/java/com/example/metasearch/feature/home/component/HomeHeader.kt
+++ b/feature/home/src/main/java/com/metasearch/android/feature/home/component/HomeHeader.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.home.component
+package com.metasearch.android.feature.home.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -16,11 +16,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.ui.component.MetaSearchDivider
-import com.example.metasearch.feature.home.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.ui.component.MetaSearchDivider
+import com.metasearch.android.feature.home.R
 
 @Composable
 fun HomeHeader(
diff --git a/feature/home/src/main/java/com/example/metasearch/feature/home/component/PersonCircleItem.kt b/feature/home/src/main/java/com/metasearch/android/feature/home/component/PersonCircleItem.kt
similarity index 82%
rename from feature/home/src/main/java/com/example/metasearch/feature/home/component/PersonCircleItem.kt
rename to feature/home/src/main/java/com/metasearch/android/feature/home/component/PersonCircleItem.kt
index 85c9ae58..00d025b7 100644
--- a/feature/home/src/main/java/com/example/metasearch/feature/home/component/PersonCircleItem.kt
+++ b/feature/home/src/main/java/com/metasearch/android/feature/home/component/PersonCircleItem.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.home.component
+package com.metasearch.android.feature.home.component
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -13,10 +13,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.core.ui.component.MetaSearchCircleImage
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.core.ui.component.MetaSearchCircleImage
 
 @Composable
 internal fun PersonCircleItem(
diff --git a/feature/home/src/main/java/com/example/metasearch/feature/home/worker/ImageAnalysisWorker.kt b/feature/home/src/main/java/com/metasearch/android/feature/home/worker/ImageAnalysisWorker.kt
similarity index 87%
rename from feature/home/src/main/java/com/example/metasearch/feature/home/worker/ImageAnalysisWorker.kt
rename to feature/home/src/main/java/com/metasearch/android/feature/home/worker/ImageAnalysisWorker.kt
index 3eb39fe7..773df009 100644
--- a/feature/home/src/main/java/com/example/metasearch/feature/home/worker/ImageAnalysisWorker.kt
+++ b/feature/home/src/main/java/com/metasearch/android/feature/home/worker/ImageAnalysisWorker.kt
@@ -1,10 +1,10 @@
-package com.example.metasearch.feature.home.worker
+package com.metasearch.android.feature.home.worker
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import com.example.metasearch.core.data.api.repository.ImageAnalysisRepository
-import com.example.metasearch.core.notification.notifier.AnalysisNotifier
+import com.metasearch.android.core.data.api.repository.ImageAnalysisRepository
+import com.metasearch.android.core.notification.notifier.AnalysisNotifier
 import dagger.hilt.EntryPoint
 import dagger.hilt.EntryPoints
 import dagger.hilt.InstallIn
diff --git a/feature/main/build.gradle.kts b/feature/main/build.gradle.kts
index dc7b1a48..a4ba4577 100644
--- a/feature/main/build.gradle.kts
+++ b/feature/main/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.feature.main"
+    namespace = "com.metasearch.android.feature.main"
 }
 
 ksp {
diff --git a/feature/main/src/main/AndroidManifest.xml b/feature/main/src/main/AndroidManifest.xml
index 663b431a..f7486888 100644
--- a/feature/main/src/main/AndroidManifest.xml
+++ b/feature/main/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
 
     <application>
         <activity
-            android:name=".MainActivity"
+            android:name="com.metasearch.android.feature.main.MainActivity"
             android:theme="@style/Theme.App.Starting"
             android:exported="true">
             <intent-filter>
diff --git a/feature/main/src/main/java/com/example/metasearch/feature/main/MainActivity.kt b/feature/main/src/main/java/com/metasearch/android/feature/main/MainActivity.kt
similarity index 87%
rename from feature/main/src/main/java/com/example/metasearch/feature/main/MainActivity.kt
rename to feature/main/src/main/java/com/metasearch/android/feature/main/MainActivity.kt
index 1eab0681..068d1f5d 100644
--- a/feature/main/src/main/java/com/example/metasearch/feature/main/MainActivity.kt
+++ b/feature/main/src/main/java/com/metasearch/android/feature/main/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.main
+package com.metasearch.android.feature.main
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -11,12 +11,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.example.metasearch.core.common.utils.EventHandler
-import com.example.metasearch.core.common.utils.MetaSearchDialogSpec
-import com.example.metasearch.core.common.utils.MetaSearchEvent
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.ui.component.MetaSearchDialog
-import com.example.metasearch.feature.screens.SplashScreen
+import com.metasearch.android.core.common.utils.EventHandler
+import com.metasearch.android.core.common.utils.MetaSearchDialogSpec
+import com.metasearch.android.core.common.utils.MetaSearchEvent
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.ui.component.MetaSearchDialog
+import com.metasearch.android.feature.screens.SplashScreen
 import com.slack.circuit.backstack.rememberSaveableBackStack
 import com.slack.circuit.foundation.Circuit
 import com.slack.circuit.foundation.CircuitCompositionLocals
diff --git a/feature/person/build.gradle.kts b/feature/person/build.gradle.kts
index 166727c4..3029cc90 100644
--- a/feature/person/build.gradle.kts
+++ b/feature/person/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.feature.person"
+    namespace = "com.metasearch.android.feature.person"
 }
 
 ksp {
diff --git a/feature/person/src/main/java/com/example/metasearch/feature/person/PersonPresenter.kt b/feature/person/src/main/java/com/metasearch/android/feature/person/PersonPresenter.kt
similarity index 91%
rename from feature/person/src/main/java/com/example/metasearch/feature/person/PersonPresenter.kt
rename to feature/person/src/main/java/com/metasearch/android/feature/person/PersonPresenter.kt
index c2b16ed2..a8420d20 100644
--- a/feature/person/src/main/java/com/example/metasearch/feature/person/PersonPresenter.kt
+++ b/feature/person/src/main/java/com/metasearch/android/feature/person/PersonPresenter.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.person
+package com.metasearch.android.feature.person
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -7,10 +7,10 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import com.example.metasearch.core.common.utils.handleException
-import com.example.metasearch.core.data.api.repository.PersonRepository
-import com.example.metasearch.feature.screens.PersonDetailScreen
-import com.example.metasearch.feature.screens.PersonScreen
+import com.metasearch.android.core.common.utils.handleException
+import com.metasearch.android.core.data.api.repository.PersonRepository
+import com.metasearch.android.feature.screens.PersonDetailScreen
+import com.metasearch.android.feature.screens.PersonScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
diff --git a/feature/person/src/main/java/com/example/metasearch/feature/person/PersonToastEffect.kt b/feature/person/src/main/java/com/metasearch/android/feature/person/PersonToastEffect.kt
similarity index 85%
rename from feature/person/src/main/java/com/example/metasearch/feature/person/PersonToastEffect.kt
rename to feature/person/src/main/java/com/metasearch/android/feature/person/PersonToastEffect.kt
index 82797508..7b6d5eaa 100644
--- a/feature/person/src/main/java/com/example/metasearch/feature/person/PersonToastEffect.kt
+++ b/feature/person/src/main/java/com/metasearch/android/feature/person/PersonToastEffect.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.person
+package com.metasearch.android.feature.person
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
diff --git a/feature/person/src/main/java/com/example/metasearch/feature/person/PersonUi.kt b/feature/person/src/main/java/com/metasearch/android/feature/person/PersonUi.kt
similarity index 84%
rename from feature/person/src/main/java/com/example/metasearch/feature/person/PersonUi.kt
rename to feature/person/src/main/java/com/metasearch/android/feature/person/PersonUi.kt
index bb35c5b7..6d0a7439 100644
--- a/feature/person/src/main/java/com/example/metasearch/feature/person/PersonUi.kt
+++ b/feature/person/src/main/java/com/metasearch/android/feature/person/PersonUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.person
+package com.metasearch.android.feature.person
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -15,18 +15,18 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.component.MetaSearchToast
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.model.PersonModel
-import com.example.metasearch.core.ui.MetaSearchScaffold
-import com.example.metasearch.core.ui.component.MetaSearchDialog
-import com.example.metasearch.feature.person.component.PersonHeader
-import com.example.metasearch.feature.person.component.PersonItem
-import com.example.metasearch.feature.person.component.PersonSearchTextField
-import com.example.metasearch.feature.screens.PersonScreen
-import com.example.metasearch.feature.screens.component.MetaSearchMainBottomBar
-import com.example.metasearch.feature.screens.component.MetaSearchMainTabItem
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.component.MetaSearchToast
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.model.PersonModel
+import com.metasearch.android.core.ui.MetaSearchScaffold
+import com.metasearch.android.core.ui.component.MetaSearchDialog
+import com.metasearch.android.feature.person.component.PersonHeader
+import com.metasearch.android.feature.person.component.PersonItem
+import com.metasearch.android.feature.person.component.PersonSearchTextField
+import com.metasearch.android.feature.screens.PersonScreen
+import com.metasearch.android.feature.screens.component.MetaSearchMainBottomBar
+import com.metasearch.android.feature.screens.component.MetaSearchMainTabItem
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 
diff --git a/feature/person/src/main/java/com/example/metasearch/feature/person/PersonUiState.kt b/feature/person/src/main/java/com/metasearch/android/feature/person/PersonUiState.kt
similarity index 90%
rename from feature/person/src/main/java/com/example/metasearch/feature/person/PersonUiState.kt
rename to feature/person/src/main/java/com/metasearch/android/feature/person/PersonUiState.kt
index f77adbca..0bd373c7 100644
--- a/feature/person/src/main/java/com/example/metasearch/feature/person/PersonUiState.kt
+++ b/feature/person/src/main/java/com/metasearch/android/feature/person/PersonUiState.kt
@@ -1,6 +1,6 @@
-package com.example.metasearch.feature.person
+package com.metasearch.android.feature.person
 
-import com.example.metasearch.core.model.PersonModel
+import com.metasearch.android.core.model.PersonModel
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import com.slack.circuit.runtime.screen.Screen
diff --git a/feature/person/src/main/java/com/example/metasearch/feature/person/component/PersonHeader.kt b/feature/person/src/main/java/com/metasearch/android/feature/person/component/PersonHeader.kt
similarity index 72%
rename from feature/person/src/main/java/com/example/metasearch/feature/person/component/PersonHeader.kt
rename to feature/person/src/main/java/com/metasearch/android/feature/person/component/PersonHeader.kt
index 497391b1..803cd99b 100644
--- a/feature/person/src/main/java/com/example/metasearch/feature/person/component/PersonHeader.kt
+++ b/feature/person/src/main/java/com/metasearch/android/feature/person/component/PersonHeader.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.person.component
+package com.metasearch.android.feature.person.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -9,11 +9,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.ui.component.MetaSearchDivider
-import com.example.metasearch.feature.person.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.ui.component.MetaSearchDivider
+import com.metasearch.android.feature.person.R
 
 @Composable
 fun PersonHeader(
diff --git a/feature/person/src/main/java/com/example/metasearch/feature/person/component/PersonItem.kt b/feature/person/src/main/java/com/metasearch/android/feature/person/component/PersonItem.kt
similarity index 86%
rename from feature/person/src/main/java/com/example/metasearch/feature/person/component/PersonItem.kt
rename to feature/person/src/main/java/com/metasearch/android/feature/person/component/PersonItem.kt
index 82d8ee21..a02d78bf 100644
--- a/feature/person/src/main/java/com/example/metasearch/feature/person/component/PersonItem.kt
+++ b/feature/person/src/main/java/com/metasearch/android/feature/person/component/PersonItem.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.person.component
+package com.metasearch.android.feature.person.component
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -20,12 +20,12 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.Black
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.model.PersonModel
-import com.example.metasearch.core.ui.component.MetaSearchCircleImage
-import com.example.metasearch.feature.person.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.Black
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.model.PersonModel
+import com.metasearch.android.core.ui.component.MetaSearchCircleImage
+import com.metasearch.android.feature.person.R
 
 @Composable
 internal fun PersonItem(
diff --git a/feature/person/src/main/java/com/example/metasearch/feature/person/component/PersonSearchTextField.kt b/feature/person/src/main/java/com/metasearch/android/feature/person/component/PersonSearchTextField.kt
similarity index 88%
rename from feature/person/src/main/java/com/example/metasearch/feature/person/component/PersonSearchTextField.kt
rename to feature/person/src/main/java/com/metasearch/android/feature/person/component/PersonSearchTextField.kt
index 446dbc22..e950dbb4 100644
--- a/feature/person/src/main/java/com/example/metasearch/feature/person/component/PersonSearchTextField.kt
+++ b/feature/person/src/main/java/com/metasearch/android/feature/person/component/PersonSearchTextField.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.person.component
+package com.metasearch.android.feature.person.component
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -18,10 +18,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.feature.person.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.feature.person.R
 
 @Composable
 fun PersonSearchTextField(
diff --git a/feature/screens/build.gradle.kts b/feature/screens/build.gradle.kts
index 01480108..b7aa1d4f 100644
--- a/feature/screens/build.gradle.kts
+++ b/feature/screens/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.feature.screens"
+    namespace = "com.metasearch.android.feature.screens"
 }
 
 dependencies {
diff --git a/feature/screens/src/main/java/com/example/metasearch/feature/screens/Screens.kt b/feature/screens/src/main/java/com/metasearch/android/feature/screens/Screens.kt
similarity index 88%
rename from feature/screens/src/main/java/com/example/metasearch/feature/screens/Screens.kt
rename to feature/screens/src/main/java/com/metasearch/android/feature/screens/Screens.kt
index c7e2d49d..3398ad37 100644
--- a/feature/screens/src/main/java/com/example/metasearch/feature/screens/Screens.kt
+++ b/feature/screens/src/main/java/com/metasearch/android/feature/screens/Screens.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.screens
+package com.metasearch.android.feature.screens
 
 import com.slack.circuit.runtime.screen.Screen
 import kotlinx.parcelize.Parcelize
diff --git a/feature/screens/src/main/java/com/example/metasearch/feature/screens/component/MetaSearchMainBottomBar.kt b/feature/screens/src/main/java/com/metasearch/android/feature/screens/component/MetaSearchMainBottomBar.kt
similarity index 87%
rename from feature/screens/src/main/java/com/example/metasearch/feature/screens/component/MetaSearchMainBottomBar.kt
rename to feature/screens/src/main/java/com/metasearch/android/feature/screens/component/MetaSearchMainBottomBar.kt
index 99f3f909..309574fc 100644
--- a/feature/screens/src/main/java/com/example/metasearch/feature/screens/component/MetaSearchMainBottomBar.kt
+++ b/feature/screens/src/main/java/com/metasearch/android/feature/screens/component/MetaSearchMainBottomBar.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.screens.component
+package com.metasearch.android.feature.screens.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -25,13 +25,13 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.Black
-import com.example.metasearch.core.designsystem.theme.LightPink
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.designsystem.theme.White
-import com.example.metasearch.core.ui.MetaSearchScaffold
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.Black
+import com.metasearch.android.core.designsystem.theme.LightPink
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.designsystem.theme.White
+import com.metasearch.android.core.ui.MetaSearchScaffold
 
 @Composable
 fun MetaSearchMainBottomBar(
diff --git a/feature/screens/src/main/java/com/example/metasearch/feature/screens/component/MetaSearchMainTabItem.kt b/feature/screens/src/main/java/com/metasearch/android/feature/screens/component/MetaSearchMainTabItem.kt
similarity index 68%
rename from feature/screens/src/main/java/com/example/metasearch/feature/screens/component/MetaSearchMainTabItem.kt
rename to feature/screens/src/main/java/com/metasearch/android/feature/screens/component/MetaSearchMainTabItem.kt
index af91042e..a2626938 100644
--- a/feature/screens/src/main/java/com/example/metasearch/feature/screens/component/MetaSearchMainTabItem.kt
+++ b/feature/screens/src/main/java/com/metasearch/android/feature/screens/component/MetaSearchMainTabItem.kt
@@ -1,12 +1,12 @@
-package com.example.metasearch.feature.screens.component
+package com.metasearch.android.feature.screens.component
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import com.example.metasearch.feature.screens.GraphScreen
-import com.example.metasearch.feature.screens.HomeScreen
-import com.example.metasearch.feature.screens.NLSearchScreen
-import com.example.metasearch.feature.screens.PersonScreen
-import com.example.metasearch.feature.screens.R
+import com.metasearch.android.feature.screens.GraphScreen
+import com.metasearch.android.feature.screens.HomeScreen
+import com.metasearch.android.feature.screens.NLSearchScreen
+import com.metasearch.android.feature.screens.PersonScreen
+import com.metasearch.android.feature.screens.R
 import com.slack.circuit.runtime.screen.Screen
 
 enum class MetaSearchMainTabItem(
diff --git a/feature/search/build.gradle.kts b/feature/search/build.gradle.kts
index 8ef65f05..f46f83bb 100644
--- a/feature/search/build.gradle.kts
+++ b/feature/search/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.feature.search"
+    namespace = "com.metasearch.android.feature.search"
 }
 
 ksp {
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchPresenter.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchPresenter.kt
similarity index 85%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchPresenter.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchPresenter.kt
index 55be304c..688a4c77 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchPresenter.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchPresenter.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.focusing
+package com.metasearch.android.feature.search.focusing
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -9,14 +9,14 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.core.net.toUri
-import com.example.metasearch.core.common.extensions.toFile
-import com.example.metasearch.core.common.utils.handleException
-import com.example.metasearch.core.data.api.repository.SearchRepository
-import com.example.metasearch.core.model.CircleModel
-import com.example.metasearch.core.model.SearchResult
-import com.example.metasearch.feature.screens.FocusingSearchScreen
-import com.example.metasearch.feature.screens.PhotoDetailScreen
-import com.example.metasearch.feature.search.R
+import com.metasearch.android.core.common.extensions.toFile
+import com.metasearch.android.core.common.utils.handleException
+import com.metasearch.android.core.data.api.repository.SearchRepository
+import com.metasearch.android.core.model.CircleModel
+import com.metasearch.android.core.model.SearchResult
+import com.metasearch.android.feature.screens.FocusingSearchScreen
+import com.metasearch.android.feature.screens.PhotoDetailScreen
+import com.metasearch.android.feature.search.R
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
@@ -111,7 +111,10 @@ class FocusingSearchPresenter @AssistedInject constructor(
 
                 FocusingSearchUiEvent.OnColorClick -> TODO()
 
-                FocusingSearchUiEvent.OnBackClick -> navigator.pop()
+                FocusingSearchUiEvent.OnBackClick -> {
+                    searchJob?.cancel()
+                    navigator.pop()
+                }
 
                 FocusingSearchUiEvent.HideToast -> toastMessage = null
 
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchToastEffect.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchToastEffect.kt
similarity index 85%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchToastEffect.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchToastEffect.kt
index 87515d47..7b5efbd1 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchToastEffect.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchToastEffect.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.focusing
+package com.metasearch.android.feature.search.focusing
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchUi.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchUi.kt
similarity index 86%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchUi.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchUi.kt
index bcba555e..07f0030a 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchUi.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.focusing
+package com.metasearch.android.feature.search.focusing
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.gestures.detectDragGestures
@@ -21,20 +21,21 @@ import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.component.MetaSearchToast
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.White
-import com.example.metasearch.core.model.CircleModel
-import com.example.metasearch.core.ui.MetaSearchScaffold
-import com.example.metasearch.core.ui.component.MetaSearchLoadingIndicator
-import com.example.metasearch.feature.screens.FocusingSearchScreen
-import com.example.metasearch.feature.search.focusing.component.FocusingSearchBottomBar
-import com.example.metasearch.feature.search.focusing.component.FocusingSearchBottomBarItem
-import com.example.metasearch.feature.search.focusing.component.FocusingSearchHeader
-import com.example.metasearch.feature.search.focusing.component.SearchResultList
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.component.MetaSearchToast
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.White
+import com.metasearch.android.core.model.CircleModel
+import com.metasearch.android.core.ui.MetaSearchScaffold
+import com.metasearch.android.core.ui.component.MetaSearchLoadingIndicator
+import com.metasearch.android.feature.screens.FocusingSearchScreen
+import com.metasearch.android.feature.search.focusing.component.FocusingSearchBottomBar
+import com.metasearch.android.feature.search.focusing.component.FocusingSearchBottomBarItem
+import com.metasearch.android.feature.search.focusing.component.FocusingSearchHeader
+import com.metasearch.android.feature.search.focusing.component.SearchResultList
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 import kotlin.math.sqrt
@@ -84,7 +85,7 @@ private fun FocusingSearchUiContent(
     var currentRadius by remember { mutableFloatStateOf(0f) }
     var isDrawing by remember { mutableStateOf(false) }
 
-    var size by remember { mutableStateOf(androidx.compose.ui.unit.IntSize.Zero) }
+    var size by remember { mutableStateOf(IntSize.Zero) }
 
     Column(
         modifier = Modifier.padding(innerPadding),
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchUiState.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchUiState.kt
similarity index 86%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchUiState.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchUiState.kt
index bcbb9ba8..b59e8762 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/FocusingSearchUiState.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/FocusingSearchUiState.kt
@@ -1,7 +1,7 @@
-package com.example.metasearch.feature.search.focusing
+package com.metasearch.android.feature.search.focusing
 
-import com.example.metasearch.core.model.CircleModel
-import com.example.metasearch.core.model.SearchResult
+import com.metasearch.android.core.model.CircleModel
+import com.metasearch.android.core.model.SearchResult
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/FocusingSearchBottomBar.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/FocusingSearchBottomBar.kt
similarity index 87%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/FocusingSearchBottomBar.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/FocusingSearchBottomBar.kt
index 7c0d2a3e..f4e8a092 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/FocusingSearchBottomBar.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/FocusingSearchBottomBar.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.focusing.component
+package com.metasearch.android.feature.search.focusing.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -25,12 +25,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.Black
-import com.example.metasearch.core.designsystem.theme.LightPink
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.designsystem.theme.White
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.Black
+import com.metasearch.android.core.designsystem.theme.LightPink
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.designsystem.theme.White
 
 @Composable
 fun FocusingSearchBottomBar(
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/FocusingSearchBottomBarItem.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/FocusingSearchBottomBarItem.kt
similarity index 83%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/FocusingSearchBottomBarItem.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/FocusingSearchBottomBarItem.kt
index e91b7cb1..b14ed16c 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/FocusingSearchBottomBarItem.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/FocusingSearchBottomBarItem.kt
@@ -1,8 +1,8 @@
-package com.example.metasearch.feature.search.focusing.component
+package com.metasearch.android.feature.search.focusing.component
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import com.example.metasearch.feature.search.R
+import com.metasearch.android.feature.search.R
 
 enum class FocusingSearchBottomBarItem(
     @DrawableRes val iconResId: Int,
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/FocusingSearchHeader.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/FocusingSearchHeader.kt
similarity index 81%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/FocusingSearchHeader.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/FocusingSearchHeader.kt
index 07e91096..1083d3cd 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/FocusingSearchHeader.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/FocusingSearchHeader.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.focusing.component
+package com.metasearch.android.feature.search.focusing.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -15,11 +15,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.ui.component.MetaSearchDivider
-import com.example.metasearch.feature.search.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.ui.component.MetaSearchDivider
+import com.metasearch.android.feature.search.R
 
 @Composable
 fun FocusingSearchHeader(
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/SearchResultList.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/SearchResultList.kt
similarity index 88%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/SearchResultList.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/SearchResultList.kt
index 6fc47d07..02d30290 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/focusing/component/SearchResultList.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/focusing/component/SearchResultList.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.focusing.component
+package com.metasearch.android.feature.search.focusing.component
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -18,9 +18,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.core.model.SearchResult
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.core.model.SearchResult
 
 @Composable
 internal fun SearchResultList(
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchPresenter.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchPresenter.kt
similarity index 79%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchPresenter.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchPresenter.kt
index c1b2a02d..5b5fe72e 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchPresenter.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchPresenter.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.nls
+package com.metasearch.android.feature.search.nls
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -7,19 +7,19 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
-import com.example.metasearch.core.common.utils.handleException
-import com.example.metasearch.core.data.api.repository.SearchRepository
-import com.example.metasearch.feature.screens.NLSearchScreen
-import com.example.metasearch.feature.screens.PhotoDetailScreen
-import com.example.metasearch.feature.search.R
+import com.metasearch.android.core.common.utils.handleException
+import com.metasearch.android.core.data.api.repository.SearchRepository
+import com.metasearch.android.feature.screens.NLSearchScreen
+import com.metasearch.android.feature.screens.PhotoDetailScreen
+import com.metasearch.android.feature.search.R
 import com.slack.circuit.codegen.annotations.CircuitInject
+import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.components.ActivityRetainedComponent
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 
 class NLSearchPresenter @AssistedInject constructor(
@@ -36,11 +36,10 @@ class NLSearchPresenter @AssistedInject constructor(
     @Composable
     override fun present(): NLSearchUiState {
         val scope = rememberCoroutineScope()
-        var isLoading by remember { mutableStateOf(false) }
-        var searchJob by remember { mutableStateOf<Job?>(null) }
+        var isLoading by rememberRetained { mutableStateOf(false) }
         var toastMessage by remember { mutableStateOf<String?>(null) }
-        var inputString by remember { mutableStateOf("") }
-        var resultImages by remember { mutableStateOf<List<String>>(emptyList()) }
+        var inputString by rememberRetained { mutableStateOf("") }
+        var resultImages by rememberRetained { mutableStateOf<List<String>>(emptyList()) }
 
         val emptyResultMessage = stringResource(R.string.search_screen_empty_result_message)
 
@@ -50,10 +49,9 @@ class NLSearchPresenter @AssistedInject constructor(
 
                 is NLSearchUiEvent.OnNLSearchClick -> {
                     if (inputString.isBlank()) return
-                    searchJob?.cancel()
                     isLoading = true
 
-                    searchJob = scope.launch {
+                    scope.launch {
                         searchRepository.nlSearch(inputString)
                             .onSuccess { result ->
                                 if (result.matchedUris.isEmpty()) {
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchToastEffect.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchToastEffect.kt
similarity index 85%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchToastEffect.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchToastEffect.kt
index d3bfae0c..db8395c7 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchToastEffect.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchToastEffect.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.nls
+package com.metasearch.android.feature.search.nls
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchUi.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchUi.kt
similarity index 79%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchUi.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchUi.kt
index fcedb9ab..ba9a7379 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchUi.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.nls
+package com.metasearch.android.feature.search.nls
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -13,19 +13,19 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.component.MetaSearchToast
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.core.ui.MetaSearchScaffold
-import com.example.metasearch.core.ui.component.MetaSearchLoadingIndicator
-import com.example.metasearch.core.ui.component.MetaSearchSquareImage
-import com.example.metasearch.feature.screens.NLSearchScreen
-import com.example.metasearch.feature.screens.component.MetaSearchMainBottomBar
-import com.example.metasearch.feature.screens.component.MetaSearchMainTabItem
-import com.example.metasearch.feature.search.R
-import com.example.metasearch.feature.search.nls.component.NLSearchHeader
-import com.example.metasearch.feature.search.nls.component.NLSearchTextField
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.component.MetaSearchToast
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.core.ui.MetaSearchScaffold
+import com.metasearch.android.core.ui.component.MetaSearchLoadingIndicator
+import com.metasearch.android.core.ui.component.MetaSearchSquareImage
+import com.metasearch.android.feature.screens.NLSearchScreen
+import com.metasearch.android.feature.screens.component.MetaSearchMainBottomBar
+import com.metasearch.android.feature.screens.component.MetaSearchMainTabItem
+import com.metasearch.android.feature.search.R
+import com.metasearch.android.feature.search.nls.component.NLSearchHeader
+import com.metasearch.android.feature.search.nls.component.NLSearchTextField
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchUiState.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchUiState.kt
similarity index 91%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchUiState.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchUiState.kt
index d963514f..4d0e391b 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/NLSearchUiState.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/NLSearchUiState.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.nls
+package com.metasearch.android.feature.search.nls
 
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/component/NLSearchHeader.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/component/NLSearchHeader.kt
similarity index 72%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/nls/component/NLSearchHeader.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/nls/component/NLSearchHeader.kt
index 29bdcacc..a9dd7291 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/component/NLSearchHeader.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/component/NLSearchHeader.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.nls.component
+package com.metasearch.android.feature.search.nls.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -9,11 +9,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral800
-import com.example.metasearch.core.ui.component.MetaSearchDivider
-import com.example.metasearch.feature.search.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral800
+import com.metasearch.android.core.ui.component.MetaSearchDivider
+import com.metasearch.android.feature.search.R
 
 @Composable
 fun NLSearchHeader(
diff --git a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/component/NLSearchTextField.kt b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/component/NLSearchTextField.kt
similarity index 88%
rename from feature/search/src/main/java/com/example/metasearch/feature/search/nls/component/NLSearchTextField.kt
rename to feature/search/src/main/java/com/metasearch/android/feature/search/nls/component/NLSearchTextField.kt
index 4fff8a99..68079826 100644
--- a/feature/search/src/main/java/com/example/metasearch/feature/search/nls/component/NLSearchTextField.kt
+++ b/feature/search/src/main/java/com/metasearch/android/feature/search/nls/component/NLSearchTextField.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.search.nls.component
+package com.metasearch.android.feature.search.nls.component
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -18,10 +18,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.ComponentPreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.feature.search.R
+import com.metasearch.android.core.designsystem.annotation.ComponentPreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.feature.search.R
 
 @Composable
 fun NLSearchTextField(
diff --git a/feature/splash/build.gradle.kts b/feature/splash/build.gradle.kts
index 7ed52bdf..ac1cdff1 100644
--- a/feature/splash/build.gradle.kts
+++ b/feature/splash/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.feature.splash"
+    namespace = "com.metasearch.android.feature.splash"
 }
 
 ksp {
diff --git a/feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashPresenter.kt b/feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashPresenter.kt
similarity index 91%
rename from feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashPresenter.kt
rename to feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashPresenter.kt
index d4269422..eea439fe 100644
--- a/feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashPresenter.kt
+++ b/feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashPresenter.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.splash
+package com.metasearch.android.feature.splash
 
 import android.Manifest
 import android.os.Build
@@ -7,8 +7,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import com.example.metasearch.feature.screens.HomeScreen
-import com.example.metasearch.feature.screens.SplashScreen
+import com.metasearch.android.feature.screens.HomeScreen
+import com.metasearch.android.feature.screens.SplashScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
diff --git a/feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashSideEffectHandler.kt b/feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashSideEffectHandler.kt
similarity index 81%
rename from feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashSideEffectHandler.kt
rename to feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashSideEffectHandler.kt
index 279edf7a..0c4f0c5a 100644
--- a/feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashSideEffectHandler.kt
+++ b/feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashSideEffectHandler.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.splash
+package com.metasearch.android.feature.splash
 
 import android.content.Context
 import android.content.Intent
@@ -7,6 +7,9 @@ import android.provider.Settings
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.platform.LocalContext
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.MultiplePermissionsState
 import kotlinx.coroutines.delay
@@ -18,7 +21,7 @@ fun SplashSideEffectHandler(
     permissionState: MultiplePermissionsState,
     context: Context = LocalContext.current,
 ) {
-    val lifecycleOwner = androidx.lifecycle.compose.LocalLifecycleOwner.current
+    val lifecycleOwner = LocalLifecycleOwner.current
 
     LaunchedEffect(permissionState.allPermissionsGranted, permissionState.shouldShowRationale) {
         if (permissionState.allPermissionsGranted) {
@@ -32,8 +35,8 @@ fun SplashSideEffectHandler(
     }
 
     LaunchedEffect(lifecycleOwner) {
-        val observer = androidx.lifecycle.LifecycleEventObserver { _, event ->
-            if (event == androidx.lifecycle.Lifecycle.Event.ON_RESUME) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
                 /**
                  * 현재 블록 실행 시 permissionState.allPermissionsGranted가
                  * 자동 갱신된 후, 1번 LaunchedEffect가 반응
diff --git a/feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashUi.kt b/feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashUi.kt
similarity index 81%
rename from feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashUi.kt
rename to feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashUi.kt
index 695d4e6c..4edb2dc2 100644
--- a/feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashUi.kt
+++ b/feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.splash
+package com.metasearch.android.feature.splash
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -13,14 +13,14 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.designsystem.theme.Neutral500
-import com.example.metasearch.core.designsystem.theme.White
-import com.example.metasearch.core.ui.component.MetaSearchDialog
-import com.example.metasearch.feature.screens.SplashScreen
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.designsystem.theme.Neutral500
+import com.metasearch.android.core.designsystem.theme.White
+import com.metasearch.android.core.ui.component.MetaSearchDialog
+import com.metasearch.android.feature.screens.SplashScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 
@@ -47,7 +47,7 @@ fun SplashUi(
         Image(
             modifier = Modifier.width(200.dp),
             contentDescription = "MetaSearch App Logo",
-            painter = painterResource(com.example.metasearch.core.designsystem.R.drawable.ic_launcher_foreground),
+            painter = painterResource(com.metasearch.android.core.designsystem.R.drawable.ic_launcher_foreground),
         )
 
         if (state.showRationaleDialog) {
diff --git a/feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashUiState.kt b/feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashUiState.kt
similarity index 89%
rename from feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashUiState.kt
rename to feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashUiState.kt
index b927ae61..e93a7127 100644
--- a/feature/splash/src/main/java/com/example/metasearch/feature/splash/SplashUiState.kt
+++ b/feature/splash/src/main/java/com/metasearch/android/feature/splash/SplashUiState.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.splash
+package com.metasearch.android.feature.splash
 
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
diff --git a/feature/webview/build.gradle.kts b/feature/webview/build.gradle.kts
index ac88c936..61cde210 100644
--- a/feature/webview/build.gradle.kts
+++ b/feature/webview/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.metasearch.feature.webview"
+    namespace = "com.metasearch.android.feature.webview"
 }
 
 ksp {
diff --git a/feature/webview/src/main/java/com/example/metasearch/feature/webview/WebViewPresenter.kt b/feature/webview/src/main/java/com/metasearch/android/feature/webview/WebViewPresenter.kt
similarity index 86%
rename from feature/webview/src/main/java/com/example/metasearch/feature/webview/WebViewPresenter.kt
rename to feature/webview/src/main/java/com/metasearch/android/feature/webview/WebViewPresenter.kt
index 2c1a3946..d6df7411 100644
--- a/feature/webview/src/main/java/com/example/metasearch/feature/webview/WebViewPresenter.kt
+++ b/feature/webview/src/main/java/com/metasearch/android/feature/webview/WebViewPresenter.kt
@@ -1,7 +1,7 @@
-package com.example.metasearch.feature.webview
+package com.metasearch.android.feature.webview
 
 import androidx.compose.runtime.Composable
-import com.example.metasearch.feature.screens.WebViewScreen
+import com.metasearch.android.feature.screens.WebViewScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.runtime.presenter.Presenter
 import dagger.assisted.AssistedFactory
diff --git a/feature/webview/src/main/java/com/example/metasearch/feature/webview/WebViewUi.kt b/feature/webview/src/main/java/com/metasearch/android/feature/webview/WebViewUi.kt
similarity index 84%
rename from feature/webview/src/main/java/com/example/metasearch/feature/webview/WebViewUi.kt
rename to feature/webview/src/main/java/com/metasearch/android/feature/webview/WebViewUi.kt
index 157a41af..f9025ec9 100644
--- a/feature/webview/src/main/java/com/example/metasearch/feature/webview/WebViewUi.kt
+++ b/feature/webview/src/main/java/com/metasearch/android/feature/webview/WebViewUi.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.webview
+package com.metasearch.android.feature.webview
 
 import android.view.ViewGroup
 import android.webkit.WebView
@@ -9,10 +9,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.AndroidView
-import com.example.metasearch.core.designsystem.annotation.DevicePreview
-import com.example.metasearch.core.designsystem.theme.MetaSearchTheme
-import com.example.metasearch.core.ui.MetaSearchScaffold
-import com.example.metasearch.feature.screens.WebViewScreen
+import com.metasearch.android.core.designsystem.annotation.DevicePreview
+import com.metasearch.android.core.designsystem.theme.MetaSearchTheme
+import com.metasearch.android.core.ui.MetaSearchScaffold
+import com.metasearch.android.feature.screens.WebViewScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 
diff --git a/feature/webview/src/main/java/com/example/metasearch/feature/webview/WebViewUiState.kt b/feature/webview/src/main/java/com/metasearch/android/feature/webview/WebViewUiState.kt
similarity index 83%
rename from feature/webview/src/main/java/com/example/metasearch/feature/webview/WebViewUiState.kt
rename to feature/webview/src/main/java/com/metasearch/android/feature/webview/WebViewUiState.kt
index 4fff77f8..40eef4d5 100644
--- a/feature/webview/src/main/java/com/example/metasearch/feature/webview/WebViewUiState.kt
+++ b/feature/webview/src/main/java/com/metasearch/android/feature/webview/WebViewUiState.kt
@@ -1,4 +1,4 @@
-package com.example.metasearch.feature.webview
+package com.metasearch.android.feature.webview
 
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a90e4f77..60853f9a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
 ## Application
-applicationId = "com.example.metasearch"
+applicationId = "com.metasearch.android"
 compileSdk = "36"
 targetSdk = "36"
 minSdk = "30"
-versionCode = "1"
-versionName = "1.0.0"
+versionCode = "2"
+versionName = "2.0.0"
 
 ## Android Gradle Plugin
 agp = "8.13.2"