diff --git a/agent/pom.xml b/agent/pom.xml
index 7c9a44002..c60ecc44a 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -33,6 +33,12 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- tools -->
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-tools</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <!-- for tests -->
         <dependency>
diff --git a/agent/src/assembly/distribution.xml b/agent/src/assembly/distribution.xml
index 2e3aeac5f..dfa003ca0 100644
--- a/agent/src/assembly/distribution.xml
+++ b/agent/src/assembly/distribution.xml
@@ -50,5 +50,11 @@
         <outputDirectory>plugin</outputDirectory>
         <unpack>true</unpack>
     </dependencySet>
+    <dependencySet>
+        <includes>
+           <include>com.navercorp.pinpoint:pinpoint-tools</include>
+        </includes>
+        <outputDirectory>tools</outputDirectory>
+    </dependencySet>
   </dependencySets>
 </assembly>
\ No newline at end of file
diff --git a/agent/src/main/script/networktest.sh b/agent/src/main/script/networktest.sh
deleted file mode 100755
index b43262302..000000000
--- a/agent/src/main/script/networktest.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/bash
-CL_PATH=`find ../ -name '*.jar' | tr "\n" :`
-echo "CLASSPATH=$CL_PATH"
-java -classpath $CL_PATH com.navercorp.pinpoint.profiler.tools.NetworkAvailabilityChecker ../pinpoint.config
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b228e3d02..d1abfd88c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
         <module>commons</module>
         <module>commons-hbase</module>
         <module>commons-server</module>
+        <module>tools</module>
         <module>plugins</module>
         <module>profiler</module>
         <module>profiler-optional</module>
@@ -180,6 +181,11 @@
                 <type>zip</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.navercorp.pinpoint</groupId>
+                <artifactId>pinpoint-tools</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.navercorp.pinpoint</groupId>
                 <artifactId>pinpoint-test</artifactId>
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 000000000..0ab7f4b8e
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,5 @@
+/target/
+/*.iml
+/.settings/
+/.classpath
+/.project
diff --git a/tools/README.md b/tools/README.md
new file mode 100644
index 000000000..d3252c130
--- /dev/null
+++ b/tools/README.md
@@ -0,0 +1 @@
+# pinpoint-tools
diff --git a/tools/clover.license b/tools/clover.license
new file mode 100644
index 000000000..569fa6175
--- /dev/null
+++ b/tools/clover.license
@@ -0,0 +1,5 @@
+RMRqrdbgbKFhbaVnDxHUdDQvrOQXxIBklnvcmahheubVC
+mh2KM35CLkwUHS4DH7QVhxy52J5hnWbyEm6Cyd3KkF<mV
+RmmnSVOqOMnOnMMrmMqwXomoroNrqPNRrPSsWwtUxXuUU
+sRONqpnmqmUUnqonmstsmmmmmUUnqonmstsmmmmmUUGfk
+mlfkqUUnmmmm
\ No newline at end of file
diff --git a/tools/pom.xml b/tools/pom.xml
new file mode 100644
index 000000000..d4a40a1fb
--- /dev/null
+++ b/tools/pom.xml
@@ -0,0 +1,27 @@
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.navercorp.pinpoint</groupId>
+        <artifactId>pom</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>pinpoint-tools</artifactId>
+    <name>pinpoint-tools</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-commons</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-profiler</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/tools/NetworkAvailabilityChecker.java b/tools/src/main/java/com/navercorp/pinpoint/tools/NetworkAvailabilityChecker.java
similarity index 99%
rename from profiler/src/main/java/com/navercorp/pinpoint/profiler/tools/NetworkAvailabilityChecker.java
rename to tools/src/main/java/com/navercorp/pinpoint/tools/NetworkAvailabilityChecker.java
index 1735326ab..4838cf382 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/tools/NetworkAvailabilityChecker.java
+++ b/tools/src/main/java/com/navercorp/pinpoint/tools/NetworkAvailabilityChecker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.profiler.tools;
+package com.navercorp.pinpoint.tools;
 
 import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig;
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/tools/PinpointTools.java b/tools/src/main/java/com/navercorp/pinpoint/tools/PinpointTools.java
similarity index 93%
rename from profiler/src/main/java/com/navercorp/pinpoint/profiler/tools/PinpointTools.java
rename to tools/src/main/java/com/navercorp/pinpoint/tools/PinpointTools.java
index b29170c4e..ff35f8f74 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/tools/PinpointTools.java
+++ b/tools/src/main/java/com/navercorp/pinpoint/tools/PinpointTools.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.profiler.tools;
+package com.navercorp.pinpoint.tools;
 
 /**
  * Marker interface to prevent obfuscation
diff --git a/tools/src/main/script/networktest.sh b/tools/src/main/script/networktest.sh
new file mode 100644
index 000000000..32cbc4557
--- /dev/null
+++ b/tools/src/main/script/networktest.sh
@@ -0,0 +1,4 @@
+#! /bin/bash
+CL_PATH=`find ../ -name '*.jar' | tr "\n" :`
+echo "CLASSPATH=$CL_PATH"
+java -classpath $CL_PATH com.navercorp.pinpoint.tools.NetworkAvailabilityChecker ../pinpoint.config
\ No newline at end of file