diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java
index 11ee02a8f99dc649ec533afcafbb1a75a32c4299..2e2d6c6cb0ce3dab68978db6e72f06bafcb51ef7 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java
@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import de.itvsh.goofy.GoofyServerApplication;
-import de.itvsh.ozg.pluto.common.GrpcObjectMapper;
+import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageRemoteService.java b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageRemoteService.java
index 90a4a74b0724a97bc5f5d6a725ab4a00b905defd..b39b3f0d9ef9efe82cb1f3a43d0fa15d84ab2a4c 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageRemoteService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageRemoteService.java
@@ -10,7 +10,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
 import de.itvsh.goofy.GoofyServerApplication;
-import de.itvsh.ozg.pluto.common.GrpcObjectMapper;
+import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
 import de.itvsh.ozg.pluto.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
 import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcAccessPermission;
 import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandRemoteServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandRemoteServiceTest.java
index b6ba83fc95f4efd0e355aee07af09f016ed1093f..e187d76d1f402fba6bf262698365cf77221854c4 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandRemoteServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandRemoteServiceTest.java
@@ -26,8 +26,8 @@ import org.mockito.Spy;
 import de.itvsh.goofy.common.callcontext.ContextService;
 import de.itvsh.goofy.vorgang.RedirectRequestTestFactory;
 import de.itvsh.goofy.vorgang.VorgangHeaderTestFactory;
+import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
 import de.itvsh.ozg.pluto.common.GrpcObject;
-import de.itvsh.ozg.pluto.common.GrpcObjectMapper;
 import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
 import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
 import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarRemoteServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarRemoteServiceTest.java
index 45ad4afbbbfec175aceb96ebc97e9c367875affa..6b8c32c2b10a75d57a416b112e405f229cc339cd 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarRemoteServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarRemoteServiceTest.java
@@ -14,7 +14,7 @@ import org.mockito.Spy;
 
 import de.itvsh.goofy.vorgang.GrpcVorgangAttachedItemTestFactory;
 import de.itvsh.goofy.vorgang.VorgangHeaderTestFactory;
-import de.itvsh.ozg.pluto.common.GrpcObjectMapper;
+import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
 import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageRemoteServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageRemoteServiceTest.java
index 27a33d47ebb79ddcd6fdfcedaed4a580a0c615cf..ab6761aaee84a45d2ca86ffdf0051715abb25ea4 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageRemoteServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageRemoteServiceTest.java
@@ -23,7 +23,7 @@ import org.springframework.context.ApplicationContext;
 import de.itvsh.goofy.ApplicationTestFactory;
 import de.itvsh.goofy.vorgang.GrpcVorgangAttachedItemTestFactory;
 import de.itvsh.goofy.vorgang.VorgangHeaderTestFactory;
-import de.itvsh.ozg.pluto.common.GrpcObjectMapper;
+import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
 import de.itvsh.ozg.pluto.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
 import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcAccessPermission;
 import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcDeleteClientAttributeRequest;