diff --git a/dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java b/dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
index d14604ad41..a24ea82dd7 100644
--- a/dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
@@ -46,7 +46,7 @@ import com.alibaba.dubbo.rpc.cluster.directory.StaticDirectory;
 import com.alibaba.dubbo.rpc.cluster.support.AvailableCluster;
 import com.alibaba.dubbo.rpc.cluster.support.ClusterUtils;
 import com.alibaba.dubbo.rpc.protocol.injvm.InjvmProtocol;
-import com.alibaba.dubbo.service.GenericService;
+import com.alibaba.dubbo.rpc.service.GenericService;
 
 /**
  * ReferenceConfig
diff --git a/dubbo-config/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
index a4e00cd09e..5635c1c67b 100644
--- a/dubbo-config/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
@@ -42,7 +42,7 @@ import com.alibaba.dubbo.rpc.Protocol;
 import com.alibaba.dubbo.rpc.ProxyFactory;
 import com.alibaba.dubbo.rpc.RpcConstants;
 import com.alibaba.dubbo.rpc.RpcStatus;
-import com.alibaba.dubbo.service.GenericService;
+import com.alibaba.dubbo.rpc.service.GenericService;
 
 /**
  * ServiceConfig
diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/demo/consumer/GenericConsumer.java b/dubbo-config/src/test/java/com/alibaba/dubbo/demo/consumer/GenericConsumer.java
index 3b991638a0..2b4fcc2a05 100644
--- a/dubbo-config/src/test/java/com/alibaba/dubbo/demo/consumer/GenericConsumer.java
+++ b/dubbo-config/src/test/java/com/alibaba/dubbo/demo/consumer/GenericConsumer.java
@@ -20,7 +20,7 @@ import java.util.Map;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import com.alibaba.dubbo.service.GenericService;
+import com.alibaba.dubbo.rpc.service.GenericService;
 
 public class GenericConsumer {
 	
diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/demo/provider/impl/DemoServiceGenericImpl.java b/dubbo-config/src/test/java/com/alibaba/dubbo/demo/provider/impl/DemoServiceGenericImpl.java
index 5cf167accd..92e9c66f73 100644
--- a/dubbo-config/src/test/java/com/alibaba/dubbo/demo/provider/impl/DemoServiceGenericImpl.java
+++ b/dubbo-config/src/test/java/com/alibaba/dubbo/demo/provider/impl/DemoServiceGenericImpl.java
@@ -19,8 +19,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.alibaba.dubbo.rpc.RpcContext;
-import com.alibaba.dubbo.service.GenericException;
-import com.alibaba.dubbo.service.GenericService;
+import com.alibaba.dubbo.rpc.service.GenericException;
+import com.alibaba.dubbo.rpc.service.GenericService;
 
 /**
  * DemoServiceGenericeImpl
diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java
index db172a1463..3a58d33ddd 100644
--- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java
+++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java
@@ -28,7 +28,7 @@ import com.alibaba.dubbo.rpc.RpcException;
 import com.alibaba.dubbo.rpc.Invocation;
 import com.alibaba.dubbo.rpc.Result;
 import com.alibaba.dubbo.rpc.RpcResult;
-import com.alibaba.dubbo.service.GenericService;
+import com.alibaba.dubbo.rpc.service.GenericService;
 
 /**
  * ExceptionInvokerFilter
diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java
index 88160e9564..5f5f05d9ec 100644
--- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java
+++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java
@@ -28,7 +28,7 @@ import com.alibaba.dubbo.rpc.Invocation;
 import com.alibaba.dubbo.rpc.Result;
 import com.alibaba.dubbo.rpc.RpcInvocation;
 import com.alibaba.dubbo.rpc.RpcResult;
-import com.alibaba.dubbo.service.GenericException;
+import com.alibaba.dubbo.rpc.service.GenericException;
 
 /**
  * GenericInvokerFilter.
diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/EchoProxyFactoryWrapper.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/EchoProxyFactoryWrapper.java
index a7af922669..ea2fb22789 100644
--- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/EchoProxyFactoryWrapper.java
+++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/EchoProxyFactoryWrapper.java
@@ -19,7 +19,7 @@ import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.ProxyFactory;
 import com.alibaba.dubbo.rpc.RpcException;
-import com.alibaba.dubbo.service.EchoService;
+import com.alibaba.dubbo.rpc.service.EchoService;
 
 /**
  * EchoProxyFactoryWrapper
diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/MockProxyFactoryWrapper.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/MockProxyFactoryWrapper.java
index 832c96298b..537068e834 100644
--- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/MockProxyFactoryWrapper.java
+++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/MockProxyFactoryWrapper.java
@@ -26,7 +26,7 @@ import com.alibaba.dubbo.common.utils.ReflectUtils;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.ProxyFactory;
 import com.alibaba.dubbo.rpc.RpcException;
-import com.alibaba.dubbo.service.GenericService;
+import com.alibaba.dubbo.rpc.service.GenericService;
 
 /**
  * MockProxyFactoryWrapper
diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/StubProxyFactoryWrapper.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/StubProxyFactoryWrapper.java
index e59c6237f7..35b96e2c71 100644
--- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/StubProxyFactoryWrapper.java
+++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/proxy/StubProxyFactoryWrapper.java
@@ -33,7 +33,7 @@ import com.alibaba.dubbo.rpc.Protocol;
 import com.alibaba.dubbo.rpc.ProxyFactory;
 import com.alibaba.dubbo.rpc.RpcConstants;
 import com.alibaba.dubbo.rpc.RpcException;
-import com.alibaba.dubbo.service.GenericService;
+import com.alibaba.dubbo.rpc.service.GenericService;
 
 /**
  * StubProxyFactoryWrapper
diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/service/EchoService.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java
similarity index 93%
rename from dubbo-rpc/src/main/java/com/alibaba/dubbo/service/EchoService.java
rename to dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java
index b4e5eb6b59..c09fcd9e90 100644
--- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/service/EchoService.java
+++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.service;
+package com.alibaba.dubbo.rpc.service;
 
 /**
  * Echo service.
diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/service/GenericException.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java
similarity index 93%
rename from dubbo-rpc/src/main/java/com/alibaba/dubbo/service/GenericException.java
rename to dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java
index 1c8c829f06..81be78fa33 100644
--- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/service/GenericException.java
+++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.service;
+package com.alibaba.dubbo.rpc.service;
 
 import com.alibaba.dubbo.common.utils.StringUtils;
 
diff --git a/dubbo-rpc/src/main/java/com/alibaba/dubbo/service/GenericService.java b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java
similarity index 96%
rename from dubbo-rpc/src/main/java/com/alibaba/dubbo/service/GenericService.java
rename to dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java
index d73a22e34d..e8a0e3f3dc 100644
--- a/dubbo-rpc/src/main/java/com/alibaba/dubbo/service/GenericService.java
+++ b/dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.service;
+package com.alibaba.dubbo.rpc.service;
 
 /**
  * 通用服务接口
diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker
index 0c8334edc6..0dd9b93034 100644
--- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker
+++ b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker
@@ -1,2 +1,2 @@
-com.alibaba.dubbo.rpc.dubbo.status.ServerStatusChecker
-com.alibaba.dubbo.rpc.dubbo.status.ThreadPoolStatusChecker
\ No newline at end of file
+com.alibaba.dubbo.rpc.protocol.dubbo.status.ServerStatusChecker
+com.alibaba.dubbo.rpc.protocol.dubbo.status.ThreadPoolStatusChecker
\ No newline at end of file
diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec
index f932f0ad53..5b1044523d 100644
--- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec
+++ b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec
@@ -1 +1 @@
-com.alibaba.dubbo.rpc.dubbo.DubboCodec
\ No newline at end of file
+com.alibaba.dubbo.rpc.protocol.dubbo.DubboCodec
\ No newline at end of file
diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler
index 03eb87444e..6b17325395 100644
--- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler
+++ b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler
@@ -1,8 +1,8 @@
-com.alibaba.dubbo.rpc.dubbo.telnet.ListTelnetHandler
-com.alibaba.dubbo.rpc.dubbo.telnet.ChangeTelnetHandler
-com.alibaba.dubbo.rpc.dubbo.telnet.CurrentTelnetHandler
-com.alibaba.dubbo.rpc.dubbo.telnet.InvokeTelnetHandler
-com.alibaba.dubbo.rpc.dubbo.telnet.TraceTelnetHandler
-com.alibaba.dubbo.rpc.dubbo.telnet.CountTelnetHandler
-com.alibaba.dubbo.rpc.dubbo.telnet.PortTelnetHandler
-com.alibaba.dubbo.rpc.dubbo.telnet.LogTelnetHandler
\ No newline at end of file
+com.alibaba.dubbo.rpc.protocol.dubbo.telnet.ListTelnetHandler
+com.alibaba.dubbo.rpc.protocol.dubbo.telnet.ChangeTelnetHandler
+com.alibaba.dubbo.rpc.protocol.dubbo.telnet.CurrentTelnetHandler
+com.alibaba.dubbo.rpc.protocol.dubbo.telnet.InvokeTelnetHandler
+com.alibaba.dubbo.rpc.protocol.dubbo.telnet.TraceTelnetHandler
+com.alibaba.dubbo.rpc.protocol.dubbo.telnet.CountTelnetHandler
+com.alibaba.dubbo.rpc.protocol.dubbo.telnet.PortTelnetHandler
+com.alibaba.dubbo.rpc.protocol.dubbo.telnet.LogTelnetHandler
\ No newline at end of file
diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol
index b767d599d5..2793819bef 100644
--- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol
+++ b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol
@@ -1,4 +1,2 @@
-com.alibaba.dubbo.rpc.support.ProtocolFilterWrapper
-com.alibaba.dubbo.rpc.support.ProtocolListenerWrapper
-com.alibaba.dubbo.rpc.injvm.InjvmProtocol
-com.alibaba.dubbo.rpc.dubbo.DubboProtocol
\ No newline at end of file
+com.alibaba.dubbo.rpc.protocol.ProtocolFilterWrapper
+com.alibaba.dubbo.rpc.protocol.ProtocolListenerWrapper
\ No newline at end of file
diff --git a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.proxy.ProxyFactory b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.proxy.ProxyFactory
index a638a373a5..e3108e8576 100644
--- a/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.proxy.ProxyFactory
+++ b/dubbo-rpc/src/main/resources/META-INF/services/com.alibaba.dubbo.rpc.proxy.ProxyFactory
@@ -1,5 +1,5 @@
-com.alibaba.dubbo.rpc.proxy.wrapper.EchoProxyFactoryWrapper
-com.alibaba.dubbo.rpc.proxy.wrapper.MockProxyFactoryWrapper
-com.alibaba.dubbo.rpc.proxy.wrapper.StubProxyFactoryWrapper
-com.alibaba.dubbo.rpc.proxy.support.jdk.JdkProxyFactory
-com.alibaba.dubbo.rpc.proxy.support.javassist.JavassistProxyFactory
\ No newline at end of file
+com.alibaba.dubbo.rpc.proxy.EchoProxyFactoryWrapper
+com.alibaba.dubbo.rpc.proxy.MockProxyFactoryWrapper
+com.alibaba.dubbo.rpc.proxy.StubProxyFactoryWrapper
+com.alibaba.dubbo.rpc.proxy.jdk.JdkProxyFactory
+com.alibaba.dubbo.rpc.proxy.javassist.JavassistProxyFactory
\ No newline at end of file
diff --git a/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/generic/EnumBak.java b/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/generic/EnumBak.java
index b2b80a8efa..7596fbb5ea 100644
--- a/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/generic/EnumBak.java
+++ b/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/generic/EnumBak.java
@@ -30,10 +30,10 @@ import com.alibaba.dubbo.common.utils.NetUtils;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.Protocol;
 import com.alibaba.dubbo.rpc.ProxyFactory;
+import com.alibaba.dubbo.rpc.service.GenericService;
 import com.alibaba.dubbo.rpc.support.DemoService;
 import com.alibaba.dubbo.rpc.support.DemoServiceImpl;
 import com.alibaba.dubbo.rpc.support.Type;
-import com.alibaba.dubbo.service.GenericService;
 
 public class EnumBak {
     
diff --git a/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/proxy/ProtocolsTest.java b/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/proxy/ProtocolsTest.java
index 981cc84cdb..047088e18c 100644
--- a/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/proxy/ProtocolsTest.java
+++ b/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/proxy/ProtocolsTest.java
@@ -24,7 +24,7 @@ import com.alibaba.dubbo.common.ExtensionLoader;
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.rpc.Protocol;
 import com.alibaba.dubbo.rpc.ProxyFactory;
-import com.alibaba.dubbo.service.EchoService;
+import com.alibaba.dubbo.rpc.service.EchoService;
 
 /**
  * <code>ProxiesTest</code>
diff --git a/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/proxy/RpcFilterTest.java b/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/proxy/RpcFilterTest.java
index bb19e7fbcc..b8afb78ab0 100644
--- a/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/proxy/RpcFilterTest.java
+++ b/dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/proxy/RpcFilterTest.java
@@ -21,7 +21,7 @@ import com.alibaba.dubbo.common.ExtensionLoader;
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.rpc.Protocol;
 import com.alibaba.dubbo.rpc.ProxyFactory;
-import com.alibaba.dubbo.service.EchoService;
+import com.alibaba.dubbo.rpc.service.EchoService;
 
 public class RpcFilterTest extends TestCase
 {