diff --git a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java b/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java
index 6e22dab..2bb014e 100644
--- a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java
+++ b/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java
@@ -3,45 +3,25 @@ package com.eactive.httpmockserver.client.controller;
 import com.eactive.httpmockserver.client.dto.ApiRequestDTO;
 import com.eactive.httpmockserver.client.dto.ApiResponse;
 import com.eactive.httpmockserver.client.service.NettyApiClient;
-import com.eactive.httpmockserver.server.entity.Server;
-import com.eactive.httpmockserver.server.entity.ServerRepository;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-@Controller
+@RestController
 public class ApiClientController {
 
-    private final ServerRepository serverRepository;
-
     private final NettyApiClient nettyApiClient;
 
-    public ApiClientController(ServerRepository serverRepository, NettyApiClient nettyApiClient) {
-        this.serverRepository = serverRepository;
+    public ApiClientController(NettyApiClient nettyApiClient) {
         this.nettyApiClient = nettyApiClient;
     }
 
     @PostMapping("/mgmt/api/test.do")
-    @ResponseBody
     public ApiResponse handleApiRequest(@RequestBody ApiRequestDTO request) throws InterruptedException, ExecutionException, InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchMethodException {
 
         return nettyApiClient.handleRequest(request).get();
     }
-
-    @GetMapping("/mgmt/api_tester.do")
-    public String testView(ModelMap model) {
-
-        List<Server> servers = serverRepository.findAllByEnabledIs(true);
-        model.addAttribute("servers", servers);
-
-        return "page/tester/apiTester";
-    }
-
 }
diff --git a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientPageController.java b/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientPageController.java
new file mode 100644
index 0000000..bffcc88
--- /dev/null
+++ b/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientPageController.java
@@ -0,0 +1,29 @@
+package com.eactive.httpmockserver.client.controller;
+
+import com.eactive.httpmockserver.server.entity.Server;
+import com.eactive.httpmockserver.server.entity.ServerRepository;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+@Controller
+public class ApiClientPageController {
+
+    private final ServerRepository serverRepository;
+
+    public ApiClientPageController(ServerRepository serverRepository) {
+        this.serverRepository = serverRepository;
+    }
+
+    @GetMapping("/mgmt/api_tester.do")
+    public String testView(ModelMap model) {
+
+        List<Server> servers = serverRepository.findAllByEnabledIs(true);
+        model.addAttribute("servers", servers);
+
+        return "apiTester";
+    }
+
+}