diff --git a/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestHistory.java b/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestHistory.java
index 22fa750..c7509a4 100644
--- a/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestHistory.java
+++ b/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestHistory.java
@@ -1,5 +1,6 @@
 package com.eactive.httpmockserver.client.entity;
 
+import com.eactive.httpmockserver.server.entity.Server;
 import com.eactive.httpmockserver.user.entity.StaffUser;
 import org.hibernate.annotations.Type;
 
diff --git a/src/main/java/com/eactive/httpmockserver/client/mapper/ApiRequestMapper.java b/src/main/java/com/eactive/httpmockserver/client/mapper/ApiRequestMapper.java
index 04a77e3..e6ac981 100644
--- a/src/main/java/com/eactive/httpmockserver/client/mapper/ApiRequestMapper.java
+++ b/src/main/java/com/eactive/httpmockserver/client/mapper/ApiRequestMapper.java
@@ -2,12 +2,11 @@ package com.eactive.httpmockserver.client.mapper;
 
 import com.eactive.httpmockserver.client.dto.ApiCollectionDTO;
 import com.eactive.httpmockserver.client.dto.ApiRequestDTO;
-import com.eactive.httpmockserver.client.dto.ApiRequestKeyValueDTO;
 import com.eactive.httpmockserver.client.entity.ApiCollection;
 import com.eactive.httpmockserver.client.entity.ApiRequestInfo;
 import com.eactive.httpmockserver.common.mapper.CommonMapper;
+import com.eactive.httpmockserver.server.mapper.ServerMapper;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java b/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java
index c4e1ab2..f9437e6 100644
--- a/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java
+++ b/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java
@@ -1,6 +1,6 @@
 package com.eactive.httpmockserver.server.controller;
 
-import com.eactive.httpmockserver.client.mapper.ServerMapper;
+import com.eactive.httpmockserver.server.mapper.ServerMapper;
 import com.eactive.httpmockserver.server.dto.ServerDTO;
 import com.eactive.httpmockserver.server.dto.ServerSearch;
 import com.eactive.httpmockserver.server.entity.Server;
diff --git a/src/main/java/com/eactive/httpmockserver/client/mapper/ServerMapper.java b/src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java
similarity index 92%
rename from src/main/java/com/eactive/httpmockserver/client/mapper/ServerMapper.java
rename to src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java
index ca81751..f53a6f6 100644
--- a/src/main/java/com/eactive/httpmockserver/client/mapper/ServerMapper.java
+++ b/src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java
@@ -1,4 +1,4 @@
-package com.eactive.httpmockserver.client.mapper;
+package com.eactive.httpmockserver.server.mapper;
 
 
 import com.eactive.httpmockserver.client.repository.ServerRepository;
@@ -18,12 +18,12 @@ public class ServerMapper {
     @Autowired
     ServerRepository serverRepository;
 
-    Server mapById(Long id) {
+    public Server mapById(Long id) {
         if (id == null || id == 0) return null;
         return serverRepository.findById(id).orElseThrow(() -> new NotFoundException("Server[" + id + "] not found"));
     }
 
-    Long mapById(Server server) {
+    public Long mapById(Server server) {
         if (server == null) return null;
         return server.getId();
     }