From ff5ae4ba5705beb979b25855789cdcabfe4542b9 Mon Sep 17 00:00:00 2001
From: Patryk Michalik <contact@patrykmichalik.com>
Date: Sun, 21 Mar 2021 18:18:42 +0100
Subject: [PATCH] Change application ID to `com.lawnchair`

---
 AndroidManifest.xml                                       | 2 +-
 build.gradle                                              | 2 +-
 gradle/wrapper/gradle-wrapper.properties                  | 5 ++---
 lawnchair/AndroidManifest.xml                             | 4 ++--
 lawnchair/res/layout/search_container_all_apps.xml        | 6 +++---
 lawnchair/res/layout/search_container_workspace.xml       | 6 +++---
 lawnchair/res/values/config.xml                           | 2 +-
 .../libraries/launcherclient/BaseClientService.java       | 2 +-
 .../android/libraries/launcherclient/LauncherClient.java  | 4 ++--
 .../src/{ch/deletescape => com}/lawnchair/FeedBridge.kt   | 8 ++++----
 .../deletescape => com}/lawnchair/LawnchairLauncher.java  | 4 ++--
 .../lawnchair/LawnchairLauncherQuickstep.java             | 4 ++--
 .../lawnchair}/nexuslauncher/HotseatQsb.kt                | 2 +-
 .../lawnchair}/nexuslauncher/OverlayCallbackImpl.java     | 8 ++++----
 .../lawnchair}/nexuslauncher/SmartSpaceHostView.kt        | 2 +-
 .../lawnchair}/nexuslauncher/SmartspaceQsb.kt             | 2 +-
 .../{ch/deletescape => com}/lawnchair/ui/LawnchairApp.kt  | 3 +--
 .../deletescape => com}/lawnchair/ui/preferences/About.kt | 4 ++--
 .../lawnchair/ui/preferences/AppDrawerPreferences.kt      | 2 +-
 .../lawnchair/ui/preferences/ContributorCard.kt           | 5 +----
 .../lawnchair/ui/preferences/ContributorLink.kt           | 2 +-
 .../lawnchair/ui/preferences/ContributorRow.kt            | 2 +-
 .../lawnchair/ui/preferences/DockPreferences.kt           | 2 +-
 .../lawnchair/ui/preferences/FolderPreferences.kt         | 2 +-
 .../lawnchair/ui/preferences/GeneralPreferences.kt        | 2 +-
 .../lawnchair/ui/preferences/HomeScreenPreferences.kt     | 2 +-
 .../lawnchair/ui/preferences/IconPackPreference.kt        | 2 +-
 .../lawnchair/ui/preferences/LawnchairLink.kt             | 2 +-
 .../lawnchair/ui/preferences/LibraryRow.kt                | 2 +-
 .../lawnchair/ui/preferences/NavActionPreference.kt       | 2 +-
 .../ui/preferences/NotificationDotsPreference.kt          | 2 +-
 .../lawnchair/ui/preferences/PreferenceActivity.kt        | 4 ++--
 .../lawnchair/ui/preferences/PreferenceCategoryLink.kt    | 2 +-
 .../lawnchair/ui/preferences/PreferenceCategoryList.kt    | 2 +-
 .../lawnchair/ui/preferences/PreferenceGroup.kt           | 4 ++--
 .../lawnchair/ui/preferences/PreferenceInteractor.kt      | 2 +-
 .../lawnchair/ui/preferences/PreferenceTemplate.kt        | 2 +-
 .../lawnchair/ui/preferences/Preferences.kt               | 4 ++--
 .../lawnchair/ui/preferences/SliderPreference.kt          | 2 +-
 .../lawnchair/ui/preferences/SwitchPreference.kt          | 2 +-
 .../lawnchair/ui/preferences/SystemUi.kt                  | 4 ++--
 .../lawnchair/ui/preferences/TopBar.kt                    | 5 +----
 .../{ch/deletescape => com}/lawnchair/ui/theme/Color.kt   | 2 +-
 .../{ch/deletescape => com}/lawnchair/ui/theme/Shape.kt   | 2 +-
 .../{ch/deletescape => com}/lawnchair/ui/theme/Theme.kt   | 2 +-
 .../{ch/deletescape => com}/lawnchair/ui/theme/Type.kt    | 2 +-
 .../deletescape => com}/lawnchair/util/LawnchairUtils.kt  | 2 +-
 .../deletescape => com}/lawnchair/util/SingletonHolder.kt | 6 +++---
 .../{ch/deletescape => com}/lawnchair/util/SmartBorder.kt | 2 +-
 .../lawnchair/util/preferences/Delegates.kt               | 2 +-
 .../lawnchair/util/preferences/LawnchairPreferences.kt    | 3 +--
 .../lawnchair/util/preferences/PrefManager.kt             | 2 +-
 .../lawnchair/util/preferences/Versioning.kt              | 2 +-
 quickstep/AndroidManifest-launcher.xml                    | 2 +-
 src/com/android/launcher3/InvariantDeviceProfile.java     | 2 +-
 src/com/android/launcher3/Launcher.java                   | 2 +-
 src/com/android/launcher3/Workspace.java                  | 2 +-
 57 files changed, 79 insertions(+), 88 deletions(-)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/FeedBridge.kt (96%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/LawnchairLauncher.java (75%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/LawnchairLauncherQuickstep.java (78%)
 rename lawnchair/src/{ch/deletescape => com/lawnchair}/nexuslauncher/HotseatQsb.kt (99%)
 rename lawnchair/src/{ch/deletescape => com/lawnchair}/nexuslauncher/OverlayCallbackImpl.java (95%)
 rename lawnchair/src/{ch/deletescape => com/lawnchair}/nexuslauncher/SmartSpaceHostView.kt (99%)
 rename lawnchair/src/{ch/deletescape => com/lawnchair}/nexuslauncher/SmartspaceQsb.kt (98%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/LawnchairApp.kt (98%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/About.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/AppDrawerPreferences.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/ContributorCard.kt (91%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/ContributorLink.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/ContributorRow.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/DockPreferences.kt (93%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/FolderPreferences.kt (94%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/GeneralPreferences.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/HomeScreenPreferences.kt (98%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/IconPackPreference.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/LawnchairLink.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/LibraryRow.kt (96%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/NavActionPreference.kt (96%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/NotificationDotsPreference.kt (98%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/PreferenceActivity.kt (82%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/PreferenceCategoryLink.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/PreferenceCategoryList.kt (92%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/PreferenceGroup.kt (94%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/PreferenceInteractor.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/PreferenceTemplate.kt (93%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/Preferences.kt (98%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/SliderPreference.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/SwitchPreference.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/SystemUi.kt (90%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/preferences/TopBar.kt (94%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/theme/Color.kt (77%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/theme/Shape.kt (86%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/theme/Theme.kt (95%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/ui/theme/Type.kt (98%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/util/LawnchairUtils.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/util/SingletonHolder.kt (92%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/util/SmartBorder.kt (99%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/util/preferences/Delegates.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/util/preferences/LawnchairPreferences.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/util/preferences/PrefManager.kt (97%)
 rename lawnchair/src/{ch/deletescape => com}/lawnchair/util/preferences/Versioning.kt (92%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 12f8f9ae34..16d722aab0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,7 +43,7 @@
         attributes and intent filters the same
         -->
         <activity
-            android:name="ch.deletescape.lawnchair.LawnchairLauncher"
+            android:name="com.lawnchair.LawnchairLauncher"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"
diff --git a/build.gradle b/build.gradle
index 50c505c2a7..0f6dce4bc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -118,7 +118,7 @@ android {
 
         lawn {
             dimension "app"
-            applicationId 'ch.deletescape.lawnchair'
+            applicationId 'com.lawnchair'
             testApplicationId 'com.android.launcher3.tests'
         }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 23f68ce849..442d9132ea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Mar 17 10:48:42 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/lawnchair/AndroidManifest.xml b/lawnchair/AndroidManifest.xml
index c8877a468b..ec8a183472 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="ch.deletescape.lawnchair.ui.LawnchairApp">
+    <application android:name="com.lawnchair.ui.LawnchairApp">
         <activity
-            android:name="ch.deletescape.lawnchair.ui.preferences.PreferenceActivity"
+            android:name="com.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 729a87d990..ccbaab06d1 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"?>
-<ch.deletescape.nexuslauncher.HotseatQsb
+<com.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="ch.deletescape.nexuslauncher.HotseatQsb$HotseatQsbFragment"
+        android:name="com.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" />
-</ch.deletescape.nexuslauncher.HotseatQsb>
+</com.lawnchair.nexuslauncher.HotseatQsb>
diff --git a/lawnchair/res/layout/search_container_workspace.xml b/lawnchair/res/layout/search_container_workspace.xml
index 31342acced..47e60490f2 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"?>
-<ch.deletescape.nexuslauncher.SmartspaceQsb
+<com.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="ch.deletescape.nexuslauncher.SmartspaceQsb$SmartSpaceFragment"
+        android:name="com.lawnchair.nexuslauncher.SmartspaceQsb$SmartSpaceFragment"
         android:layout_width="match_parent"
         android:tag="smart_space_view"
         android:layout_height="match_parent"
         tools:ignore="FragmentTagUsage" />
 
-</ch.deletescape.nexuslauncher.SmartspaceQsb>
\ No newline at end of file
+</com.lawnchair.nexuslauncher.SmartspaceQsb>
\ No newline at end of file
diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml
index a72065e2a6..644b30da49 100644
--- a/lawnchair/res/values/config.xml
+++ b/lawnchair/res/values/config.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="settings_fragment_name" translatable="false">ch.deletescape.lawnchair.settings.ui.SettingsActivity$LauncherSettingsFragment</string>
+    <string name="settings_fragment_name" translatable="false">com.lawnchair.settings.ui.SettingsActivity$LauncherSettingsFragment</string>
 </resources>
\ No newline at end of file
diff --git a/lawnchair/src/com/google/android/libraries/launcherclient/BaseClientService.java b/lawnchair/src/com/google/android/libraries/launcherclient/BaseClientService.java
index 2e2cdabbe3..6f72d3db7e 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 ch.deletescape.lawnchair.FeedBridge;
+import com.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 10cac18390..8a1c826021 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 ch.deletescape.lawnchair.FeedBridge;
-import ch.deletescape.lawnchair.FeedBridge.BridgeInfo;
+import com.lawnchair.FeedBridge;
+import com.lawnchair.FeedBridge.BridgeInfo;
 import java.lang.ref.WeakReference;
 
 public class LauncherClient {
diff --git a/lawnchair/src/ch/deletescape/lawnchair/FeedBridge.kt b/lawnchair/src/com/lawnchair/FeedBridge.kt
similarity index 96%
rename from lawnchair/src/ch/deletescape/lawnchair/FeedBridge.kt
rename to lawnchair/src/com/lawnchair/FeedBridge.kt
index 17f9114dc7..a3a47ca604 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/FeedBridge.kt
+++ b/lawnchair/src/com/lawnchair/FeedBridge.kt
@@ -15,7 +15,7 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ch.deletescape.lawnchair
+package com.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 ch.deletescape.lawnchair.util.SingletonHolder
-import ch.deletescape.lawnchair.util.preferences.LawnchairPreferences
+import com.lawnchair.util.SingletonHolder
+import com.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("ch.deletescape.lawnchair.lawnfeed", R.integer.lawnfeed_signature_hash)
+            BridgeInfo("com.lawnchair.lawnfeed", R.integer.lawnfeed_signature_hash)
         )
     }
 
diff --git a/lawnchair/src/ch/deletescape/lawnchair/LawnchairLauncher.java b/lawnchair/src/com/lawnchair/LawnchairLauncher.java
similarity index 75%
rename from lawnchair/src/ch/deletescape/lawnchair/LawnchairLauncher.java
rename to lawnchair/src/com/lawnchair/LawnchairLauncher.java
index b83c2bab2c..db9cc1d289 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/LawnchairLauncher.java
+++ b/lawnchair/src/com/lawnchair/LawnchairLauncher.java
@@ -1,9 +1,9 @@
-package ch.deletescape.lawnchair;
+package com.lawnchair;
 
 import com.android.launcher3.Launcher;
 import com.android.systemui.plugins.shared.LauncherOverlayManager;
 
-import ch.deletescape.nexuslauncher.OverlayCallbackImpl;
+import com.lawnchair.nexuslauncher.OverlayCallbackImpl;
 
 public class LawnchairLauncher extends Launcher {
     @Override
diff --git a/lawnchair/src/ch/deletescape/lawnchair/LawnchairLauncherQuickstep.java b/lawnchair/src/com/lawnchair/LawnchairLauncherQuickstep.java
similarity index 78%
rename from lawnchair/src/ch/deletescape/lawnchair/LawnchairLauncherQuickstep.java
rename to lawnchair/src/com/lawnchair/LawnchairLauncherQuickstep.java
index bb3a70cff0..0495400329 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/LawnchairLauncherQuickstep.java
+++ b/lawnchair/src/com/lawnchair/LawnchairLauncherQuickstep.java
@@ -1,9 +1,9 @@
-package ch.deletescape.lawnchair;
+package com.lawnchair;
 
 import com.android.launcher3.uioverrides.QuickstepLauncher;
 import com.android.systemui.plugins.shared.LauncherOverlayManager;
 
-import ch.deletescape.nexuslauncher.OverlayCallbackImpl;
+import com.lawnchair.nexuslauncher.OverlayCallbackImpl;
 
 public class LawnchairLauncherQuickstep extends QuickstepLauncher {
     @Override
diff --git a/lawnchair/src/ch/deletescape/nexuslauncher/HotseatQsb.kt b/lawnchair/src/com/lawnchair/nexuslauncher/HotseatQsb.kt
similarity index 99%
rename from lawnchair/src/ch/deletescape/nexuslauncher/HotseatQsb.kt
rename to lawnchair/src/com/lawnchair/nexuslauncher/HotseatQsb.kt
index a7888963e0..865215b210 100644
--- a/lawnchair/src/ch/deletescape/nexuslauncher/HotseatQsb.kt
+++ b/lawnchair/src/com/lawnchair/nexuslauncher/HotseatQsb.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.nexuslauncher
+package com.lawnchair.nexuslauncher
 
 import android.content.Context
 import android.graphics.Rect
diff --git a/lawnchair/src/ch/deletescape/nexuslauncher/OverlayCallbackImpl.java b/lawnchair/src/com/lawnchair/nexuslauncher/OverlayCallbackImpl.java
similarity index 95%
rename from lawnchair/src/ch/deletescape/nexuslauncher/OverlayCallbackImpl.java
rename to lawnchair/src/com/lawnchair/nexuslauncher/OverlayCallbackImpl.java
index 55b945b73e..46491c1c62 100644
--- a/lawnchair/src/ch/deletescape/nexuslauncher/OverlayCallbackImpl.java
+++ b/lawnchair/src/com/lawnchair/nexuslauncher/OverlayCallbackImpl.java
@@ -1,6 +1,6 @@
-package ch.deletescape.nexuslauncher;
+package com.lawnchair.nexuslauncher;
 
-import static ch.deletescape.lawnchair.util.preferences.LawnchairPreferences.ENABLE_MINUS_ONE;
+import static com.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 ch.deletescape.lawnchair.FeedBridge;
-import ch.deletescape.lawnchair.util.preferences.LawnchairPreferences;
+import com.lawnchair.FeedBridge;
+import com.lawnchair.util.preferences.LawnchairPreferences;
 
 /**
  * Implements {@link LauncherOverlay} and passes all the corresponding events to {@link
diff --git a/lawnchair/src/ch/deletescape/nexuslauncher/SmartSpaceHostView.kt b/lawnchair/src/com/lawnchair/nexuslauncher/SmartSpaceHostView.kt
similarity index 99%
rename from lawnchair/src/ch/deletescape/nexuslauncher/SmartSpaceHostView.kt
rename to lawnchair/src/com/lawnchair/nexuslauncher/SmartSpaceHostView.kt
index 3631a225cd..9e9378bb31 100644
--- a/lawnchair/src/ch/deletescape/nexuslauncher/SmartSpaceHostView.kt
+++ b/lawnchair/src/com/lawnchair/nexuslauncher/SmartSpaceHostView.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.nexuslauncher
+package com.lawnchair.nexuslauncher
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/lawnchair/src/ch/deletescape/nexuslauncher/SmartspaceQsb.kt b/lawnchair/src/com/lawnchair/nexuslauncher/SmartspaceQsb.kt
similarity index 98%
rename from lawnchair/src/ch/deletescape/nexuslauncher/SmartspaceQsb.kt
rename to lawnchair/src/com/lawnchair/nexuslauncher/SmartspaceQsb.kt
index 0e1fc491af..4278c8cca4 100644
--- a/lawnchair/src/ch/deletescape/nexuslauncher/SmartspaceQsb.kt
+++ b/lawnchair/src/com/lawnchair/nexuslauncher/SmartspaceQsb.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.nexuslauncher
+package com.lawnchair.nexuslauncher
 
 import android.annotation.SuppressLint
 import android.appwidget.AppWidgetManager
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/LawnchairApp.kt b/lawnchair/src/com/lawnchair/ui/LawnchairApp.kt
similarity index 98%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/LawnchairApp.kt
rename to lawnchair/src/com/lawnchair/ui/LawnchairApp.kt
index 01557498ec..760a3f7ff5 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/LawnchairApp.kt
+++ b/lawnchair/src/com/lawnchair/ui/LawnchairApp.kt
@@ -15,13 +15,12 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ch.deletescape.lawnchair.ui
+package com.lawnchair.ui
 
 import android.app.Activity
 import android.app.Application
 import android.content.ComponentName
 import android.content.Context
-import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/About.kt b/lawnchair/src/com/lawnchair/ui/preferences/About.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/About.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/About.kt
index 8e7ce7665d..c8e31c03e1 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/About.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/About.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.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 ch.deletescape.lawnchair.util.preferences.getFormattedVersionName
+import com.lawnchair.util.preferences.getFormattedVersionName
 import com.android.launcher3.R
 
 @Composable
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/AppDrawerPreferences.kt b/lawnchair/src/com/lawnchair/ui/preferences/AppDrawerPreferences.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/AppDrawerPreferences.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/AppDrawerPreferences.kt
index 22e332256c..0367e7e877 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/AppDrawerPreferences.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/AppDrawerPreferences.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/ContributorCard.kt b/lawnchair/src/com/lawnchair/ui/preferences/ContributorCard.kt
similarity index 91%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/ContributorCard.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/ContributorCard.kt
index 91ba6206a1..76a155f1be 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/ContributorCard.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/ContributorCard.kt
@@ -1,19 +1,16 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/ContributorLink.kt b/lawnchair/src/com/lawnchair/ui/preferences/ContributorLink.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/ContributorLink.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/ContributorLink.kt
index d09345132f..f15a95992b 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/ContributorLink.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/ContributorLink.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/ContributorRow.kt b/lawnchair/src/com/lawnchair/ui/preferences/ContributorRow.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/ContributorRow.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/ContributorRow.kt
index 50d3c1f563..79e510b76c 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/ContributorRow.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/ContributorRow.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/DockPreferences.kt b/lawnchair/src/com/lawnchair/ui/preferences/DockPreferences.kt
similarity index 93%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/DockPreferences.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/DockPreferences.kt
index 8352e0d8a7..c9e7a48f7b 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/DockPreferences.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/DockPreferences.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/FolderPreferences.kt b/lawnchair/src/com/lawnchair/ui/preferences/FolderPreferences.kt
similarity index 94%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/FolderPreferences.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/FolderPreferences.kt
index 8966fc023a..5ef25d56b1 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/FolderPreferences.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/FolderPreferences.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/GeneralPreferences.kt b/lawnchair/src/com/lawnchair/ui/preferences/GeneralPreferences.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/GeneralPreferences.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/GeneralPreferences.kt
index 498e154e0c..916dfbe68e 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/GeneralPreferences.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/GeneralPreferences.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import android.os.Build
 import androidx.compose.animation.AnimatedVisibility
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/HomeScreenPreferences.kt b/lawnchair/src/com/lawnchair/ui/preferences/HomeScreenPreferences.kt
similarity index 98%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/HomeScreenPreferences.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/HomeScreenPreferences.kt
index 428a09f508..0e1aadac4c 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/HomeScreenPreferences.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/HomeScreenPreferences.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/IconPackPreference.kt b/lawnchair/src/com/lawnchair/ui/preferences/IconPackPreference.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/IconPackPreference.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/IconPackPreference.kt
index b3e2d5a847..8f5025c88e 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/IconPackPreference.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/IconPackPreference.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import android.graphics.drawable.Drawable
 import androidx.compose.foundation.Image
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/LawnchairLink.kt b/lawnchair/src/com/lawnchair/ui/preferences/LawnchairLink.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/LawnchairLink.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/LawnchairLink.kt
index 0fbf37ea11..272843abf9 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/LawnchairLink.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/LawnchairLink.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/LibraryRow.kt b/lawnchair/src/com/lawnchair/ui/preferences/LibraryRow.kt
similarity index 96%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/LibraryRow.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/LibraryRow.kt
index 6625cad37b..755e60f784 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/LibraryRow.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/LibraryRow.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/NavActionPreference.kt b/lawnchair/src/com/lawnchair/ui/preferences/NavActionPreference.kt
similarity index 96%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/NavActionPreference.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/NavActionPreference.kt
index b3bcab8615..a2feddbbf7 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/NavActionPreference.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/NavActionPreference.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/NotificationDotsPreference.kt b/lawnchair/src/com/lawnchair/ui/preferences/NotificationDotsPreference.kt
similarity index 98%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/NotificationDotsPreference.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/NotificationDotsPreference.kt
index 3d67e7db25..f9c990b38c 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/NotificationDotsPreference.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/NotificationDotsPreference.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import android.content.ComponentName
 import android.content.Intent
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceActivity.kt b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceActivity.kt
similarity index 82%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceActivity.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/PreferenceActivity.kt
index fc3c3a0c8c..f78def2ebd 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceActivity.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceActivity.kt
@@ -1,10 +1,10 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.animation.ExperimentalAnimationApi
-import ch.deletescape.lawnchair.ui.theme.LawnchairTheme
+import com.lawnchair.ui.theme.LawnchairTheme
 
 class PreferenceActivity : ComponentActivity() {
     @ExperimentalAnimationApi
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceCategoryLink.kt b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryLink.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceCategoryLink.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryLink.kt
index 765f7be3f4..9e270a9834 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceCategoryLink.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryLink.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceCategoryList.kt b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryList.kt
similarity index 92%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceCategoryList.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryList.kt
index 6a8d210cf4..ad31c21199 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceCategoryList.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceCategoryList.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceGroup.kt b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceGroup.kt
similarity index 94%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceGroup.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/PreferenceGroup.kt
index e65633a1f3..d4152a38e9 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceGroup.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceGroup.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.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 ch.deletescape.lawnchair.util.smartBorder
+import com.lawnchair.util.smartBorder
 
 @Composable
 fun PreferenceGroup(heading: String? = null, useTopPadding: Boolean = false, content: @Composable () -> Unit) {
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceInteractor.kt b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceInteractor.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceInteractor.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/PreferenceInteractor.kt
index 099eacbd64..dbac14746f 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceInteractor.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceInteractor.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.runtime.State
 
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceTemplate.kt b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceTemplate.kt
similarity index 93%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceTemplate.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/PreferenceTemplate.kt
index a80db857bb..d3fe19c8dd 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/PreferenceTemplate.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/PreferenceTemplate.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Divider
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/Preferences.kt b/lawnchair/src/com/lawnchair/ui/preferences/Preferences.kt
similarity index 98%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/Preferences.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/Preferences.kt
index b08aab674f..1b96298302 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/Preferences.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/Preferences.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.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 ch.deletescape.lawnchair.util.preferences.PrefManager
+import com.lawnchair.util.preferences.PrefManager
 import com.android.launcher3.R
 import com.android.launcher3.notification.NotificationListener
 
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/SliderPreference.kt b/lawnchair/src/com/lawnchair/ui/preferences/SliderPreference.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/SliderPreference.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/SliderPreference.kt
index 4bc99a2b2a..8f0bf70b29 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/SliderPreference.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/SliderPreference.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/SwitchPreference.kt b/lawnchair/src/com/lawnchair/ui/preferences/SwitchPreference.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/SwitchPreference.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/SwitchPreference.kt
index 39e02c6071..c9e10529f6 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/SwitchPreference.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/SwitchPreference.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/SystemUi.kt b/lawnchair/src/com/lawnchair/ui/preferences/SystemUi.kt
similarity index 90%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/SystemUi.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/SystemUi.kt
index 2be63c72f7..319dce1647 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/SystemUi.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/SystemUi.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.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 ch.deletescape.lawnchair.ui.theme.LawnchairTheme
+import com.lawnchair.ui.theme.LawnchairTheme
 
 @Composable
 fun SystemUi(window: Window) =
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/TopBar.kt b/lawnchair/src/com/lawnchair/ui/preferences/TopBar.kt
similarity index 94%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/preferences/TopBar.kt
rename to lawnchair/src/com/lawnchair/ui/preferences/TopBar.kt
index b8dbfeafd1..12702fba96 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/preferences/TopBar.kt
+++ b/lawnchair/src/com/lawnchair/ui/preferences/TopBar.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.preferences
+package com.lawnchair.ui.preferences
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalAnimationApi
@@ -7,11 +7,8 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/theme/Color.kt b/lawnchair/src/com/lawnchair/ui/theme/Color.kt
similarity index 77%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/theme/Color.kt
rename to lawnchair/src/com/lawnchair/ui/theme/Color.kt
index e06b55077a..2e7715ae57 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/theme/Color.kt
+++ b/lawnchair/src/com/lawnchair/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.theme
+package com.lawnchair.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/theme/Shape.kt b/lawnchair/src/com/lawnchair/ui/theme/Shape.kt
similarity index 86%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/theme/Shape.kt
rename to lawnchair/src/com/lawnchair/ui/theme/Shape.kt
index 0f22d2ccaa..2a28820c4e 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/theme/Shape.kt
+++ b/lawnchair/src/com/lawnchair/ui/theme/Shape.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.theme
+package com.lawnchair.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/theme/Theme.kt b/lawnchair/src/com/lawnchair/ui/theme/Theme.kt
similarity index 95%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/theme/Theme.kt
rename to lawnchair/src/com/lawnchair/ui/theme/Theme.kt
index 2720a4bbea..9ff8d98176 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/theme/Theme.kt
+++ b/lawnchair/src/com/lawnchair/ui/theme/Theme.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.theme
+package com.lawnchair.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme
diff --git a/lawnchair/src/ch/deletescape/lawnchair/ui/theme/Type.kt b/lawnchair/src/com/lawnchair/ui/theme/Type.kt
similarity index 98%
rename from lawnchair/src/ch/deletescape/lawnchair/ui/theme/Type.kt
rename to lawnchair/src/com/lawnchair/ui/theme/Type.kt
index 381f6ac339..e8f7e1bdd6 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/ui/theme/Type.kt
+++ b/lawnchair/src/com/lawnchair/ui/theme/Type.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.ui.theme
+package com.lawnchair.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/lawnchair/src/ch/deletescape/lawnchair/util/LawnchairUtils.kt b/lawnchair/src/com/lawnchair/util/LawnchairUtils.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/util/LawnchairUtils.kt
rename to lawnchair/src/com/lawnchair/util/LawnchairUtils.kt
index 1a3e989216..da795b7de1 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/util/LawnchairUtils.kt
+++ b/lawnchair/src/com/lawnchair/util/LawnchairUtils.kt
@@ -15,7 +15,7 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ch.deletescape.lawnchair
+package com.lawnchair
 
 import android.content.Context
 import android.os.Looper
diff --git a/lawnchair/src/ch/deletescape/lawnchair/util/SingletonHolder.kt b/lawnchair/src/com/lawnchair/util/SingletonHolder.kt
similarity index 92%
rename from lawnchair/src/ch/deletescape/lawnchair/util/SingletonHolder.kt
rename to lawnchair/src/com/lawnchair/util/SingletonHolder.kt
index 6eb6cbee53..8b359491ef 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/util/SingletonHolder.kt
+++ b/lawnchair/src/com/lawnchair/util/SingletonHolder.kt
@@ -15,11 +15,11 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ch.deletescape.lawnchair.util
+package com.lawnchair.util
 
 import android.content.Context
-import ch.deletescape.lawnchair.ensureOnMainThread
-import ch.deletescape.lawnchair.useApplicationContext
+import com.lawnchair.ensureOnMainThread
+import com.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/ch/deletescape/lawnchair/util/SmartBorder.kt b/lawnchair/src/com/lawnchair/util/SmartBorder.kt
similarity index 99%
rename from lawnchair/src/ch/deletescape/lawnchair/util/SmartBorder.kt
rename to lawnchair/src/com/lawnchair/util/SmartBorder.kt
index 838ed7c8b5..7168b37bd3 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/util/SmartBorder.kt
+++ b/lawnchair/src/com/lawnchair/util/SmartBorder.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.util
+package com.lawnchair.util
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.ui.Modifier
diff --git a/lawnchair/src/ch/deletescape/lawnchair/util/preferences/Delegates.kt b/lawnchair/src/com/lawnchair/util/preferences/Delegates.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/util/preferences/Delegates.kt
rename to lawnchair/src/com/lawnchair/util/preferences/Delegates.kt
index b64d8b6e0d..b9a20b72db 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/util/preferences/Delegates.kt
+++ b/lawnchair/src/com/lawnchair/util/preferences/Delegates.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.util.preferences
+package com.lawnchair.util.preferences
 
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
diff --git a/lawnchair/src/ch/deletescape/lawnchair/util/preferences/LawnchairPreferences.kt b/lawnchair/src/com/lawnchair/util/preferences/LawnchairPreferences.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/util/preferences/LawnchairPreferences.kt
rename to lawnchair/src/com/lawnchair/util/preferences/LawnchairPreferences.kt
index f30d7b33ff..ec9dfb3377 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/util/preferences/LawnchairPreferences.kt
+++ b/lawnchair/src/com/lawnchair/util/preferences/LawnchairPreferences.kt
@@ -1,8 +1,7 @@
-package ch.deletescape.lawnchair.util.preferences
+package com.lawnchair.util.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
 import com.android.launcher3.LauncherAppState
 import com.android.launcher3.Utilities
 
diff --git a/lawnchair/src/ch/deletescape/lawnchair/util/preferences/PrefManager.kt b/lawnchair/src/com/lawnchair/util/preferences/PrefManager.kt
similarity index 97%
rename from lawnchair/src/ch/deletescape/lawnchair/util/preferences/PrefManager.kt
rename to lawnchair/src/com/lawnchair/util/preferences/PrefManager.kt
index 70517d4bb5..561b7c7dfa 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/util/preferences/PrefManager.kt
+++ b/lawnchair/src/com/lawnchair/util/preferences/PrefManager.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.util.preferences
+package com.lawnchair.util.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/lawnchair/src/ch/deletescape/lawnchair/util/preferences/Versioning.kt b/lawnchair/src/com/lawnchair/util/preferences/Versioning.kt
similarity index 92%
rename from lawnchair/src/ch/deletescape/lawnchair/util/preferences/Versioning.kt
rename to lawnchair/src/com/lawnchair/util/preferences/Versioning.kt
index e2aa614d13..ee6cabf9a3 100644
--- a/lawnchair/src/ch/deletescape/lawnchair/util/preferences/Versioning.kt
+++ b/lawnchair/src/com/lawnchair/util/preferences/Versioning.kt
@@ -1,4 +1,4 @@
-package ch.deletescape.lawnchair.util.preferences
+package com.lawnchair.util.preferences
 
 import android.content.Context
 import android.content.pm.PackageInfo
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index 7ad64881b0..d7ae3affa1 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -43,7 +43,7 @@
         attributes and intent filters the same
         -->
         <activity
-            android:name="ch.deletescape.lawnchair.LawnchairLauncherQuickstep"
+            android:name="com.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 efdd0b3a65..19dd2706c0 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 ch.deletescape.lawnchair.util.preferences.LawnchairPreferences;
+import com.lawnchair.util.preferences.LawnchairPreferences;
 
 public class InvariantDeviceProfile {
 
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3f142a8f61..deb04f080b 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 ch.deletescape.lawnchair.util.preferences.LawnchairPreferences;
+import com.lawnchair.util.preferences.LawnchairPreferences;
 
 /**
  * Default launcher application.
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 621e737c47..2718486b82 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 ch.deletescape.lawnchair.util.preferences.LawnchairPreferences;
+import com.lawnchair.util.preferences.LawnchairPreferences;
 
 /**
  * The workspace is a wide area with a wallpaper and a finite number of pages.