diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/data/BPSServiceData.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/data/BPSServiceData.kt
index 668da28e..b1608080 100644
--- a/profile_bps/src/main/java/no/nordicsemi/android/bps/data/BPSServiceData.kt
+++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/data/BPSServiceData.kt
@@ -1,8 +1,8 @@
 package no.nordicsemi.android.bps.data
 
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.bps.BloodPressureMeasurementData
-import no.nordicsemi.android.kotlin.ble.profile.bps.IntermediateCuffPressureData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.BloodPressureMeasurementData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.IntermediateCuffPressureData
 
 data class BPSServiceData (
     val bloodPressureMeasurement: BloodPressureMeasurementData? = null,
diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSSensorsReadingView.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSSensorsReadingView.kt
index 2911be68..1e649b72 100644
--- a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSSensorsReadingView.kt
+++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSSensorsReadingView.kt
@@ -43,8 +43,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import no.nordicsemi.android.bps.R
 import no.nordicsemi.android.bps.data.BPSServiceData
-import no.nordicsemi.android.kotlin.ble.profile.bps.BloodPressureMeasurementData
-import no.nordicsemi.android.kotlin.ble.profile.bps.IntermediateCuffPressureData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.BloodPressureMeasurementData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.IntermediateCuffPressureData
 import no.nordicsemi.android.ui.view.BatteryLevelView
 import no.nordicsemi.android.ui.view.KeyValueField
 import no.nordicsemi.android.ui.view.ScreenSection
diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt
index d51294ca..920234d6 100644
--- a/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt
+++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt
@@ -59,9 +59,9 @@ import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient
 import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
 import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser
-import no.nordicsemi.android.kotlin.ble.profile.bps.BloodPressureMeasurementData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.BloodPressureMeasurementData
 import no.nordicsemi.android.kotlin.ble.profile.bps.BloodPressureMeasurementParser
-import no.nordicsemi.android.kotlin.ble.profile.bps.IntermediateCuffPressureData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.IntermediateCuffPressureData
 import no.nordicsemi.android.kotlin.ble.profile.bps.IntermediateCuffPressureParser
 import no.nordicsemi.android.toolbox.scanner.ScannerDestinationId
 import java.util.*
diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/data/CSCServiceData.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/data/CSCServiceData.kt
index 70149f3f..d0a4af36 100644
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/data/CSCServiceData.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/data/CSCServiceData.kt
@@ -1,7 +1,7 @@
 package no.nordicsemi.android.csc.data
 
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData
 
 data class CSCServiceData(
     val data: CSCData = CSCData(),
diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt
index ad90c346..a149395c 100644
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt
@@ -42,9 +42,9 @@ import no.nordicsemi.android.common.logger.NordicLogger
 import no.nordicsemi.android.csc.data.CSCServiceData
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
-import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSize
-import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSizes
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.WheelSize
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.WheelSizes
 import no.nordicsemi.android.service.DisconnectAndStopEvent
 import no.nordicsemi.android.service.ServiceManager
 import javax.inject.Inject
diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCContentView.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCContentView.kt
index c2204ab8..a970e2f8 100644
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCContentView.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCContentView.kt
@@ -50,8 +50,8 @@ import androidx.compose.ui.unit.dp
 import no.nordicsemi.android.common.theme.view.RadioButtonGroup
 import no.nordicsemi.android.csc.R
 import no.nordicsemi.android.csc.data.CSCServiceData
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
-import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSize
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.WheelSize
 import no.nordicsemi.android.ui.view.ScreenSection
 import no.nordicsemi.android.ui.view.SectionTitle
 import no.nordicsemi.android.ui.view.dialog.FlowCanceled
diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCMappers.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCMappers.kt
index 0a186798..660972c4 100644
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCMappers.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCMappers.kt
@@ -33,7 +33,7 @@ package no.nordicsemi.android.csc.view
 
 import no.nordicsemi.android.common.theme.view.RadioButtonItem
 import no.nordicsemi.android.common.theme.view.RadioGroupViewEntity
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData
 import java.util.*
 
 private const val DISPLAY_M_S = "m/s"
diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCViewEvent.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCViewEvent.kt
index b0ba0c84..87f510db 100644
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCViewEvent.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCViewEvent.kt
@@ -31,7 +31,7 @@
 
 package no.nordicsemi.android.csc.view
 
-import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSize
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.WheelSize
 
 internal sealed class CSCViewEvent
 
diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/WheelSizeView.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/WheelSizeView.kt
index 98393d66..a6b1d1ec 100644
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/WheelSizeView.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/WheelSizeView.kt
@@ -47,7 +47,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import no.nordicsemi.android.csc.R
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData
 
 @Composable
 internal fun WheelSizeView(state: CSCData, onClick: () -> Unit) {
diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSManager.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSManager.kt
index ba51274a..c260f292 100644
--- a/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSManager.kt
+++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSManager.kt
@@ -153,8 +153,7 @@ internal class GLSManager(
         private suspend fun onNumberOfRecordsReceived(response: RecordAccessControlPointResponse) {
             if (response.numberOfRecords > 0) {
                 if (data.value.records.isNotEmpty()) {
-                    val sequenceNumber = data.value.records
-                        .last().sequenceNumber + 1
+                    val sequenceNumber = data.value.records.last().sequenceNumber + 1
                     writeCharacteristic(
                         recordAccessControlPointCharacteristic,
                         RecordAccessControlPointData.reportStoredRecordsGreaterThenOrEqualTo(
diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSServiceData.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSServiceData.kt
index 8d326ecd..40f9bdb1 100644
--- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSServiceData.kt
+++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSServiceData.kt
@@ -32,7 +32,7 @@
 package no.nordicsemi.android.hrs.data
 
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.hrs.HRSData
+import no.nordicsemi.android.kotlin.ble.profile.hrs.data.HRSData
 
 internal data class HRSServiceData(
     val data: List<HRSData> = emptyList(),
diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt
index 45e49803..9f3e8ff5 100644
--- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt
+++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt
@@ -42,7 +42,7 @@ import no.nordicsemi.android.common.logger.NordicLogger
 import no.nordicsemi.android.hrs.data.HRSServiceData
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.hrs.HRSData
+import no.nordicsemi.android.kotlin.ble.profile.hrs.data.HRSData
 import no.nordicsemi.android.service.DisconnectAndStopEvent
 import no.nordicsemi.android.service.ServiceManager
 import javax.inject.Inject
diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSServiceData.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSServiceData.kt
index ab54a19f..e5273518 100644
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSServiceData.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSServiceData.kt
@@ -32,7 +32,7 @@
 package no.nordicsemi.android.hts.data
 
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.hts.HTSData
+import no.nordicsemi.android.kotlin.ble.profile.hts.data.HTSData
 
 internal data class HTSServiceData(
     val data: HTSData = HTSData(),
diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
index e3ee177d..01de2357 100644
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
@@ -42,7 +42,7 @@ import no.nordicsemi.android.common.logger.NordicLogger
 import no.nordicsemi.android.hts.data.HTSServiceData
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.hts.HTSData
+import no.nordicsemi.android.kotlin.ble.profile.hts.data.HTSData
 import no.nordicsemi.android.service.DisconnectAndStopEvent
 import no.nordicsemi.android.service.ServiceManager
 import javax.inject.Inject
diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSServiceData.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSServiceData.kt
index 8c2578a0..1e01e679 100644
--- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSServiceData.kt
+++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSServiceData.kt
@@ -34,7 +34,7 @@ package no.nordicsemi.android.rscs.data
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.rscs.RSCSData
+import no.nordicsemi.android.kotlin.ble.profile.rscs.data.RSCSData
 import no.nordicsemi.android.rscs.R
 
 internal data class RSCSServiceData(
diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt
index 5490d379..a96cef9c 100644
--- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt
+++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt
@@ -41,7 +41,7 @@ import no.nordicsemi.android.common.core.simpleSharedFlow
 import no.nordicsemi.android.common.logger.NordicLogger
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.rscs.RSCSData
+import no.nordicsemi.android.kotlin.ble.profile.rscs.data.RSCSData
 import no.nordicsemi.android.rscs.data.RSCSServiceData
 import no.nordicsemi.android.service.DisconnectAndStopEvent
 import no.nordicsemi.android.service.ServiceManager