diff --git a/app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt b/app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt
index 27d0c79d6..ce502dbb5 100644
--- a/app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt
+++ b/app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt
@@ -66,7 +66,6 @@ import com.geeksville.mesh.MeshProtos.Waypoint
 import com.geeksville.mesh.android.gpsDisabled
 import com.geeksville.mesh.android.hasGps
 import com.geeksville.mesh.copy
-import com.geeksville.mesh.ui.map.components.EditWaypointDialog
 import com.geeksville.mesh.util.SqlTileWriterExt
 import com.geeksville.mesh.waypoint
 import com.google.accompanist.permissions.ExperimentalPermissionsApi // Added for Accompanist
@@ -83,6 +82,7 @@ import org.meshtastic.feature.map.addScaleBarOverlay
 import org.meshtastic.feature.map.cluster.RadiusMarkerClusterer
 import org.meshtastic.feature.map.component.CacheLayout
 import org.meshtastic.feature.map.component.DownloadButton
+import org.meshtastic.feature.map.component.EditWaypointDialog
 import org.meshtastic.feature.map.component.MapButton
 import org.meshtastic.feature.map.createLatLongGrid
 import org.meshtastic.feature.map.model.CustomTileSource
diff --git a/app/src/fdroid/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt
similarity index 99%
rename from app/src/fdroid/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt
rename to feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt
index 227be8a9c..7ce69740b 100644
--- a/app/src/fdroid/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt
+++ b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/EditWaypointDialog.kt
@@ -15,9 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import android.app.DatePickerDialog
+import android.app.TimePickerDialog
+import android.text.format.DateFormat
 import android.widget.DatePicker
 import android.widget.TimePicker
 import androidx.compose.foundation.Image
@@ -76,7 +78,7 @@ import java.util.Locale
 @Suppress("LongMethod")
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-internal fun EditWaypointDialog(
+fun EditWaypointDialog(
     waypoint: Waypoint,
     onSendClicked: (Waypoint) -> Unit,
     onDeleteClicked: (Waypoint) -> Unit,