diff --git a/app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt b/app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt
index 0714ed9d..2a499b68 100644
--- a/app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt
+++ b/app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt
@@ -5,7 +5,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import eu.darken.capod.devices.core.DeviceProfile
+import eu.darken.capod.profiles.core.DeviceProfile
 import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)
diff --git a/app/src/main/java/eu/darken/capod/devices/core/DeviceProfileId.kt b/app/src/main/java/eu/darken/capod/devices/core/DeviceProfileId.kt
deleted file mode 100644
index 966ae545..00000000
--- a/app/src/main/java/eu/darken/capod/devices/core/DeviceProfileId.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package eu.darken.capod.devices.core
-
-typealias ProfileId = String
\ No newline at end of file
diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt
index 4ffad19e..04efe362 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt
@@ -15,7 +15,7 @@ import eu.darken.capod.common.livedata.SingleLiveEvent
 import eu.darken.capod.common.permissions.Permission
 import eu.darken.capod.common.uix.ViewModel3
 import eu.darken.capod.common.upgrade.UpgradeRepo
-import eu.darken.capod.devices.core.DeviceProfilesRepo
+import eu.darken.capod.profiles.core.DeviceProfilesRepo
 import eu.darken.capod.main.core.GeneralSettings
 import eu.darken.capod.main.core.MonitorMode
 import eu.darken.capod.main.core.PermissionTool
@@ -41,10 +41,8 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.isActive
-import java.time.Duration
 import java.time.Instant
 import javax.inject.Inject
-import kotlin.collections.sortedWith
 
 @HiltViewModel
 class OverviewFragmentVM @Inject constructor(
diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
index 180960ae..394dc4ba 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
@@ -1,6 +1,5 @@
 package eu.darken.capod.main.ui.overview.cards.pods
 
-import android.graphics.Typeface
 import android.view.ViewGroup
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
@@ -8,7 +7,6 @@ import androidx.core.view.isVisible
 import eu.darken.capod.R
 import eu.darken.capod.common.lists.binding
 import eu.darken.capod.databinding.OverviewPodsDualItemBinding
-import eu.darken.capod.devices.core.DeviceProfile
 import eu.darken.capod.pods.core.DualPodDevice
 import eu.darken.capod.pods.core.HasCase
 import eu.darken.capod.pods.core.HasChargeDetectionDual
diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt
index 18de00c9..e75abc87 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt
@@ -10,8 +10,6 @@ import eu.darken.capod.main.ui.overview.OverviewAdapter
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.getSignalQuality
 import java.time.Instant
-import eu.darken.capod.R
-import eu.darken.capod.devices.core.DeviceProfile
 
 abstract class PodDeviceVH<D : PodDeviceVH.Item, B : ViewBinding>(
     @LayoutRes layoutId: Int,
diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
index c7759d82..99ea3b97 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
@@ -1,6 +1,5 @@
 package eu.darken.capod.main.ui.overview.cards.pods
 
-import android.graphics.Typeface
 import android.view.ViewGroup
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
@@ -8,7 +7,6 @@ import androidx.core.view.isVisible
 import eu.darken.capod.R
 import eu.darken.capod.common.lists.binding
 import eu.darken.capod.databinding.OverviewPodsSingleItemBinding
-import eu.darken.capod.devices.core.DeviceProfile
 import eu.darken.capod.pods.core.HasChargeDetection
 import eu.darken.capod.pods.core.HasEarDetection
 import eu.darken.capod.pods.core.SinglePodDevice
diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt
index 57c45f8e..5532654e 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt
@@ -1,11 +1,9 @@
 package eu.darken.capod.main.ui.overview.cards.pods
 
-import android.graphics.Typeface
 import android.view.ViewGroup
 import eu.darken.capod.R
 import eu.darken.capod.common.lists.binding
 import eu.darken.capod.databinding.OverviewPodsUnknownItemBinding
-import eu.darken.capod.devices.core.DeviceProfile
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.lastSeenFormatted
diff --git a/app/src/main/java/eu/darken/capod/monitor/core/PodDeviceCache.kt b/app/src/main/java/eu/darken/capod/monitor/core/PodDeviceCache.kt
index 27c6486b..a0763e7b 100644
--- a/app/src/main/java/eu/darken/capod/monitor/core/PodDeviceCache.kt
+++ b/app/src/main/java/eu/darken/capod/monitor/core/PodDeviceCache.kt
@@ -11,7 +11,7 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.capod.common.debug.logging.asLog
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.devices.core.ProfileId
+import eu.darken.capod.profiles.core.ProfileId
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt b/app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
index ffd283f5..d78aa9c0 100644
--- a/app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
+++ b/app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
@@ -14,7 +14,7 @@ import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.flow.replayingShare
 import eu.darken.capod.common.flow.throttleLatest
-import eu.darken.capod.devices.core.DeviceProfilesRepo
+import eu.darken.capod.profiles.core.DeviceProfilesRepo
 import eu.darken.capod.main.core.GeneralSettings
 import eu.darken.capod.main.core.PermissionTool
 import eu.darken.capod.pods.core.PodDevice
diff --git a/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
index f255a682..58cfe7af 100644
--- a/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
+++ b/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
@@ -9,7 +9,7 @@ import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.bluetooth.BluetoothAddress
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.capod.common.debug.logging.log
-import eu.darken.capod.devices.core.DeviceProfile
+import eu.darken.capod.profiles.core.DeviceProfile
 import java.time.Duration
 import java.time.Instant
 import java.util.UUID
diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt
index 37346f77..b699bb64 100644
--- a/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt
+++ b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt
@@ -5,8 +5,8 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
 import eu.darken.capod.common.debug.logging.asLog
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.devices.core.AppleDeviceProfile
-import eu.darken.capod.devices.core.DeviceProfilesRepo
+import eu.darken.capod.profiles.core.AppleDeviceProfile
+import eu.darken.capod.profiles.core.DeviceProfilesRepo
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.misc.UnknownAppleDevice
 import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
index 547b2af7..5deeac32 100644
--- a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
+++ b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
@@ -2,7 +2,7 @@ package eu.darken.capod.pods.core.apple
 
 import eu.darken.capod.common.lowerNibble
 import eu.darken.capod.common.upperNibble
-import eu.darken.capod.devices.core.AppleDeviceProfile
+import eu.darken.capod.profiles.core.AppleDeviceProfile
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
 
diff --git a/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt
index 429fed23..485db172 100644
--- a/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt
+++ b/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import eu.darken.capod.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.devices.core.DeviceProfile
+import eu.darken.capod.profiles.core.DeviceProfile
 import eu.darken.capod.pods.core.PodDevice
 import java.time.Instant
 
diff --git a/app/src/main/java/eu/darken/capod/devices/core/AppleDeviceProfile.kt b/app/src/main/java/eu/darken/capod/profiles/core/AppleDeviceProfile.kt
similarity index 96%
rename from app/src/main/java/eu/darken/capod/devices/core/AppleDeviceProfile.kt
rename to app/src/main/java/eu/darken/capod/profiles/core/AppleDeviceProfile.kt
index 1c2fdf81..1df062f4 100644
--- a/app/src/main/java/eu/darken/capod/devices/core/AppleDeviceProfile.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/core/AppleDeviceProfile.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.core
+package eu.darken.capod.profiles.core
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/app/src/main/java/eu/darken/capod/devices/core/DeviceProfile.kt b/app/src/main/java/eu/darken/capod/profiles/core/DeviceProfile.kt
similarity index 94%
rename from app/src/main/java/eu/darken/capod/devices/core/DeviceProfile.kt
rename to app/src/main/java/eu/darken/capod/profiles/core/DeviceProfile.kt
index 1fe7759f..e52557d8 100644
--- a/app/src/main/java/eu/darken/capod/devices/core/DeviceProfile.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/core/DeviceProfile.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.core
+package eu.darken.capod.profiles.core
 
 import android.os.Parcelable
 import eu.darken.capod.common.serialization.NameBasedPolyJsonAdapterFactory
diff --git a/app/src/main/java/eu/darken/capod/profiles/core/DeviceProfileId.kt b/app/src/main/java/eu/darken/capod/profiles/core/DeviceProfileId.kt
new file mode 100644
index 00000000..31cb7d48
--- /dev/null
+++ b/app/src/main/java/eu/darken/capod/profiles/core/DeviceProfileId.kt
@@ -0,0 +1,3 @@
+package eu.darken.capod.profiles.core
+
+typealias ProfileId = String
\ No newline at end of file
diff --git a/app/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt b/app/src/main/java/eu/darken/capod/profiles/core/DeviceProfilesRepo.kt
similarity index 97%
rename from app/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt
rename to app/src/main/java/eu/darken/capod/profiles/core/DeviceProfilesRepo.kt
index 9592beec..b0d5dff4 100644
--- a/app/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/core/DeviceProfilesRepo.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.core
+package eu.darken.capod.profiles.core
 
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.capod.common.debug.logging.log
diff --git a/app/src/main/java/eu/darken/capod/devices/core/DeviceProfilesSettings.kt b/app/src/main/java/eu/darken/capod/profiles/core/DeviceProfilesSettings.kt
similarity index 96%
rename from app/src/main/java/eu/darken/capod/devices/core/DeviceProfilesSettings.kt
rename to app/src/main/java/eu/darken/capod/profiles/core/DeviceProfilesSettings.kt
index bffbea7b..c2bf4555 100644
--- a/app/src/main/java/eu/darken/capod/devices/core/DeviceProfilesSettings.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/core/DeviceProfilesSettings.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.core
+package eu.darken.capod.profiles.core
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/app/src/main/java/eu/darken/capod/devices/ui/DeviceManagerAdapter.kt b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerAdapter.kt
similarity index 98%
rename from app/src/main/java/eu/darken/capod/devices/ui/DeviceManagerAdapter.kt
rename to app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerAdapter.kt
index e0d352a5..a29959f4 100644
--- a/app/src/main/java/eu/darken/capod/devices/ui/DeviceManagerAdapter.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerAdapter.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.ui
+package eu.darken.capod.profiles.ui
 
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
diff --git a/app/src/main/java/eu/darken/capod/devices/ui/DeviceManagerFragment.kt b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerFragment.kt
similarity index 99%
rename from app/src/main/java/eu/darken/capod/devices/ui/DeviceManagerFragment.kt
rename to app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerFragment.kt
index c9f74971..49b4cfbd 100644
--- a/app/src/main/java/eu/darken/capod/devices/ui/DeviceManagerFragment.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerFragment.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.ui
+package eu.darken.capod.profiles.ui
 
 import android.os.Bundle
 import android.util.TypedValue
diff --git a/app/src/main/java/eu/darken/capod/devices/ui/DeviceManagerFragmentVM.kt b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerFragmentVM.kt
similarity index 94%
rename from app/src/main/java/eu/darken/capod/devices/ui/DeviceManagerFragmentVM.kt
rename to app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerFragmentVM.kt
index 893effd1..f4402404 100644
--- a/app/src/main/java/eu/darken/capod/devices/ui/DeviceManagerFragmentVM.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerFragmentVM.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.ui
+package eu.darken.capod.profiles.ui
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.SavedStateHandle
@@ -8,8 +8,8 @@ import eu.darken.capod.common.coroutine.DispatcherProvider
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.uix.ViewModel3
-import eu.darken.capod.devices.core.DeviceProfile
-import eu.darken.capod.devices.core.DeviceProfilesRepo
+import eu.darken.capod.profiles.core.DeviceProfile
+import eu.darken.capod.profiles.core.DeviceProfilesRepo
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
diff --git a/app/src/main/java/eu/darken/capod/devices/ui/DeviceProfileCreationFragment.kt b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceProfileCreationFragment.kt
similarity index 99%
rename from app/src/main/java/eu/darken/capod/devices/ui/DeviceProfileCreationFragment.kt
rename to app/src/main/java/eu/darken/capod/profiles/ui/DeviceProfileCreationFragment.kt
index 85fbcd13..71b5fe9f 100644
--- a/app/src/main/java/eu/darken/capod/devices/ui/DeviceProfileCreationFragment.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceProfileCreationFragment.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.ui
+package eu.darken.capod.profiles.ui
 
 import android.content.Context
 import android.os.Bundle
diff --git a/app/src/main/java/eu/darken/capod/devices/ui/DeviceProfileCreationFragmentVM.kt b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceProfileCreationFragmentVM.kt
similarity index 98%
rename from app/src/main/java/eu/darken/capod/devices/ui/DeviceProfileCreationFragmentVM.kt
rename to app/src/main/java/eu/darken/capod/profiles/ui/DeviceProfileCreationFragmentVM.kt
index fd55bca4..bb3c70af 100644
--- a/app/src/main/java/eu/darken/capod/devices/ui/DeviceProfileCreationFragmentVM.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceProfileCreationFragmentVM.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.ui
+package eu.darken.capod.profiles.ui
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.SavedStateHandle
@@ -10,8 +10,8 @@ import eu.darken.capod.common.coroutine.DispatcherProvider
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.uix.ViewModel3
-import eu.darken.capod.devices.core.AppleDeviceProfile
-import eu.darken.capod.devices.core.DeviceProfilesRepo
+import eu.darken.capod.profiles.core.AppleDeviceProfile
+import eu.darken.capod.profiles.core.DeviceProfilesRepo
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.protocol.IdentityResolvingKey
 import eu.darken.capod.pods.core.apple.protocol.ProximityEncryptionKey
diff --git a/app/src/main/java/eu/darken/capod/devices/ui/DeviceProfileVH.kt b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceProfileVH.kt
similarity index 93%
rename from app/src/main/java/eu/darken/capod/devices/ui/DeviceProfileVH.kt
rename to app/src/main/java/eu/darken/capod/profiles/ui/DeviceProfileVH.kt
index 6b2ac6d4..8cde65b3 100644
--- a/app/src/main/java/eu/darken/capod/devices/ui/DeviceProfileVH.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceProfileVH.kt
@@ -1,9 +1,9 @@
-package eu.darken.capod.devices.ui
+package eu.darken.capod.profiles.ui
 
 import android.view.ViewGroup
 import eu.darken.capod.R
 import eu.darken.capod.databinding.DeviceManagerItemBinding
-import eu.darken.capod.devices.core.DeviceProfile
+import eu.darken.capod.profiles.core.DeviceProfile
 
 class DeviceProfileVH(parent: ViewGroup) :
     DeviceManagerAdapter.BaseVH<DeviceProfileVH.Item, DeviceManagerItemBinding>(
diff --git a/app/src/main/java/eu/darken/capod/devices/ui/NoProfilesCardVH.kt b/app/src/main/java/eu/darken/capod/profiles/ui/NoProfilesCardVH.kt
similarity index 96%
rename from app/src/main/java/eu/darken/capod/devices/ui/NoProfilesCardVH.kt
rename to app/src/main/java/eu/darken/capod/profiles/ui/NoProfilesCardVH.kt
index 597eab72..aefef5a9 100644
--- a/app/src/main/java/eu/darken/capod/devices/ui/NoProfilesCardVH.kt
+++ b/app/src/main/java/eu/darken/capod/profiles/ui/NoProfilesCardVH.kt
@@ -1,4 +1,4 @@
-package eu.darken.capod.devices.ui
+package eu.darken.capod.profiles.ui
 
 import android.view.ViewGroup
 import eu.darken.capod.R
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 9d0748a5..4fda5b36 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -37,12 +37,12 @@
     </fragment>
     <fragment
         android:id="@+id/deviceManagerFragment"
-        android:name="eu.darken.capod.devices.ui.DeviceManagerFragment"
+        android:name="eu.darken.capod.profiles.ui.DeviceManagerFragment"
         android:label="DeviceManagerFragment"
         tools:layout="@layout/device_manager_fragment" />
     <fragment
         android:id="@+id/deviceManagerFragment"
-        android:name="eu.darken.capod.devices.ui.DeviceManagerFragment"
+        android:name="eu.darken.capod.profiles.ui.DeviceManagerFragment"
         android:label="DeviceManagerFragment"
         tools:layout="@layout/device_manager_fragment">
         <action
@@ -57,7 +57,7 @@
     </fragment>
     <fragment
         android:id="@+id/deviceProfileCreationFragment"
-        android:name="eu.darken.capod.devices.ui.DeviceProfileCreationFragment"
+        android:name="eu.darken.capod.profiles.ui.DeviceProfileCreationFragment"
         android:label="DeviceProfileCreationFragment"
         tools:layout="@layout/device_profile_creation_fragment">
         <argument