diff --git a/activeio/activeio-core/src/main/java/org/apache/activeio/ChannelFactory.java b/activeio/activeio-core/src/main/java/org/apache/activeio/ChannelFactory.java
index 2ad8c80390..eb01f68794 100644
--- a/activeio/activeio-core/src/main/java/org/apache/activeio/ChannelFactory.java
+++ b/activeio/activeio-core/src/main/java/org/apache/activeio/ChannelFactory.java
@@ -43,7 +43,7 @@ import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
  * {@see org.apache.activeio.Channel}s and {@see org.apache.activeio.ChannelServer}s.
  * 
  * Each URI scheme that {@see ChannelFactory}object handles will have a
- * properties file located at: "META-INF/org.apache.activeio.ChannelFactory/{scheme}".
+ * properties file located at: "META-INF/services/org/apache/activeio/channel/{scheme}".
  * 
  */
 public class ChannelFactory implements SyncChannelFactory, AsyncChannelFactory {
@@ -63,7 +63,7 @@ public class ChannelFactory implements SyncChannelFactory, AsyncChannelFactory {
         });
     }
 
-    private static FactoryFinder finder = new FactoryFinder("META-INF/org.apache.activeio.ChannelFactory/");
+    private static FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activeio/channel/");
 
     public SyncChannel openSyncChannel(URI location) throws IOException {
         SyncChannelFactory factory = getSynchChannelFactory(location.getScheme());
diff --git a/activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/datagram b/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/datagram
similarity index 100%
rename from activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/datagram
rename to activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/datagram
diff --git a/activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/multicast b/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/multicast
similarity index 100%
rename from activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/multicast
rename to activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/multicast
diff --git a/activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/nio b/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio
similarity index 100%
rename from activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/nio
rename to activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio
diff --git a/activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/nio-async b/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-async
similarity index 100%
rename from activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/nio-async
rename to activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-async
diff --git a/activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/nio-sync b/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-sync
similarity index 100%
rename from activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/nio-sync
rename to activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-sync
diff --git a/activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/socket b/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/socket
similarity index 100%
rename from activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/socket
rename to activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/socket
diff --git a/activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/ssl b/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/ssl
similarity index 100%
rename from activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/ssl
rename to activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/ssl
diff --git a/activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/vmpipe b/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/vmpipe
similarity index 100%
rename from activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/vmpipe
rename to activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/vmpipe