diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
index 2ed1b1df..2b5a4ba6 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
@@ -16,8 +16,8 @@ import com.wireguard.android.backend.Tunnel
 import com.wireguard.android.databinding.TunnelDetailFragmentBinding
 import com.wireguard.android.databinding.TunnelDetailPeerBinding
 import com.wireguard.android.model.ObservableTunnel
-import com.wireguard.android.ui.EdgeToEdge.setUpRoot
-import com.wireguard.android.ui.EdgeToEdge.setUpScrollingContent
+import com.wireguard.android.widget.EdgeToEdge.setUpRoot
+import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent
 import java.util.Timer
 import java.util.TimerTask
 
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
index 33749911..387d0962 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
@@ -22,8 +22,8 @@ import com.wireguard.android.backend.Tunnel
 import com.wireguard.android.databinding.TunnelEditorFragmentBinding
 import com.wireguard.android.fragment.AppListDialogFragment.AppExclusionListener
 import com.wireguard.android.model.ObservableTunnel
-import com.wireguard.android.ui.EdgeToEdge.setUpRoot
-import com.wireguard.android.ui.EdgeToEdge.setUpScrollingContent
+import com.wireguard.android.widget.EdgeToEdge.setUpRoot
+import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent
 import com.wireguard.android.util.ErrorMessages
 import com.wireguard.android.viewmodel.ConfigProxy
 import com.wireguard.config.Config
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
index ff7b8bce..32bd34f6 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
@@ -28,17 +28,15 @@ import com.wireguard.android.databinding.TunnelListFragmentBinding
 import com.wireguard.android.databinding.TunnelListItemBinding
 import com.wireguard.android.fragment.ConfigNamingDialogFragment.Companion.newInstance
 import com.wireguard.android.model.ObservableTunnel
-import com.wireguard.android.ui.EdgeToEdge.setUpFAB
-import com.wireguard.android.ui.EdgeToEdge.setUpRoot
-import com.wireguard.android.ui.EdgeToEdge.setUpScrollingContent
+import com.wireguard.android.widget.EdgeToEdge.setUpFAB
+import com.wireguard.android.widget.EdgeToEdge.setUpRoot
+import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent
 import com.wireguard.android.util.ErrorMessages
 import com.wireguard.android.widget.MultiselectableRelativeLayout
-import com.wireguard.config.BadConfigException
 import com.wireguard.config.Config
 import java9.util.concurrent.CompletableFuture
 import java.io.BufferedReader
 import java.io.ByteArrayInputStream
-import java.io.IOException
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
 import java.util.ArrayList
diff --git a/ui/src/main/java/com/wireguard/android/ui/EdgeToEdge.kt b/ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt
similarity index 98%
rename from ui/src/main/java/com/wireguard/android/ui/EdgeToEdge.kt
rename to ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt
index ac4d214d..544e9ddb 100644
--- a/ui/src/main/java/com/wireguard/android/ui/EdgeToEdge.kt
+++ b/ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt
@@ -2,7 +2,7 @@
  * Copyright © 2017-2020 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-package com.wireguard.android.ui
+package com.wireguard.android.widget
 
 import android.view.View
 import android.view.ViewGroup