diff --git a/build/build.xml b/build/build.xml
index 409123914d3..782a08cbdad 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -427,27 +427,12 @@
             <maven-resource group="org.hornetq" artifact="hornetq-ra"/>
         </module-def>
 
-        <module-def name="org.infinispan.api">
+        <module-def name="org.infinispan">
             <maven-resource group="org.infinispan" artifact="infinispan-api"/>
-        </module-def>
-
-        <module-def name="org.infinispan.commons">
             <maven-resource group="org.infinispan" artifact="infinispan-commons"/>
-        </module-def>
-
-        <module-def name="org.infinispan">
             <maven-resource group="org.infinispan" artifact="infinispan-core"/>
-        </module-def>
-
-        <module-def name="org.infinispan.cachestore.jdbc">
             <maven-resource group="org.infinispan" artifact="infinispan-cachestore-jdbc"/>
-        </module-def>
-
-        <module-def name="org.infinispan.cachestore.remote">
             <maven-resource group="org.infinispan" artifact="infinispan-cachestore-remote"/>
-        </module-def>
-
-        <module-def name="org.infinispan.client.hotrod">
             <maven-resource group="org.infinispan" artifact="infinispan-client-hotrod"/>
         </module-def>
 
diff --git a/build/src/main/resources/modules/org/infinispan/api/main/module.xml b/build/src/main/resources/modules/org/infinispan/api/main/module.xml
deleted file mode 100644
index 3a1bca9a102..00000000000
--- a/build/src/main/resources/modules/org/infinispan/api/main/module.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module xmlns="urn:jboss:module:1.1" name="org.infinispan.api">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="org.jboss.logging"/>
-        <module name="org.jboss.marshalling"/>
-        <module name="org.jboss.marshalling.river" services="import"/>
-    </dependencies>
-</module>
diff --git a/build/src/main/resources/modules/org/infinispan/cachestore/jdbc/main/module.xml b/build/src/main/resources/modules/org/infinispan/cachestore/jdbc/main/module.xml
deleted file mode 100644
index 6dc4931b60c..00000000000
--- a/build/src/main/resources/modules/org/infinispan/cachestore/jdbc/main/module.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module xmlns="urn:jboss:module:1.0" name="org.infinispan.cachestore.jdbc">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="javax.transaction.api"/>
-        <module name="org.apache.commons.pool"/>
-        <module name="org.infinispan"/>
-        <module name="org.jboss.logging"/>
-    </dependencies>
-</module>
diff --git a/build/src/main/resources/modules/org/infinispan/cachestore/remote/main/module.xml b/build/src/main/resources/modules/org/infinispan/cachestore/remote/main/module.xml
deleted file mode 100644
index 78548978251..00000000000
--- a/build/src/main/resources/modules/org/infinispan/cachestore/remote/main/module.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module xmlns="urn:jboss:module:1.0" name="org.infinispan.cachestore.remote">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="javax.transaction.api"/>
-        <module name="org.infinispan"/>
-        <module name="org.infinispan.client.hotrod" export="true"/>
-        <module name="org.jboss.logging"/>
-    </dependencies>
-</module>
diff --git a/build/src/main/resources/modules/org/infinispan/client/hotrod/main/module.xml b/build/src/main/resources/modules/org/infinispan/client/hotrod/main/module.xml
deleted file mode 100644
index 214b87a4cda..00000000000
--- a/build/src/main/resources/modules/org/infinispan/client/hotrod/main/module.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module xmlns="urn:jboss:module:1.0" name="org.infinispan.client.hotrod">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="org.apache.commons.pool"/>
-        <module name="org.infinispan.commons"/>
-        <module name="org.jboss.logging"/>
-    </dependencies>
-</module>
diff --git a/build/src/main/resources/modules/org/infinispan/commons/main/module.xml b/build/src/main/resources/modules/org/infinispan/commons/main/module.xml
deleted file mode 100644
index 128da9a222b..00000000000
--- a/build/src/main/resources/modules/org/infinispan/commons/main/module.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module xmlns="urn:jboss:module:1.1" name="org.infinispan.commons">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="org.infinispan.api" export="true"/>
-        <module name="org.jboss.logging"/>
-        <module name="org.jboss.marshalling"/>
-        <module name="org.jboss.marshalling.river" services="import"/>
-    </dependencies>
-</module>
diff --git a/build/src/main/resources/modules/org/infinispan/main/module.xml b/build/src/main/resources/modules/org/infinispan/main/module.xml
index 2377b60c2fa..b428f3e95b0 100644
--- a/build/src/main/resources/modules/org/infinispan/main/module.xml
+++ b/build/src/main/resources/modules/org/infinispan/main/module.xml
@@ -29,8 +29,8 @@
         <module name="javax.api"/>
         <module name="javax.transaction.api"/>
         <module name="javax.xml.bind.api"/>
+        <module name="org.apache.commons.pool"/>
         <module name="org.apache.xerces" services="import"/>
-        <module name="org.infinispan.commons" export="true" />
         <module name="org.jboss.jandex"/>
         <module name="org.jboss.logging"/>
         <module name="org.jboss.marshalling"/>
diff --git a/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml b/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml
index 72a9918c3b0..815b338be6b 100644
--- a/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml
+++ b/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml
@@ -32,8 +32,6 @@
         <module name="javax.api"/>
         <module name="javax.transaction.api"/>
         <module name="org.infinispan"/>
-        <module name="org.infinispan.cachestore.jdbc"/>
-        <module name="org.infinispan.cachestore.remote" />
         <module name="org.jboss.as.clustering.common"/>
         <module name="org.jboss.as.clustering.jgroups" optional="true"/>
         <module name="org.jboss.as.controller"/>