diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java
index 526d9578..5c6cf2f9 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java
@@ -10,7 +10,7 @@ import android.support.annotation.NonNull;
 import java.util.UUID;
 
 import no.nordicsemi.android.ble.BleManager;
-import no.nordicsemi.android.ble.common.callback.BatteryLevelDataCallback;
+import no.nordicsemi.android.ble.common.callback.battery.BatteryLevelDataCallback;
 import no.nordicsemi.android.ble.data.Data;
 import no.nordicsemi.android.log.LogContract;
 
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManagerCallbacks.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManagerCallbacks.java
index 803fadf4..26a2905b 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManagerCallbacks.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManagerCallbacks.java
@@ -1,7 +1,7 @@
 package no.nordicsemi.android.nrftoolbox.battery;
 
 import no.nordicsemi.android.ble.BleManagerCallbacks;
-import no.nordicsemi.android.ble.common.profile.BatteryLevelCallback;
+import no.nordicsemi.android.ble.common.profile.battery.BatteryLevelCallback;
 
 public interface BatteryManagerCallbacks extends BleManagerCallbacks, BatteryLevelCallback {
 }
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java
index a8d962bb..882148dc 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java
@@ -31,8 +31,8 @@ import java.util.Calendar;
 import java.util.UUID;
 
 import no.nordicsemi.android.ble.BleManager;
-import no.nordicsemi.android.ble.common.profile.BloodPressureMeasurementCallback;
-import no.nordicsemi.android.ble.common.profile.IntermediateCuffPressureCallback;
+import no.nordicsemi.android.ble.common.profile.bp.BloodPressureMeasurementCallback;
+import no.nordicsemi.android.ble.common.profile.bp.IntermediateCuffPressureCallback;
 import no.nordicsemi.android.nrftoolbox.R;
 import no.nordicsemi.android.nrftoolbox.profile.BleProfileActivity;
 
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java
index c9db55fe..4ed5c63a 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java
@@ -32,8 +32,8 @@ import android.support.annotation.Nullable;
 import java.util.Calendar;
 import java.util.UUID;
 
-import no.nordicsemi.android.ble.common.callback.BloodPressureMeasurementDataCallback;
-import no.nordicsemi.android.ble.common.callback.IntermediateCuffPressureDataCallback;
+import no.nordicsemi.android.ble.common.callback.bps.BloodPressureMeasurementDataCallback;
+import no.nordicsemi.android.ble.common.callback.bps.IntermediateCuffPressureDataCallback;
 import no.nordicsemi.android.ble.data.Data;
 import no.nordicsemi.android.log.LogContract;
 import no.nordicsemi.android.nrftoolbox.battery.BatteryManager;
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManagerCallbacks.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManagerCallbacks.java
index faebaf98..75f550b8 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManagerCallbacks.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManagerCallbacks.java
@@ -21,8 +21,8 @@
  */
 package no.nordicsemi.android.nrftoolbox.bpm;
 
-import no.nordicsemi.android.ble.common.profile.BloodPressureMeasurementCallback;
-import no.nordicsemi.android.ble.common.profile.IntermediateCuffPressureCallback;
+import no.nordicsemi.android.ble.common.profile.bp.BloodPressureMeasurementCallback;
+import no.nordicsemi.android.ble.common.profile.bp.IntermediateCuffPressureCallback;
 import no.nordicsemi.android.nrftoolbox.battery.BatteryManagerCallbacks;
 
 interface BPMManagerCallbacks extends BatteryManagerCallbacks,
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java
index 188a3130..1f97d51c 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java
@@ -33,7 +33,7 @@ import android.support.annotation.NonNull;
 
 import java.util.UUID;
 
-import no.nordicsemi.android.ble.common.callback.CyclingSpeedAndCadenceDataCallback;
+import no.nordicsemi.android.ble.common.callback.csc.CyclingSpeedAndCadenceDataCallback;
 import no.nordicsemi.android.ble.data.Data;
 import no.nordicsemi.android.log.LogContract;
 import no.nordicsemi.android.nrftoolbox.battery.BatteryManager;
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManagerCallbacks.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManagerCallbacks.java
index 08a5e6c2..12035da5 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManagerCallbacks.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManagerCallbacks.java
@@ -21,7 +21,7 @@
  */
 package no.nordicsemi.android.nrftoolbox.csc;
 
-import no.nordicsemi.android.ble.common.profile.CyclingSpeedAndCadenceCallback;
+import no.nordicsemi.android.ble.common.profile.csc.CyclingSpeedAndCadenceCallback;
 import no.nordicsemi.android.nrftoolbox.battery.BatteryManagerCallbacks;
 
 interface CSCManagerCallbacks extends BatteryManagerCallbacks, CyclingSpeedAndCadenceCallback {