Index: lams_build/build.xml
===================================================================
diff -u -r064f5c7add906780deedc6a3995c87e69128473e -rc8b89fd7e7360e2f86eb56a02ad492ea42827a52
--- lams_build/build.xml	(.../build.xml)	(revision 064f5c7add906780deedc6a3995c87e69128473e)
+++ lams_build/build.xml	(.../build.xml)	(revision c8b89fd7e7360e2f86eb56a02ad492ea42827a52)
@@ -723,9 +723,12 @@
 		<copy tofile="${server.home}/modules/system/layers/base/com/thoughtworks/xstream/main/module.xml"
 			  file="lib/xstream/xstream.module.xml" overwrite="true" verbose="true" />
 		
+
 		
+		<ant antfile="../lams_common/build.xml" target="deploy-libraries" inheritAll="false"/>
 		
 		
+		
 		<echo>${ant.project.name}: Deploying configuration files</echo>
 		<copy todir="${server.home}/standalone/configuration" overwrite="true" verbose="true">
 			<fileset dir="${conf.dir}">
@@ -783,9 +786,6 @@
 				<include name="*.jar" />
 			</fileset>
 		</copy>
-		
-		
-		<ant antfile="../lams_common/build.xml" target="deploy-libraries" inheritAll="false"/>
 		-->
 	</target>
 	
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
diff -u -r59dec34e8cbb27c683d552094086fa33faa70ff1 -rc8b89fd7e7360e2f86eb56a02ad492ea42827a52
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 59dec34e8cbb27c683d552094086fa33faa70ff1)
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision c8b89fd7e7360e2f86eb56a02ad492ea42827a52)
@@ -50,6 +50,8 @@
       <module name="com.allaire.wddx" />
       <module name="org.apache.xmlcommons" />
       <module name="com.thoughtworks.xstream" /> <!-- depends on: xom, xpp, joda -->
+      <module name="org.lamsfoundation.lams.session" />
+      <module name="org.lamsfoundation.lams.valve" />
       
       <!-- Import META-INF/services for ServiceLoader impls as well
       <module name="myservicemodule" services="import"/>
Index: lams_common/build.xml
===================================================================
diff -u -r46b0e46b2122c1e3173c14e664b98b33f97b079f -rc8b89fd7e7360e2f86eb56a02ad492ea42827a52
--- lams_common/build.xml	(.../build.xml)	(revision 46b0e46b2122c1e3173c14e664b98b33f97b079f)
+++ lams_common/build.xml	(.../build.xml)	(revision c8b89fd7e7360e2f86eb56a02ad492ea42827a52)
@@ -72,13 +72,16 @@
 
 	
 	<target name="deploy-libraries" depends="_build-jar" description="Deploys library JARs.">
-		<echo>Deploying library JARs</echo>
-		<copy todir="${server.home}server/default/lib" overwrite="true" verbose="true">
-			<fileset dir="${basedir}/build/lib/">
-				<include name="lams-session.jar" />
-				<include name="lams-valve.jar" />
-			</fileset>
-		</copy>
+		<echo>Deploying library JARs as WildFly modules</echo>
+		<copy todir="${server.home}/modules/system/layers/base/org/lamsfoundation/lams/session/main" 
+			  file="${basedir}/build/lib/lams-session.jar" overwrite="true" verbose="true" />
+		<copy tofile="${server.home}/modules/system/layers/base/org/lamsfoundation/lams/session/main/module.xml"
+			  file="${basedir}/conf/module_descriptors/session.module.xml" overwrite="true" verbose="true" />
+		
+		<copy todir="${server.home}/modules/system/layers/base/org/lamsfoundation/lams/valve/main" 
+			  file="${basedir}/build/lib/lams-valve.jar" overwrite="true" verbose="true" />
+		<copy tofile="${server.home}/modules/system/layers/base/org/lamsfoundation/lams/valve/main/module.xml"
+			  file="${basedir}/conf/module_descriptors/valve.module.xml" overwrite="true" verbose="true" />
 	</target>
 	
 	
Index: lams_common/conf/module_descriptors/session.module.xml
===================================================================
diff -u
--- lams_common/conf/module_descriptors/session.module.xml	(revision 0)
+++ lams_common/conf/module_descriptors/session.module.xml	(revision c8b89fd7e7360e2f86eb56a02ad492ea42827a52)
@@ -0,0 +1,29 @@
+<?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.3" name="org.lamsfoundation.lams.session">
+  <resources>
+    <resource-root path="lams-session.jar"/>
+  </resources>
+</module>
Index: lams_common/conf/module_descriptors/valve.module.xml
===================================================================
diff -u
--- lams_common/conf/module_descriptors/valve.module.xml	(revision 0)
+++ lams_common/conf/module_descriptors/valve.module.xml	(revision c8b89fd7e7360e2f86eb56a02ad492ea42827a52)
@@ -0,0 +1,29 @@
+<?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.3" name="org.lamsfoundation.lams.valve">
+  <resources>
+    <resource-root path="lams-valve.jar"/>
+  </resources>
+</module>