diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 16d722aab0..f819d05a3d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,7 +43,7 @@
         attributes and intent filters the same
         -->
         <activity
-            android:name="com.lawnchair.LawnchairLauncher"
+            android:name="app.lawnchair.LawnchairLauncher"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"
diff --git a/build.gradle b/build.gradle
index 0f6dce4bc0..70c1c2d9e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -118,7 +118,7 @@ android {
 
         lawn {
             dimension "app"
-            applicationId 'com.lawnchair'
+            applicationId 'app.lawnchair'
             testApplicationId 'com.android.launcher3.tests'
         }
 
diff --git a/lawnchair/AndroidManifest.xml b/lawnchair/AndroidManifest.xml
index ec8a183472..c5a06e6f9c 100644
--- a/lawnchair/AndroidManifest.xml
+++ b/lawnchair/AndroidManifest.xml
@@ -17,9 +17,9 @@
 */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application android:name="com.lawnchair.ui.LawnchairApp">
+    <application android:name="app.lawnchair.ui.LawnchairApp">
         <activity
-            android:name="com.lawnchair.ui.preferences.PreferenceActivity"
+            android:name="app.lawnchair.ui.preferences.PreferenceActivity"
             android:autoRemoveFromRecents="true"
             android:label="@string/settings_button_text"
             android:theme="@style/Theme.Lawnchair">
diff --git a/lawnchair/res/layout/search_container_all_apps.xml b/lawnchair/res/layout/search_container_all_apps.xml
index ccbaab06d1..8dc651330c 100644
--- a/lawnchair/res/layout/search_container_all_apps.xml
+++ b/lawnchair/res/layout/search_container_all_apps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.lawnchair.nexuslauncher.HotseatQsb
+<app.lawnchair.nexuslauncher.HotseatQsb
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@id/search_container_all_apps"
@@ -9,7 +9,7 @@
 
     <fragment
         android:id="@+id/search_wrapper_view"
-        android:name="com.lawnchair.nexuslauncher.HotseatQsb$HotseatQsbFragment"
+        android:name="app.lawnchair.nexuslauncher.HotseatQsb$HotseatQsbFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:tag="qsb_view"
@@ -38,4 +38,4 @@
         android:textColorHint="@drawable/all_apps_search_hint"
         android:textSize="16sp"
         android:visibility="invisible" />
-</com.lawnchair.nexuslauncher.HotseatQsb>
+</app.lawnchair.nexuslauncher.HotseatQsb>
diff --git a/lawnchair/res/layout/search_container_workspace.xml b/lawnchair/res/layout/search_container_workspace.xml
index 47e60490f2..bded1b0cdd 100644
--- a/lawnchair/res/layout/search_container_workspace.xml
+++ b/lawnchair/res/layout/search_container_workspace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.lawnchair.nexuslauncher.SmartspaceQsb
+<app.lawnchair.nexuslauncher.SmartspaceQsb
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@id/search_container_workspace"
@@ -7,10 +7,10 @@
     android:layout_height="0dp">
 
     <fragment
-        android:name="com.lawnchair.nexuslauncher.SmartspaceQsb$SmartSpaceFragment"
+        android:name="app.lawnchair.nexuslauncher.SmartspaceQsb$SmartSpaceFragment"
         android:layout_width="match_parent"
         android:tag="smart_space_view"
         android:layout_height="match_parent"
         tools:ignore="FragmentTagUsage" />
 
-</com.lawnchair.nexuslauncher.SmartspaceQsb>
\ No newline at end of file
+</app.lawnchair.nexuslauncher.SmartspaceQsb>
\ No newline at end of file
diff --git a/lawnchair/src/com/lawnchair/FeedBridge.kt b/lawnchair/src/app/lawnchair/FeedBridge.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/FeedBridge.kt
rename to lawnchair/src/app/lawnchair/FeedBridge.kt
index a3a47ca604..64e716eecd 100644
--- a/lawnchair/src/com/lawnchair/FeedBridge.kt
+++ b/lawnchair/src/app/lawnchair/FeedBridge.kt
@@ -15,7 +15,7 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.lawnchair
+package app.lawnchair
 
 import android.content.Context
 import android.content.Intent
@@ -24,8 +24,8 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Process
 import android.util.Log
-import com.lawnchair.util.SingletonHolder
-import com.lawnchair.util.preferences.LawnchairPreferences
+import app.lawnchair.util.SingletonHolder
+import app.lawnchair.util.preferences.LawnchairPreferences
 import com.android.launcher3.BuildConfig
 import com.android.launcher3.R
 import com.android.launcher3.Utilities
@@ -37,7 +37,7 @@ class FeedBridge(private val context: Context) {
     private val bridgePackages by lazy {
         listOf(
             PixelBridgeInfo("com.google.android.apps.nexuslauncher", R.integer.bridge_signature_hash),
-            BridgeInfo("com.lawnchair.lawnfeed", R.integer.lawnfeed_signature_hash)
+            BridgeInfo("app.lawnchair.lawnfeed", R.integer.lawnfeed_signature_hash)
         )
     }
 
diff --git a/lawnchair/src/com/lawnchair/LawnchairLauncher.java b/lawnchair/src/app/lawnchair/LawnchairLauncher.java
similarity index 78%
rename from lawnchair/src/com/lawnchair/LawnchairLauncher.java
rename to lawnchair/src/app/lawnchair/LawnchairLauncher.java
index db9cc1d289..98193af432 100644
--- a/lawnchair/src/com/lawnchair/LawnchairLauncher.java
+++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.java
@@ -1,9 +1,9 @@
-package com.lawnchair;
+package app.lawnchair;
 
 import com.android.launcher3.Launcher;
 import com.android.systemui.plugins.shared.LauncherOverlayManager;
 
-import com.lawnchair.nexuslauncher.OverlayCallbackImpl;
+import app.lawnchair.nexuslauncher.OverlayCallbackImpl;
 
 public class LawnchairLauncher extends Launcher {
     @Override
diff --git a/lawnchair/src/com/lawnchair/LawnchairLauncherQuickstep.java b/lawnchair/src/app/lawnchair/LawnchairLauncherQuickstep.java
similarity index 80%
rename from lawnchair/src/com/lawnchair/LawnchairLauncherQuickstep.java
rename to lawnchair/src/app/lawnchair/LawnchairLauncherQuickstep.java
index 0495400329..187e72b23d 100644
--- a/lawnchair/src/com/lawnchair/LawnchairLauncherQuickstep.java
+++ b/lawnchair/src/app/lawnchair/LawnchairLauncherQuickstep.java
@@ -1,9 +1,9 @@
-package com.lawnchair;
+package app.lawnchair;
 
 import com.android.launcher3.uioverrides.QuickstepLauncher;
 import com.android.systemui.plugins.shared.LauncherOverlayManager;
 
-import com.lawnchair.nexuslauncher.OverlayCallbackImpl;
+import app.lawnchair.nexuslauncher.OverlayCallbackImpl;
 
 public class LawnchairLauncherQuickstep extends QuickstepLauncher {
     @Override
diff --git a/lawnchair/src/com/lawnchair/nexuslauncher/HotseatQsb.kt b/lawnchair/src/app/lawnchair/nexuslauncher/HotseatQsb.kt
similarity index 99%
rename from lawnchair/src/com/lawnchair/nexuslauncher/HotseatQsb.kt
rename to lawnchair/src/app/lawnchair/nexuslauncher/HotseatQsb.kt
index 865215b210..08434363c5 100644
--- a/lawnchair/src/com/lawnchair/nexuslauncher/HotseatQsb.kt
+++ b/lawnchair/src/app/lawnchair/nexuslauncher/HotseatQsb.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.nexuslauncher
+package app.lawnchair.nexuslauncher
 
 import android.content.Context
 import android.graphics.Rect
diff --git a/lawnchair/src/com/lawnchair/nexuslauncher/OverlayCallbackImpl.java b/lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.java
similarity index 96%
rename from lawnchair/src/com/lawnchair/nexuslauncher/OverlayCallbackImpl.java
rename to lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.java
index 46491c1c62..89dcbab1f9 100644
--- a/lawnchair/src/com/lawnchair/nexuslauncher/OverlayCallbackImpl.java
+++ b/lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.java
@@ -1,6 +1,6 @@
-package com.lawnchair.nexuslauncher;
+package app.lawnchair.nexuslauncher;
 
-import static com.lawnchair.util.preferences.LawnchairPreferences.ENABLE_MINUS_ONE;
+import static app.lawnchair.util.preferences.LawnchairPreferences.ENABLE_MINUS_ONE;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -17,8 +17,8 @@ import com.google.android.libraries.launcherclient.LauncherClient;
 import com.google.android.libraries.launcherclient.LauncherClientCallbacks;
 import com.google.android.libraries.launcherclient.StaticInteger;
 
-import com.lawnchair.FeedBridge;
-import com.lawnchair.util.preferences.LawnchairPreferences;
+import app.lawnchair.FeedBridge;
+import app.lawnchair.util.preferences.LawnchairPreferences;
 
 /**
  * Implements {@link LauncherOverlay} and passes all the corresponding events to {@link
diff --git a/lawnchair/src/com/lawnchair/nexuslauncher/SmartSpaceHostView.kt b/lawnchair/src/app/lawnchair/nexuslauncher/SmartSpaceHostView.kt
similarity index 99%
rename from lawnchair/src/com/lawnchair/nexuslauncher/SmartSpaceHostView.kt
rename to lawnchair/src/app/lawnchair/nexuslauncher/SmartSpaceHostView.kt
index 9e9378bb31..cdc32c38da 100644
--- a/lawnchair/src/com/lawnchair/nexuslauncher/SmartSpaceHostView.kt
+++ b/lawnchair/src/app/lawnchair/nexuslauncher/SmartSpaceHostView.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.nexuslauncher
+package app.lawnchair.nexuslauncher
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/lawnchair/src/com/lawnchair/nexuslauncher/SmartspaceQsb.kt b/lawnchair/src/app/lawnchair/nexuslauncher/SmartspaceQsb.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/nexuslauncher/SmartspaceQsb.kt
rename to lawnchair/src/app/lawnchair/nexuslauncher/SmartspaceQsb.kt
index 4278c8cca4..68e2df18b6 100644
--- a/lawnchair/src/com/lawnchair/nexuslauncher/SmartspaceQsb.kt
+++ b/lawnchair/src/app/lawnchair/nexuslauncher/SmartspaceQsb.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.nexuslauncher
+package app.lawnchair.nexuslauncher
 
 import android.annotation.SuppressLint
 import android.appwidget.AppWidgetManager
diff --git a/lawnchair/src/com/lawnchair/ui/LawnchairApp.kt b/lawnchair/src/app/lawnchair/ui/LawnchairApp.kt
similarity index 99%
rename from lawnchair/src/com/lawnchair/ui/LawnchairApp.kt
rename to lawnchair/src/app/lawnchair/ui/LawnchairApp.kt
index 760a3f7ff5..1f5354f675 100644
--- a/lawnchair/src/com/lawnchair/ui/LawnchairApp.kt
+++ b/lawnchair/src/app/lawnchair/ui/LawnchairApp.kt
@@ -15,7 +15,7 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.lawnchair.ui
+package app.lawnchair.ui
 
 import android.app.Activity
 import android.app.Application
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/About.kt b/lawnchair/src/app/lawnchair/ui/preferences/About.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/ui/preferences/About.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/About.kt
index c8e31c03e1..7c99994607 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/About.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/About.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
@@ -15,7 +15,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.lawnchair.util.preferences.getFormattedVersionName
+import app.lawnchair.util.preferences.getFormattedVersionName
 import com.android.launcher3.R
 
 @Composable
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/AppDrawerPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/ui/preferences/AppDrawerPreferences.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt
index 0367e7e877..df8be21c03 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/AppDrawerPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/ContributorCard.kt b/lawnchair/src/app/lawnchair/ui/preferences/ContributorCard.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/preferences/ContributorCard.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/ContributorCard.kt
index 76a155f1be..4708649a34 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/ContributorCard.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/ContributorCard.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/ContributorLink.kt b/lawnchair/src/app/lawnchair/ui/preferences/ContributorLink.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/ui/preferences/ContributorLink.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/ContributorLink.kt
index f15a95992b..408a48be2d 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/ContributorLink.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/ContributorLink.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/ContributorRow.kt b/lawnchair/src/app/lawnchair/ui/preferences/ContributorRow.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/preferences/ContributorRow.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/ContributorRow.kt
index 79e510b76c..fd4f5e7d01 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/ContributorRow.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/ContributorRow.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/DockPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt
similarity index 94%
rename from lawnchair/src/com/lawnchair/ui/preferences/DockPreferences.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt
index c9e7a48f7b..c7fabdb965 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/DockPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/FolderPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt
similarity index 95%
rename from lawnchair/src/com/lawnchair/ui/preferences/FolderPreferences.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt
index 5ef25d56b1..e498666c19 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/FolderPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/GeneralPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/preferences/GeneralPreferences.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt
index 916dfbe68e..d7abcceaf8 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/GeneralPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.os.Build
 import androidx.compose.animation.AnimatedVisibility
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/HomeScreenPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/preferences/HomeScreenPreferences.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
index 0e1aadac4c..bce73d1c19 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/HomeScreenPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/IconPackPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreference.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/preferences/IconPackPreference.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/IconPackPreference.kt
index 8f5025c88e..c6cf19457c 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/IconPackPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreference.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.graphics.drawable.Drawable
 import androidx.compose.foundation.Image
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/LawnchairLink.kt b/lawnchair/src/app/lawnchair/ui/preferences/LawnchairLink.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/ui/preferences/LawnchairLink.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/LawnchairLink.kt
index 272843abf9..4a5e641c15 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/LawnchairLink.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/LawnchairLink.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/LibraryRow.kt b/lawnchair/src/app/lawnchair/ui/preferences/LibraryRow.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/ui/preferences/LibraryRow.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/LibraryRow.kt
index 755e60f784..4c23f9ab22 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/LibraryRow.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/LibraryRow.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/NavActionPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/NavActionPreference.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/ui/preferences/NavActionPreference.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/NavActionPreference.kt
index a2feddbbf7..34b9d74e00 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/NavActionPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/NavActionPreference.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/NotificationDotsPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/NotificationDotsPreference.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/preferences/NotificationDotsPreference.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/NotificationDotsPreference.kt
index f9c990b38c..492e86d06f 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/NotificationDotsPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/NotificationDotsPreference.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.ComponentName
 import android.content.Intent
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceActivity.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt
similarity index 85%
rename from lawnchair/src/com/lawnchair/ui/preferences/PreferenceActivity.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt
index f78def2ebd..ef4474a06d 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceActivity.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt
@@ -1,10 +1,10 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.animation.ExperimentalAnimationApi
-import com.lawnchair.ui.theme.LawnchairTheme
+import app.lawnchair.ui.theme.LawnchairTheme
 
 class PreferenceActivity : ComponentActivity() {
     @ExperimentalAnimationApi
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryLink.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryLink.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryLink.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryLink.kt
index 9e270a9834..3359760a87 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryLink.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryLink.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryList.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryList.kt
similarity index 94%
rename from lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryList.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryList.kt
index ad31c21199..c1ecd4702e 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryList.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryList.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceGroup.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceGroup.kt
similarity index 95%
rename from lawnchair/src/com/lawnchair/ui/preferences/PreferenceGroup.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/PreferenceGroup.kt
index d4152a38e9..2e2bed795c 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceGroup.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceGroup.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
@@ -7,7 +7,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import com.lawnchair.util.smartBorder
+import app.lawnchair.util.smartBorder
 
 @Composable
 fun PreferenceGroup(heading: String? = null, useTopPadding: Boolean = false, content: @Composable () -> Unit) {
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceInteractor.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceInteractor.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/ui/preferences/PreferenceInteractor.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/PreferenceInteractor.kt
index dbac14746f..111e5efce7 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceInteractor.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceInteractor.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.runtime.State
 
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceTemplate.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceTemplate.kt
similarity index 94%
rename from lawnchair/src/com/lawnchair/ui/preferences/PreferenceTemplate.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/PreferenceTemplate.kt
index d3fe19c8dd..90417535be 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/PreferenceTemplate.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceTemplate.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Divider
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/Preferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt
similarity index 99%
rename from lawnchair/src/com/lawnchair/ui/preferences/Preferences.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt
index 1b96298302..c27fb1e1ee 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/Preferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.app.Application
 import android.content.ComponentName
@@ -24,7 +24,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.lawnchair.util.preferences.PrefManager
+import app.lawnchair.util.preferences.PrefManager
 import com.android.launcher3.R
 import com.android.launcher3.notification.NotificationListener
 
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/SliderPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/SliderPreference.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/preferences/SliderPreference.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/SliderPreference.kt
index 8f0bf70b29..38240e57f2 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/SliderPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/SliderPreference.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/SwitchPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/ui/preferences/SwitchPreference.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt
index c9e10529f6..2437b1422d 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/SwitchPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/SystemUi.kt b/lawnchair/src/app/lawnchair/ui/preferences/SystemUi.kt
similarity index 92%
rename from lawnchair/src/com/lawnchair/ui/preferences/SystemUi.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/SystemUi.kt
index 319dce1647..96392e26ce 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/SystemUi.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/SystemUi.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.os.Build
 import android.view.View
@@ -7,7 +7,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.graphics.toArgb
-import com.lawnchair.ui.theme.LawnchairTheme
+import app.lawnchair.ui.theme.LawnchairTheme
 
 @Composable
 fun SystemUi(window: Window) =
diff --git a/lawnchair/src/com/lawnchair/ui/preferences/TopBar.kt b/lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/preferences/TopBar.kt
rename to lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt
index 12702fba96..81c2898d89 100644
--- a/lawnchair/src/com/lawnchair/ui/preferences/TopBar.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalAnimationApi
diff --git a/lawnchair/src/com/lawnchair/ui/theme/Color.kt b/lawnchair/src/app/lawnchair/ui/theme/Color.kt
similarity index 82%
rename from lawnchair/src/com/lawnchair/ui/theme/Color.kt
rename to lawnchair/src/app/lawnchair/ui/theme/Color.kt
index 2e7715ae57..ccfd63cf55 100644
--- a/lawnchair/src/com/lawnchair/ui/theme/Color.kt
+++ b/lawnchair/src/app/lawnchair/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.theme
+package app.lawnchair.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/lawnchair/src/com/lawnchair/ui/theme/Shape.kt b/lawnchair/src/app/lawnchair/ui/theme/Shape.kt
similarity index 89%
rename from lawnchair/src/com/lawnchair/ui/theme/Shape.kt
rename to lawnchair/src/app/lawnchair/ui/theme/Shape.kt
index 2a28820c4e..4acc789190 100644
--- a/lawnchair/src/com/lawnchair/ui/theme/Shape.kt
+++ b/lawnchair/src/app/lawnchair/ui/theme/Shape.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.theme
+package app.lawnchair.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes
diff --git a/lawnchair/src/com/lawnchair/ui/theme/Theme.kt b/lawnchair/src/app/lawnchair/ui/theme/Theme.kt
similarity index 96%
rename from lawnchair/src/com/lawnchair/ui/theme/Theme.kt
rename to lawnchair/src/app/lawnchair/ui/theme/Theme.kt
index 9ff8d98176..6d5896c02d 100644
--- a/lawnchair/src/com/lawnchair/ui/theme/Theme.kt
+++ b/lawnchair/src/app/lawnchair/ui/theme/Theme.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.theme
+package app.lawnchair.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme
diff --git a/lawnchair/src/com/lawnchair/ui/theme/Type.kt b/lawnchair/src/app/lawnchair/ui/theme/Type.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/ui/theme/Type.kt
rename to lawnchair/src/app/lawnchair/ui/theme/Type.kt
index e8f7e1bdd6..678d397cea 100644
--- a/lawnchair/src/com/lawnchair/ui/theme/Type.kt
+++ b/lawnchair/src/app/lawnchair/ui/theme/Type.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.ui.theme
+package app.lawnchair.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/lawnchair/src/com/lawnchair/util/LawnchairUtils.kt b/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/util/LawnchairUtils.kt
rename to lawnchair/src/app/lawnchair/util/LawnchairUtils.kt
index da795b7de1..6f8e244acf 100644
--- a/lawnchair/src/com/lawnchair/util/LawnchairUtils.kt
+++ b/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt
@@ -15,7 +15,7 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.lawnchair
+package app.lawnchair
 
 import android.content.Context
 import android.os.Looper
diff --git a/lawnchair/src/com/lawnchair/util/SingletonHolder.kt b/lawnchair/src/app/lawnchair/util/SingletonHolder.kt
similarity index 93%
rename from lawnchair/src/com/lawnchair/util/SingletonHolder.kt
rename to lawnchair/src/app/lawnchair/util/SingletonHolder.kt
index 8b359491ef..6f13ea06e2 100644
--- a/lawnchair/src/com/lawnchair/util/SingletonHolder.kt
+++ b/lawnchair/src/app/lawnchair/util/SingletonHolder.kt
@@ -15,11 +15,11 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.lawnchair.util
+package app.lawnchair.util
 
 import android.content.Context
-import com.lawnchair.ensureOnMainThread
-import com.lawnchair.useApplicationContext
+import app.lawnchair.ensureOnMainThread
+import app.lawnchair.useApplicationContext
 
 // Source: https://medium.com/@BladeCoder/kotlin-singletons-with-argument-194ef06edd9e
 open class SingletonHolder<out T, in A>(creator: (A) -> T) {
diff --git a/lawnchair/src/com/lawnchair/util/SmartBorder.kt b/lawnchair/src/app/lawnchair/util/SmartBorder.kt
similarity index 99%
rename from lawnchair/src/com/lawnchair/util/SmartBorder.kt
rename to lawnchair/src/app/lawnchair/util/SmartBorder.kt
index 7168b37bd3..b628ba15fe 100644
--- a/lawnchair/src/com/lawnchair/util/SmartBorder.kt
+++ b/lawnchair/src/app/lawnchair/util/SmartBorder.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.util
+package app.lawnchair.util
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.ui.Modifier
diff --git a/lawnchair/src/com/lawnchair/util/preferences/Delegates.kt b/lawnchair/src/app/lawnchair/util/preferences/Delegates.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/util/preferences/Delegates.kt
rename to lawnchair/src/app/lawnchair/util/preferences/Delegates.kt
index b9a20b72db..d525d17a75 100644
--- a/lawnchair/src/com/lawnchair/util/preferences/Delegates.kt
+++ b/lawnchair/src/app/lawnchair/util/preferences/Delegates.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.util.preferences
+package app.lawnchair.util.preferences
 
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
diff --git a/lawnchair/src/com/lawnchair/util/preferences/LawnchairPreferences.kt b/lawnchair/src/app/lawnchair/util/preferences/LawnchairPreferences.kt
similarity index 98%
rename from lawnchair/src/com/lawnchair/util/preferences/LawnchairPreferences.kt
rename to lawnchair/src/app/lawnchair/util/preferences/LawnchairPreferences.kt
index ec9dfb3377..ff2a4c21e4 100644
--- a/lawnchair/src/com/lawnchair/util/preferences/LawnchairPreferences.kt
+++ b/lawnchair/src/app/lawnchair/util/preferences/LawnchairPreferences.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.util.preferences
+package app.lawnchair.util.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/lawnchair/src/com/lawnchair/util/preferences/PrefManager.kt b/lawnchair/src/app/lawnchair/util/preferences/PrefManager.kt
similarity index 97%
rename from lawnchair/src/com/lawnchair/util/preferences/PrefManager.kt
rename to lawnchair/src/app/lawnchair/util/preferences/PrefManager.kt
index 561b7c7dfa..8630b81af7 100644
--- a/lawnchair/src/com/lawnchair/util/preferences/PrefManager.kt
+++ b/lawnchair/src/app/lawnchair/util/preferences/PrefManager.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.util.preferences
+package app.lawnchair.util.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/lawnchair/src/com/lawnchair/util/preferences/Versioning.kt b/lawnchair/src/app/lawnchair/util/preferences/Versioning.kt
similarity index 94%
rename from lawnchair/src/com/lawnchair/util/preferences/Versioning.kt
rename to lawnchair/src/app/lawnchair/util/preferences/Versioning.kt
index ee6cabf9a3..7a99659a54 100644
--- a/lawnchair/src/com/lawnchair/util/preferences/Versioning.kt
+++ b/lawnchair/src/app/lawnchair/util/preferences/Versioning.kt
@@ -1,4 +1,4 @@
-package com.lawnchair.util.preferences
+package app.lawnchair.util.preferences
 
 import android.content.Context
 import android.content.pm.PackageInfo
diff --git a/lawnchair/src/com/google/android/libraries/launcherclient/BaseClientService.java b/lawnchair/src/com/google/android/libraries/launcherclient/BaseClientService.java
index 6f72d3db7e..c70d818dd7 100644
--- a/lawnchair/src/com/google/android/libraries/launcherclient/BaseClientService.java
+++ b/lawnchair/src/com/google/android/libraries/launcherclient/BaseClientService.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.util.Log;
-import com.lawnchair.FeedBridge;
+import app.lawnchair.FeedBridge;
 
 public class BaseClientService implements ServiceConnection {
     private boolean mConnected;
diff --git a/lawnchair/src/com/google/android/libraries/launcherclient/LauncherClient.java b/lawnchair/src/com/google/android/libraries/launcherclient/LauncherClient.java
index 8a1c826021..47285aad54 100644
--- a/lawnchair/src/com/google/android/libraries/launcherclient/LauncherClient.java
+++ b/lawnchair/src/com/google/android/libraries/launcherclient/LauncherClient.java
@@ -20,8 +20,8 @@ import android.util.Log;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
-import com.lawnchair.FeedBridge;
-import com.lawnchair.FeedBridge.BridgeInfo;
+import app.lawnchair.FeedBridge;
+import app.lawnchair.FeedBridge.BridgeInfo;
 import java.lang.ref.WeakReference;
 
 public class LauncherClient {
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index d7ae3affa1..4fc2f5ddb4 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -43,7 +43,7 @@
         attributes and intent filters the same
         -->
         <activity
-            android:name="com.lawnchair.LawnchairLauncherQuickstep"
+            android:name="app.lawnchair.LawnchairLauncherQuickstep"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 19dd2706c0..33091e7bcf 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -62,7 +62,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import com.lawnchair.util.preferences.LawnchairPreferences;
+import app.lawnchair.util.preferences.LawnchairPreferences;
 
 public class InvariantDeviceProfile {
 
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index deb04f080b..c643843ca8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -201,7 +201,7 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import com.lawnchair.util.preferences.LawnchairPreferences;
+import app.lawnchair.util.preferences.LawnchairPreferences;
 
 /**
  * Default launcher application.
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 2718486b82..0fa240debd 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -118,7 +118,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.function.Predicate;
 
-import com.lawnchair.util.preferences.LawnchairPreferences;
+import app.lawnchair.util.preferences.LawnchairPreferences;
 
 /**
  * The workspace is a wide area with a wallpaper and a finite number of pages.