diff --git a/pom.xml b/pom.xml
index ca66c91cf..3425cc995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,12 @@
             <version>0.0.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.nhn.pinpoint</groupId>
+            <artifactId>pinpoint-thrift</artifactId>
+            <version>0.0.4-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
diff --git a/src/main/java/com/nhn/pinpoint/web/controller/AgentStatController.java b/src/main/java/com/nhn/pinpoint/web/controller/AgentStatController.java
index f352dca36..71a1c18bd 100644
--- a/src/main/java/com/nhn/pinpoint/web/controller/AgentStatController.java
+++ b/src/main/java/com/nhn/pinpoint/web/controller/AgentStatController.java
@@ -17,7 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.nhn.pinpoint.common.dto2.thrift.AgentStat;
+import com.nhn.pinpoint.thrift.dto.AgentStat;
+
 import com.nhn.pinpoint.web.service.AgentStatService;
 import com.nhn.pinpoint.web.vo.linechart.AgentStatLineChart;
 
diff --git a/src/main/java/com/nhn/pinpoint/web/dao/AgentStatDao.java b/src/main/java/com/nhn/pinpoint/web/dao/AgentStatDao.java
index 4567172ef..a927cba8e 100644
--- a/src/main/java/com/nhn/pinpoint/web/dao/AgentStatDao.java
+++ b/src/main/java/com/nhn/pinpoint/web/dao/AgentStatDao.java
@@ -2,7 +2,7 @@ package com.nhn.pinpoint.web.dao;
 
 import java.util.List;
 
-import com.nhn.pinpoint.common.dto2.thrift.AgentStat;
+import com.nhn.pinpoint.thrift.dto.AgentStat;
 
 public interface AgentStatDao {
 	
diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentStatDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentStatDao.java
index fb3c490e7..b0d2426a8 100644
--- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentStatDao.java
+++ b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentStatDao.java
@@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.hadoop.hbase.RowMapper;
 import org.springframework.stereotype.Repository;
 
-import com.nhn.pinpoint.common.dto2.thrift.AgentStat;
+import com.nhn.pinpoint.thrift.dto.AgentStat;
 import com.nhn.pinpoint.common.hbase.HBaseTables;
 import com.nhn.pinpoint.common.hbase.HbaseOperations2;
 import com.nhn.pinpoint.common.util.BytesUtils;
diff --git a/src/main/java/com/nhn/pinpoint/web/mapper/AgentStatMapper.java b/src/main/java/com/nhn/pinpoint/web/mapper/AgentStatMapper.java
index 142538a4a..31bd722a6 100644
--- a/src/main/java/com/nhn/pinpoint/web/mapper/AgentStatMapper.java
+++ b/src/main/java/com/nhn/pinpoint/web/mapper/AgentStatMapper.java
@@ -12,7 +12,7 @@ import org.apache.thrift.protocol.TProtocolFactory;
 import org.springframework.data.hadoop.hbase.RowMapper;
 import org.springframework.stereotype.Component;
 
-import com.nhn.pinpoint.common.dto2.thrift.AgentStat;
+import com.nhn.pinpoint.thrift.dto.AgentStat;
 
 /**
  * @author harebox
diff --git a/src/main/java/com/nhn/pinpoint/web/service/AgentStatService.java b/src/main/java/com/nhn/pinpoint/web/service/AgentStatService.java
index e87f95afb..283ce079d 100644
--- a/src/main/java/com/nhn/pinpoint/web/service/AgentStatService.java
+++ b/src/main/java/com/nhn/pinpoint/web/service/AgentStatService.java
@@ -2,7 +2,8 @@ package com.nhn.pinpoint.web.service;
 
 import java.util.List;
 
-import com.nhn.pinpoint.common.dto2.thrift.AgentStat;
+import com.nhn.pinpoint.thrift.dto.AgentStat;
+import com.nhn.pinpoint.thrift.dto.AgentStat;
 
 public interface AgentStatService {
 
diff --git a/src/main/java/com/nhn/pinpoint/web/service/AgentStatServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/AgentStatServiceImpl.java
index 1a41ff4d8..f2ae83407 100644
--- a/src/main/java/com/nhn/pinpoint/web/service/AgentStatServiceImpl.java
+++ b/src/main/java/com/nhn/pinpoint/web/service/AgentStatServiceImpl.java
@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.nhn.pinpoint.common.dto2.thrift.AgentStat;
+import com.nhn.pinpoint.thrift.dto.AgentStat;
 import com.nhn.pinpoint.web.dao.AgentStatDao;
 
 /**
diff --git a/src/main/java/com/nhn/pinpoint/web/vo/linechart/AgentStatLineChart.java b/src/main/java/com/nhn/pinpoint/web/vo/linechart/AgentStatLineChart.java
index 74052ed4e..1a0e6463e 100644
--- a/src/main/java/com/nhn/pinpoint/web/vo/linechart/AgentStatLineChart.java
+++ b/src/main/java/com/nhn/pinpoint/web/vo/linechart/AgentStatLineChart.java
@@ -3,9 +3,9 @@ package com.nhn.pinpoint.web.vo.linechart;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.nhn.pinpoint.common.dto2.thrift.AgentStat;
-import com.nhn.pinpoint.common.dto2.thrift.StatWithCmsCollector;
-import com.nhn.pinpoint.common.dto2.thrift.AgentStat._Fields;
+import com.nhn.pinpoint.thrift.dto.AgentStat;
+import com.nhn.pinpoint.thrift.dto.StatWithCmsCollector;
+import com.nhn.pinpoint.thrift.dto.AgentStat._Fields;
 
 /**
  * FIXME 일반화 해야 할까?
diff --git a/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDaoTest.java b/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDaoTest.java
index 2e760ba4d..2d04d25f5 100644
--- a/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDaoTest.java
+++ b/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentInfoDaoTest.java
@@ -9,7 +9,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.nhn.pinpoint.common.bo.AgentInfoBo;
-import com.nhn.pinpoint.common.dto2.thrift.AgentInfo;
+import com.nhn.pinpoint.thrift.dto.AgentInfo;
 
 /**
  *
diff --git a/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentStatDaoTest.java b/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentStatDaoTest.java
index 6949c6a6a..7d4ea84b1 100644
--- a/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentStatDaoTest.java
+++ b/src/test/java/com/nhn/pinpoint/web/dao/hbase/HbaseAgentStatDaoTest.java
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.nhn.pinpoint.common.dto2.thrift.AgentStat;
+import com.nhn.pinpoint.thrift.dto.AgentStat;
 
 /**
  * @author harebox
diff --git a/src/test/java/com/nhn/pinpoint/web/path/PathTest.java b/src/test/java/com/nhn/pinpoint/web/path/PathTest.java
index 068fe1ae6..744fa3133 100644
--- a/src/test/java/com/nhn/pinpoint/web/path/PathTest.java
+++ b/src/test/java/com/nhn/pinpoint/web/path/PathTest.java
@@ -4,7 +4,7 @@ import java.text.SimpleDateFormat;
 
 import org.junit.Test;
 
-import com.nhn.pinpoint.common.dto2.thrift.Span;
+import com.nhn.pinpoint.thrift.dto.Span;
 
 /**
  *
diff --git a/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java b/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java
index e3f50c57a..079fcfa68 100644
--- a/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java
+++ b/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java
@@ -24,8 +24,8 @@ import com.nhn.pinpoint.web.calltree.span.SpanAlign;
 import com.nhn.pinpoint.web.vo.TraceId;
 import com.nhn.pinpoint.common.AnnotationKey;
 import com.nhn.pinpoint.common.ServiceType;
-import com.nhn.pinpoint.common.dto2.thrift.Annotation;
-import com.nhn.pinpoint.common.dto2.thrift.Span;
+import com.nhn.pinpoint.thrift.dto.Annotation;
+import com.nhn.pinpoint.thrift.dto.Span;
 import com.nhn.pinpoint.common.hbase.HBaseTables;
 import com.nhn.pinpoint.common.hbase.HbaseTemplate2;
 import com.nhn.pinpoint.common.util.SpanUtils;