diff --git a/notification-manager/src/main/java/de/itvsh/kop/notification/user/UserRemoteService.java b/notification-manager/src/main/java/de/itvsh/kop/notification/user/UserRemoteService.java
index 32c1cbfd31c455d9c940d0c955b480111c47abd1..f9324e69859086d21ec2e1ec24c82eeaf5806650 100644
--- a/notification-manager/src/main/java/de/itvsh/kop/notification/user/UserRemoteService.java
+++ b/notification-manager/src/main/java/de/itvsh/kop/notification/user/UserRemoteService.java
@@ -1,12 +1,13 @@
 package de.itvsh.kop.notification.user;
 
-import de.itvsh.kop.user.recipient.GrpcFindRecipientRequest;
-import de.itvsh.kop.user.recipient.RecipientServiceGrpc;
-import net.devh.boot.grpc.client.inject.GrpcClient;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientRequest;
+import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc;
+import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service
 public class UserRemoteService {
diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/user/GrpcFindRecipientRequestTestFactory.java b/notification-manager/src/test/java/de/itvsh/kop/notification/user/GrpcFindRecipientRequestTestFactory.java
index d1d37c68302f01bbcb81ffdd94309c584c506e40..a1d31f4ef709141cecf1f1ad1843cc9353df043c 100644
--- a/notification-manager/src/test/java/de/itvsh/kop/notification/user/GrpcFindRecipientRequestTestFactory.java
+++ b/notification-manager/src/test/java/de/itvsh/kop/notification/user/GrpcFindRecipientRequestTestFactory.java
@@ -1,6 +1,6 @@
 package de.itvsh.kop.notification.user;
 
-import de.itvsh.kop.user.recipient.GrpcFindRecipientResponse;
+import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientResponse;
 import de.itvsh.kop.user.recipient.GrpcRecipient;
 
 public class GrpcFindRecipientRequestTestFactory {
diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserRemoteServiceTest.java b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserRemoteServiceTest.java
index a81a4b3f84f43f8f2e8348c1c67faa728ae40898..296fcf20684c04c41ce58c47acbcc85ccb6441d1 100644
--- a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserRemoteServiceTest.java
+++ b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserRemoteServiceTest.java
@@ -1,6 +1,6 @@
 package de.itvsh.kop.notification.user;
 
-import de.itvsh.kop.user.recipient.RecipientServiceGrpc.RecipientServiceBlockingStub;
+import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceBlockingStub;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;