diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index f624b7ffd3..ea8ae0db3a 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -90,6 +90,10 @@
             <groupId>org.thingsboard</groupId>
             <artifactId>tools</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thingsboard</groupId>
+            <artifactId>rest-client</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index ef05999b58..21bb0a6c69 100755
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
         <module>tools</module>
         <module>application</module>
         <module>msa</module>
+        <module>rest-client</module>
     </modules>
 
     <profiles>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
new file mode 100644
index 0000000000..8de2e45589
--- /dev/null
+++ b/rest-client/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>thingsboard</artifactId>
+        <groupId>org.thingsboard</groupId>
+        <version>2.5.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>rest-client</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Thingsboard Rest Client</name>
+    <url>https://thingsboard.io</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <main.dir>${basedir}/..</main.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>data</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java b/rest-client/src/main/java/org/thingsboard/client/RestClient.java
similarity index 99%
rename from tools/src/main/java/org/thingsboard/client/tools/RestClient.java
rename to rest-client/src/main/java/org/thingsboard/client/RestClient.java
index 82c1eb6fd5..2c61b12c1c 100644
--- a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java
+++ b/rest-client/src/main/java/org/thingsboard/client/RestClient.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.client.tools;
+package org.thingsboard.client;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -31,7 +31,7 @@ import org.springframework.http.client.support.HttpRequestWrapper;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
-import org.thingsboard.client.tools.utils.RestJsonConverter;
+import org.thingsboard.client.utils.RestJsonConverter;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.ClaimRequest;
 import org.thingsboard.server.common.data.Customer;
diff --git a/tools/src/main/java/org/thingsboard/client/tools/utils/RestJsonConverter.java b/rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java
similarity index 98%
rename from tools/src/main/java/org/thingsboard/client/tools/utils/RestJsonConverter.java
rename to rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java
index 5e70e78659..2470c2d669 100644
--- a/tools/src/main/java/org/thingsboard/client/tools/utils/RestJsonConverter.java
+++ b/rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.client.tools.utils;
+package org.thingsboard.client.utils;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.springframework.util.CollectionUtils;