diff --git a/catalyst/api-bundle/Response/APIResponse.php b/catalyst/api-bundle/Response/APIResponse.php
new file mode 100644
index 00000000..baa10603
--- /dev/null
+++ b/catalyst/api-bundle/Response/APIResponse.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Catalyst\APIBundle\Response;
+
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class APIResponse extends JsonResponse
+{
+    public function __construct($success = true, $message = '', $data = null, $status = 200, $headers = [])
+    {
+        $data = [
+            'success' => (bool) $success,
+            'message' =>  (string) $message,
+            'data' => $data,
+        ];
+        parent::__construct($data, $status, $headers);
+    }
+}
+
+
diff --git a/catalyst/api-bundle/Response/Response.php b/catalyst/api-bundle/Response/Response.php
deleted file mode 100644
index 7a7df8cb..00000000
--- a/catalyst/api-bundle/Response/Response.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Catalyst\APIBundle\Response;
-
-class Response
-{
-}
-
-
diff --git a/config/routes/api_test.yaml b/config/routes/api_test.yaml
deleted file mode 100644
index 81e0150e..00000000
--- a/config/routes/api_test.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# api test
-
-api_test_test:
-    path: /capi/test
-    controller: App\Controller\APITestController::test
-
diff --git a/config/routes/warranty_api.yaml b/config/routes/warranty_api.yaml
new file mode 100644
index 00000000..bd607ef5
--- /dev/null
+++ b/config/routes/warranty_api.yaml
@@ -0,0 +1,62 @@
+# api test
+capi_test:
+    path: /capi/test
+    controller: App\Controller\CAPI\TestController::test
+
+
+# battery api
+
+# find battery
+capi_battery_find:
+    path: /capi/battery/{id}
+    controller: App\Controller\CAPI\BatteryController::find
+    methods: [GET]
+
+# search battery
+capi_battery_search:
+    path: /capi/battery/search
+    controller: App\Controller\CAPI\BatteryController::search
+    methods: [GET]
+
+
+# warranty api
+
+# check warranty by serial
+capi_warranty_find:
+    path: /capi/warranty/{serial}
+    controller: App\Controller\CAPI\WarrantyController::find
+    methods: [GET]
+
+# register battery
+capi_warranty_register:
+    path: /capi/warranty
+    controller: App\Controller\CAPI\WarrantyController::register
+    methods: [POST]
+
+# claim warranty
+capi_warranty_claim:
+    path: /capi/warranty/{serial}
+    controller: App\Controller\CAPI\WarrantyController::claim
+    methods: [POST]
+
+
+
+# customer vehicle api
+
+# find customer vehicle by id 
+capi_cv_find_by_id:
+    path: /capi/customer_vehicle/id/{id}
+    controller: App\Controller\::findByID
+    methods: [GET]
+
+# find customer vehicle by plate
+capi_cv_find_by_plate:
+    path: /capi/customer_vehicle/plate/{plate}
+    controller: App\Controller\CAPI\CustomerVehicle::findByPlate
+    methods: [GET]
+
+# register customer vehicle
+capi_cv_register:
+    path: /capi/customer_vehicle
+    controller: App\Controller\CAPI\CustomerVehicle::register
+    methods: [POST]