diff --git a/spring-faces/.classpath b/spring-faces/.classpath
index 22c6d18c..ca7997f3 100644
--- a/spring-faces/.classpath
+++ b/spring-faces/.classpath
@@ -3,5 +3,34 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/global/ognl.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-binding.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-core.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-web.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-webflow.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-webmvc.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/avalon-framework.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-beanutils.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-codec.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-collections.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-digester.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-discovery.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/concurrent.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/el-api.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/log4j.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/logkit.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/myfaces-api.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/myfaces-impl.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/shale-remoting.jar"/>
+	<classpathentry kind="lib" path="lib/test/easymock.jar"/>
+	<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
+	<classpathentry kind="lib" path="lib/test/junit.jar"/>
+	<classpathentry kind="lib" path="lib/test/log4j.jar"/>
+	<classpathentry kind="lib" path="lib/test/shale-test.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/servlet-api.jar"/>
+	<classpathentry kind="lib" path="lib/test/spring-mock.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml
index f1c8e2b5..8224448d 100644
--- a/spring-faces/ivy.xml
+++ b/spring-faces/ivy.xml
@@ -7,14 +7,42 @@
 		<conf name="global" visibility="private" />
 		<conf name="buildtime" visibility="private" />
 		<conf name="test" visibility="private" />
+		
+		<!-- public JSF configurations other projects may use -->
+		<conf name="default" extends="jsf12" />
+		<conf name="jsf11" visibility="public" extends="global" />
+		<conf name="jsf12" visibility="public" extends="global" />
 	</configurations>
 
 	<dependencies defaultconf="global->default">
 		<!-- global dependencies -->
+		<dependency org="org.springframework" name="spring-webflow" rev="latest.integration" />
 
 		<!-- build time only dependencies -->
+		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
+		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default" />
+		
+		<!-- JSF 1.2 dependencies -->
+		<!-- note that at this time we depend on MyFaces, not JSF-RI -->
+		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.0" conf="buildtime, jsf12->default" />
+		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.0" conf="buildtime, jsf12->default" />
+		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime, jsf12->default" />
+    	<dependency org="commons-digester" name="commons-digester" rev="1.8" conf="buildtime, jsf12->default" >
+    		<exclude module="servlet-api"/>
+    	</dependency>
+    	<dependency org="commons-codec" name="commons-codec" rev="1.3" conf="buildtime, jsf12->default" />
+    	<dependency org="commons-discovery" name="commons-discovery" rev="0.4" conf="buildtime, jsf12->default" />
+    	<dependency org="commons-collections" name="commons-collections" rev="3.2" conf="buildtime, jsf12->default" />
+		<dependency org="org.apache.shale" name="shale-remoting" rev="1.0.4" conf="buildtime, jsf12->default" />
 		
 		<!-- test dependencies -->
+		<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
+		<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default" />
+		<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
+		<dependency org="jboss" name="jboss-el" rev="1.0" conf="test->default"/>
+		<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
+		<dependency org="org.springframework" name="spring-mock" rev="2.1-m3" conf="test->default" />
+		
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-faces/src/etc/test-resources/log4j.properties b/spring-faces/src/etc/test-resources/log4j.properties
new file mode 100644
index 00000000..eaa1b2ae
--- /dev/null
+++ b/spring-faces/src/etc/test-resources/log4j.properties
@@ -0,0 +1,18 @@
+log4j.rootCategory=WARN, stdout, logfile
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.appender.logfile=org.apache.log4j.RollingFileAppender
+log4j.appender.logfile.File=@TEST_RESULTS_DIR@/@PROJECT_NAME@.log
+log4j.appender.logfile.MaxFileSize=512KB
+
+# Keep three backup files
+log4j.appender.logfile.MaxBackupIndex=3
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+#Pattern to output : date priority [category] - <message>line_separator
+log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.category.org.springframework.webflow=DEBUG
+log4j.category.org.springframework.binding=DEBUG
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/META-INF/faces-config.xml b/spring-faces/src/main/java/META-INF/faces-config.xml
similarity index 100%
rename from spring-webflow/src/main/java/META-INF/faces-config.xml
rename to spring-faces/src/main/java/META-INF/faces-config.xml
diff --git a/spring-webflow/src/main/java/META-INF/springfaces.taglib.xml b/spring-faces/src/main/java/META-INF/springfaces.taglib.xml
similarity index 100%
rename from spring-webflow/src/main/java/META-INF/springfaces.taglib.xml
rename to spring-faces/src/main/java/META-INF/springfaces.taglib.xml
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/AbstractFlowExecutionPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/el/AbstractFlowExecutionPropertyResolver.java
similarity index 99%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/AbstractFlowExecutionPropertyResolver.java
rename to spring-faces/src/main/java/org/springframework/faces/el/AbstractFlowExecutionPropertyResolver.java
index 08b5e38c..e82c9920 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/AbstractFlowExecutionPropertyResolver.java
+++ b/spring-faces/src/main/java/org/springframework/faces/el/AbstractFlowExecutionPropertyResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.faces.el.EvaluationException;
 import javax.faces.el.PropertyNotFoundException;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/DelegatingFlowVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java
similarity index 97%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/DelegatingFlowVariableResolver.java
rename to spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java
index 8ea04536..5cbd5993 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/DelegatingFlowVariableResolver.java
+++ b/spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
+import org.springframework.faces.webflow.FlowExecutionHolderUtils;
 import org.springframework.web.jsf.DelegatingVariableResolver;
 import org.springframework.webflow.execution.FlowExecution;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java
similarity index 98%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java
rename to spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java
index 71667c48..b9d6f2a9 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java
+++ b/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import java.util.Map;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionVariableResolver.java
similarity index 96%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionVariableResolver.java
rename to spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionVariableResolver.java
index d689a5c1..2ab359d3 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionVariableResolver.java
+++ b/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionVariableResolver.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
+import org.springframework.faces.webflow.FlowExecutionHolderUtils;
 import org.springframework.webflow.execution.FlowExecution;
 
 /**
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/el/FlowPropertyResolver.java
similarity index 98%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowPropertyResolver.java
rename to spring-faces/src/main/java/org/springframework/faces/el/FlowPropertyResolver.java
index 12cde8e9..58e66404 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowPropertyResolver.java
+++ b/spring-faces/src/main/java/org/springframework/faces/el/FlowPropertyResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.PropertyResolver;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/el/FlowVariableResolver.java
similarity index 96%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowVariableResolver.java
rename to spring-faces/src/main/java/org/springframework/faces/el/FlowVariableResolver.java
index 5b0d97d7..4f4e9fb7 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowVariableResolver.java
+++ b/spring-faces/src/main/java/org/springframework/faces/el/FlowVariableResolver.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
+import org.springframework.faces.webflow.FlowExecutionHolderUtils;
+
 /**
  * Custom variable resolver that resolves the current FlowExecution object for binding expressions prefixed with
  * {@link #FLOW_SCOPE_VARIABLE}. For instance "flowScope.myBean.myProperty". Designed to be used in conjunction with
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java b/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELExpressionParser.java
similarity index 96%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java
rename to spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELExpressionParser.java
index ab318a7d..559966d2 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java
+++ b/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELExpressionParser.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.el.ELContext;
 import javax.el.ELResolver;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELResolverAdapter.java b/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELResolverAdapter.java
similarity index 98%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELResolverAdapter.java
rename to spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELResolverAdapter.java
index 98a4da66..537f8171 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELResolverAdapter.java
+++ b/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELResolverAdapter.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import java.util.Collections;
 import java.util.Iterator;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java b/spring-faces/src/main/java/org/springframework/faces/el/Jsf12ELExpressionParser.java
similarity index 94%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java
rename to spring-faces/src/main/java/org/springframework/faces/el/Jsf12ELExpressionParser.java
index 2b2f2f58..4f7b69cc 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java
+++ b/spring-faces/src/main/java/org/springframework/faces/el/Jsf12ELExpressionParser.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.el.ELContext;
 import javax.el.ExpressionFactory;
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ClientDateValidator.java b/spring-faces/src/main/java/org/springframework/faces/ui/ClientDateValidator.java
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ClientDateValidator.java
rename to spring-faces/src/main/java/org/springframework/faces/ui/ClientDateValidator.java
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ClientNumberValidator.java b/spring-faces/src/main/java/org/springframework/faces/ui/ClientNumberValidator.java
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ClientNumberValidator.java
rename to spring-faces/src/main/java/org/springframework/faces/ui/ClientNumberValidator.java
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ClientTextValidator.java b/spring-faces/src/main/java/org/springframework/faces/ui/ClientTextValidator.java
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ClientTextValidator.java
rename to spring-faces/src/main/java/org/springframework/faces/ui/ClientTextValidator.java
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ExtAdvisor.java b/spring-faces/src/main/java/org/springframework/faces/ui/ExtAdvisor.java
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ExtAdvisor.java
rename to spring-faces/src/main/java/org/springframework/faces/ui/ExtAdvisor.java
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ExtAdvisorRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ExtAdvisorRenderer.java
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ExtAdvisorRenderer.java
rename to spring-faces/src/main/java/org/springframework/faces/ui/ExtAdvisorRenderer.java
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ExtJsComponent.java b/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsComponent.java
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ExtJsComponent.java
rename to spring-faces/src/main/java/org/springframework/faces/ui/ExtJsComponent.java
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java
rename to spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ExtValidateAllRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ExtValidateAllRenderer.java
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ExtValidateAllRenderer.java
rename to spring-faces/src/main/java/org/springframework/faces/ui/ExtValidateAllRenderer.java
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/SpringFaces.js b/spring-faces/src/main/java/org/springframework/faces/ui/SpringFaces.js
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/SpringFaces.js
rename to spring-faces/src/main/java/org/springframework/faces/ui/SpringFaces.js
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/ext.js b/spring-faces/src/main/java/org/springframework/faces/ui/ext/ext.js
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/ext.js
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/ext.js
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/css/ext-all.css b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/css/ext-all.css
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/css/ext-all.css
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/css/ext-all.css
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-arrow.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-arrow.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-arrow.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-arrow.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-sprite.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-sprite.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-sprite.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-sprite.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/close.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/close.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/close.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/close.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/collapse.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/collapse.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/collapse.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/collapse.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/e-handle.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/e-handle.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/e-handle.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/e-handle.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/expand.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/expand.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/expand.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/expand.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/hd-sprite.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/hd-sprite.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/hd-sprite.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/hd-sprite.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress2.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress2.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress2.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress2.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/s-handle.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/s-handle.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/s-handle.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/s-handle.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/se-handle.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/se-handle.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/se-handle.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/se-handle.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners-blue.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners-blue.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners-blue.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners-blue.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l-blue.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l-blue.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l-blue.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l-blue.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r-blue.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r-blue.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r-blue.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r-blue.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb-blue.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb-blue.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb-blue.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb-blue.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-add.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-add.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-add.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-add.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-no.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-no.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-no.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-no.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-yes.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-yes.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-yes.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-yes.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/editor/tb-sprite.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/editor/tb-sprite.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/editor/tb-sprite.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/editor/tb-sprite.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.psd b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.psd
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.psd
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.psd
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.psd b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.psd
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.psd
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.psd
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/error-tip-corners.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/error-tip-corners.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/error-tip-corners.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/error-tip-corners.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/exclamation.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/exclamation.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/exclamation.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/exclamation.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.psd b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.psd
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.psd
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.psd
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/text-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/text-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/text-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/text-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger-tpl.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger-tpl.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger-tpl.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger-tpl.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.psd b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.psd
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.psd
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.psd
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/gradient-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/gradient-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/gradient-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/gradient-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/Thumbs.db b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/Thumbs.db
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/Thumbs.db
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/Thumbs.db
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-left-white.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-left-white.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-left-white.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-left-white.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-right-white.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-right-white.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-right-white.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-right-white.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-bottom.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-bottom.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-bottom.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-bottom.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-top.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-top.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-top.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-top.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/dirty.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/dirty.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/dirty.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/dirty.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/done.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/done.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/done.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/done.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-no.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-no.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-no.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-no.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-yes.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-yes.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-yes.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-yes.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/footer-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/footer-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/footer-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/footer-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-hd.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-hd.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-hd.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-hd.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-split.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-split.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-split.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-split.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-hrow.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-hrow.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-hrow.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-hrow.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-loading.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-loading.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-loading.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-loading.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-split.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-split.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-split.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-split.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-vista-hd.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-vista-hd.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-vista-hd.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-vista-hd.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hd-btn.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hd-btn.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hd-btn.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hd-btn.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow-over.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow-over.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow-over.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow-over.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hd-pop.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hd-pop.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hd-pop.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hd-pop.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-asc.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-asc.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-asc.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-asc.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-desc.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-desc.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-desc.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-desc.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.png b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.png
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.png
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.png
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.png b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.png
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.png
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.png
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/invalid_line.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/invalid_line.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/invalid_line.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/invalid_line.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/loading.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/loading.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/loading.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/loading.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/mso-hd.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/mso-hd.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/mso-hd.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/mso-hd.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/nowait.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/nowait.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/nowait.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/nowait.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first-disabled.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first-disabled.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first-disabled.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first-disabled.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last-disabled.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last-disabled.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last-disabled.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last-disabled.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next-disabled.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next-disabled.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next-disabled.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next-disabled.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev-disabled.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev-disabled.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev-disabled.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev-disabled.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/pick-button.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/pick-button.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/pick-button.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/pick-button.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/refresh.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/refresh.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/refresh.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/refresh.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-check-sprite.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-check-sprite.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-check-sprite.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-check-sprite.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-expand-sprite.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-expand-sprite.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-expand-sprite.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-expand-sprite.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-over.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-over.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-over.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-over.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-sel.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-sel.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-sel.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-sel.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_asc.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_asc.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_asc.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_asc.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_desc.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_desc.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_desc.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_desc.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/wait.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/wait.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/wait.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/wait.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/collapse.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/collapse.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/collapse.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/collapse.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/expand.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/expand.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/expand.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/expand.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/gradient-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/gradient-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/gradient-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/gradient-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-collapse.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-collapse.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-collapse.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-collapse.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-expand.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-expand.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-expand.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-expand.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-close.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-close.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-close.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-close.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-light-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-light-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-light-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-light-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stick.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stick.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stick.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stick.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stuck.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stuck.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stuck.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stuck.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close-on.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close-on.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close-on.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close-on.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/checked.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/checked.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/checked.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/checked.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/group-checked.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/group-checked.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/group-checked.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/group-checked.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu-parent.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu-parent.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu-parent.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu-parent.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/unchecked.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/unchecked.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/unchecked.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/unchecked.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/panel/tool-sprites.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/panel/tool-sprites.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/panel/tool-sprites.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/panel/tool-sprites.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/close.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/close.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/close.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/close.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/tip-sprite.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/tip-sprite.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/tip-sprite.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/tip-sprite.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/s.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/s.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/s.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/s.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-c.png b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-c.png
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-c.png
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-c.png
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-lr.png b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-lr.png
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-lr.png
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-lr.png
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow.png b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow.png
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow.png
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow.png
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/calendar.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/calendar.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/calendar.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/calendar.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/glass-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/glass-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/glass-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/glass-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/left-btn.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/left-btn.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/left-btn.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/left-btn.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/right-btn.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/right-btn.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/right-btn.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/right-btn.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/warning.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/warning.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/warning.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/warning.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle-dark.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle-dark.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle-dark.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle-dark.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle-dark.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle-dark.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle-dark.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle-dark.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle-dark.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle-dark.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle-dark.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle-dark.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle-dark.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle-dark.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle-dark.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle-dark.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle-dark.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle-dark.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle-dark.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle-dark.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/square.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/square.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/square.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/square.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle-dark.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle-dark.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle-dark.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle-dark.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-left-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-left-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-left-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-left-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-right-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-right-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-right-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-right-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-sprite.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-sprite.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-sprite.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-sprite.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow-light.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow-light.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow-light.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow-light.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-over-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-over-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-over-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-over-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/gray-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/gray-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/gray-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/gray-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-bg.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-bg.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-bg.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-bg.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-btn-sprite.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-btn-sprite.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-btn-sprite.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-btn-sprite.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-add.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-add.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-add.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-add.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-between.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-between.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-between.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-between.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-no.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-no.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-no.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-no.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-over.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-over.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-over.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-over.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-under.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-under.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-under.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-under.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-yes.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-yes.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-yes.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-yes.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus-nl.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus-nl.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus-nl.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus-nl.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus-nl.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus-nl.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus-nl.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus-nl.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-line.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-line.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-line.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-line.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus-nl.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus-nl.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus-nl.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus-nl.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus-nl.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus-nl.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus-nl.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus-nl.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder-open.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder-open.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder-open.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder-open.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/leaf.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/leaf.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/leaf.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/leaf.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/loading.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/loading.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/loading.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/loading.gif
diff --git a/spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/s.gif b/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/s.gif
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/s.gif
rename to spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/s.gif
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolder.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowExecutionHolder.java
similarity index 98%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolder.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/FlowExecutionHolder.java
index d6965dab..72916e48 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolder.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowExecutionHolder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.io.Serializable;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolderUtils.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowExecutionHolderUtils.java
similarity index 98%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolderUtils.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/FlowExecutionHolderUtils.java
index e6bc578f..c87ff6a8 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolderUtils.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowExecutionHolderUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionKeyStateHolder.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowExecutionKeyStateHolder.java
similarity index 99%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionKeyStateHolder.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/FlowExecutionKeyStateHolder.java
index 662c4e90..175795a8 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionKeyStateHolder.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowExecutionKeyStateHolder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponentBase;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowFacesUtils.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesUtils.java
similarity index 99%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowFacesUtils.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesUtils.java
index 00fd5cd6..ec7ab844 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowFacesUtils.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import javax.faces.context.FacesContext;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowNavigationHandler.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowNavigationHandler.java
similarity index 99%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowNavigationHandler.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/FlowNavigationHandler.java
index 88f14d07..c0f4a8f4 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowNavigationHandler.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowNavigationHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import javax.faces.application.NavigationHandler;
 import javax.faces.context.FacesContext;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractor.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowNavigationHandlerArgumentExtractor.java
similarity index 98%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractor.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/FlowNavigationHandlerArgumentExtractor.java
index 62662a69..5d3d5a27 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractor.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowNavigationHandlerArgumentExtractor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import org.springframework.util.StringUtils;
 import org.springframework.webflow.context.ExternalContext;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowPhaseListener.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPhaseListener.java
similarity index 99%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowPhaseListener.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/FlowPhaseListener.java
index 092fe96e..ea9ef023 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowPhaseListener.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPhaseListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.io.IOException;
 import java.util.Iterator;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilter.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowSystemCleanupFilter.java
similarity index 98%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilter.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/FlowSystemCleanupFilter.java
index 68a39d3b..e1c9afca 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilter.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowSystemCleanupFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.io.IOException;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/JsfExternalContext.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfExternalContext.java
similarity index 99%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/JsfExternalContext.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/JsfExternalContext.java
index 17bb9dfb..f09cdb21 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/JsfExternalContext.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfExternalContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import javax.faces.context.FacesContext;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/JsfFlowConfigurationException.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfFlowConfigurationException.java
similarity index 92%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/JsfFlowConfigurationException.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/JsfFlowConfigurationException.java
index 9d069ffd..c54935fe 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/JsfFlowConfigurationException.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfFlowConfigurationException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import org.springframework.webflow.core.FlowException;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/ViewIdMapper.java b/spring-faces/src/main/java/org/springframework/faces/webflow/ViewIdMapper.java
similarity index 96%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/ViewIdMapper.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/ViewIdMapper.java
index 22061858..91a32905 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/ViewIdMapper.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/ViewIdMapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import javax.faces.application.ViewHandler;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/package.html b/spring-faces/src/main/java/org/springframework/faces/webflow/package.html
similarity index 100%
rename from spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/package.html
rename to spring-faces/src/main/java/org/springframework/faces/webflow/package.html
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractorTests.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractorTests.java
similarity index 93%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractorTests.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractorTests.java
index 3b1671c3..4e281e6f 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractorTests.java
+++ b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractorTests.java
@@ -17,6 +17,8 @@ package org.springframework.webflow.executor.jsf;
 
 import junit.framework.TestCase;
 
+import org.springframework.faces.webflow.FlowNavigationHandlerArgumentExtractor;
+import org.springframework.faces.webflow.JsfExternalContext;
 import org.springframework.webflow.executor.support.FlowExecutorArgumentExtractionException;
 
 public class FlowNavigationHandlerArgumentExtractorTests extends TestCase {
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowPropertyResolverTests.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowPropertyResolverTests.java
similarity index 98%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowPropertyResolverTests.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowPropertyResolverTests.java
index ae0998ff..ad8b3b8c 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowPropertyResolverTests.java
+++ b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowPropertyResolverTests.java
@@ -23,6 +23,7 @@ import javax.faces.el.ReferenceSyntaxException;
 import junit.framework.TestCase;
 
 import org.easymock.EasyMock;
+import org.springframework.faces.el.FlowPropertyResolver;
 import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.test.MockFlowSession;
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilterTests.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilterTests.java
similarity index 96%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilterTests.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilterTests.java
index 73894095..07d9cc07 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilterTests.java
+++ b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilterTests.java
@@ -24,6 +24,8 @@ import javax.servlet.ServletResponse;
 
 import junit.framework.TestCase;
 
+import org.springframework.faces.webflow.FlowExecutionHolder;
+import org.springframework.faces.webflow.FlowSystemCleanupFilter;
 import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowVariableResolverTests.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowVariableResolverTests.java
similarity index 94%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowVariableResolverTests.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowVariableResolverTests.java
index 9c6752d1..bda513e1 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/FlowVariableResolverTests.java
+++ b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowVariableResolverTests.java
@@ -22,6 +22,9 @@ import javax.faces.el.VariableResolver;
 import junit.framework.TestCase;
 
 import org.easymock.EasyMock;
+import org.springframework.faces.el.FlowVariableResolver;
+import org.springframework.faces.webflow.FlowExecutionHolder;
+import org.springframework.faces.webflow.FlowExecutionHolderUtils;
 import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.repository.FlowExecutionKey;
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSF11ManagedBeanAccessTests.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF11ManagedBeanAccessTests.java
similarity index 88%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSF11ManagedBeanAccessTests.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF11ManagedBeanAccessTests.java
index cb8b5c36..d1c987ff 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSF11ManagedBeanAccessTests.java
+++ b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF11ManagedBeanAccessTests.java
@@ -8,6 +8,14 @@ import org.easymock.EasyMock;
 import org.jboss.el.ExpressionFactoryImpl;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.faces.el.DelegatingFlowVariableResolver;
+import org.springframework.faces.el.FlowPropertyResolver;
+import org.springframework.faces.el.FlowVariableResolver;
+import org.springframework.faces.el.Jsf11ELExpressionParser;
+import org.springframework.faces.webflow.FlowExecutionHolder;
+import org.springframework.faces.webflow.FlowExecutionHolderUtils;
+import org.springframework.faces.webflow.FlowNavigationHandler;
+import org.springframework.faces.webflow.FlowPhaseListener;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.jsf.DelegatingVariableResolver;
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSF12ManagedBeanAccessTests.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF12ManagedBeanAccessTests.java
similarity index 94%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSF12ManagedBeanAccessTests.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF12ManagedBeanAccessTests.java
index b37b96f9..941009cc 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSF12ManagedBeanAccessTests.java
+++ b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF12ManagedBeanAccessTests.java
@@ -3,6 +3,7 @@ package org.springframework.webflow.executor.jsf;
 import org.jboss.el.ExpressionFactoryImpl;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.faces.el.Jsf12ELExpressionParser;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.webflow.test.MockFlowServiceLocator;
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSFManagedBean.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFManagedBean.java
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSFManagedBean.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFManagedBean.java
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSFMockHelper.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFMockHelper.java
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSFMockHelper.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFMockHelper.java
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSFModel.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFModel.java
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/JSFModel.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFModel.java
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockApplication.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockApplication.java
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockApplication.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockApplication.java
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockFacesContext.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockFacesContext.java
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockFacesContext.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockFacesContext.java
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockJsfExternalContext.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockJsfExternalContext.java
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockJsfExternalContext.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockJsfExternalContext.java
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockService.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockService.java
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockService.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockService.java
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockViewHandler.java b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockViewHandler.java
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/MockViewHandler.java
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockViewHandler.java
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow-beans.xml b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow-beans.xml
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow-beans.xml
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow-beans.xml
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow.xml b/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow.xml
similarity index 100%
rename from spring-webflow/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow.xml
rename to spring-faces/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow.xml
diff --git a/spring-webflow-samples/booking-jsf/ivy.xml b/spring-webflow-samples/booking-jsf/ivy.xml
index dfdb38b8..dacb44b9 100755
--- a/spring-webflow-samples/booking-jsf/ivy.xml
+++ b/spring-webflow-samples/booking-jsf/ivy.xml
@@ -15,7 +15,7 @@
     <dependency org="taglibs" name="standard" rev="1.1.2"/>
     <dependency org="jstl" name="jstl" rev="1.1.2"/>
 	<dependency org="aopalliance" name="aopalliance" rev="1.0" />
-    <dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->default,jsf12"/>
+    <dependency org="org.springframework" name="spring-faces" rev="latest.integration" conf="global->default,jsf12"/>
     <dependency org="org.springframework" name="spring-aop" rev="2.1-m3"/>
     <dependency org="org.springframework" name="spring-orm" rev="2.1-m3"/>
     <dependency org="org.springframework" name="spring-jdbc" rev="2.1-m3"/>
diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath
index 2c8bee93..b33f18a8 100644
--- a/spring-webflow/.classpath
+++ b/spring-webflow/.classpath
@@ -10,8 +10,6 @@
 	<classpathentry kind="lib" path="lib/test/easymock.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/hibernate.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/junit.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/myfaces-api.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/myfaces-impl.jar"/>
 	<classpathentry kind="lib" path="lib/global/ognl.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/portlet-api.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/servlet-api.jar"/>
@@ -28,33 +26,24 @@
 	<classpathentry kind="lib" path="lib/test/spring-jdbc.jar"/>
 	<classpathentry kind="lib" path="lib/test/spring-mock.jar" sourcepath="/spring/mock"/>
 	<classpathentry kind="lib" path="lib/buildtime/persistence-api.jar"/>
-	<classpathentry kind="lib" path="lib/test/shale-test.jar"/>
 	<classpathentry kind="lib" path="lib/test/clover.jar"/>
 	<classpathentry kind="lib" path="lib/test/hibernate-annotations.jar"/>
 	<classpathentry kind="lib" path="lib/test/hibernate-commons-annotations.jar"/>
 	<classpathentry kind="lib" path="lib/test/hibernate-entitymanager.jar"/>
 	<classpathentry kind="lib" path="lib/test/javassist.jar"/>
 	<classpathentry kind="lib" path="lib/test/jboss-common-core.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/el-api.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/spring-orm.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/antlr.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/asm.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/asm-attrs.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/avalon-framework.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/cglib.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/commons-codec.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/commons-discovery.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/commons-fileupload.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/commons-validator.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/ehcache.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/log4j.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/logkit.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/oro.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/spring-tx.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/spring-webmvc-portlet.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/xalan.jar"/>
-	<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/shale-remoting.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index e44c55f0..02555292 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -14,8 +14,6 @@
 		<conf name="mvc" visibility="public" extends="global" />
 		<conf name="portlet" visibility="public" extends="mvc" />
 		<conf name="struts" visibility="public" extends="global" />
-		<conf name="jsf11" visibility="public" extends="global" />
-		<conf name="jsf12" visibility="public" extends="global" />
 		<conf name="testing" visibility="public" extends="global" />
 	</configurations>
 
@@ -46,38 +44,22 @@
 		<!-- struts only dependencies -->
 		<dependency org="struts" name="struts" rev="1.2.9" conf="buildtime, struts->default" />
 
-		<!-- JSF 1.2 only dependencies -->
-		<!-- note that at this time we depend on MyFaces, not JSF-RI -->
-		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.0" conf="buildtime, jsf12->default" />
-		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.0" conf="buildtime, jsf12->default" />
-		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime, jsf12->default" />
-    	<dependency org="commons-digester" name="commons-digester" rev="1.8" conf="buildtime, jsf12->default" >
-    		<exclude module="servlet-api"/>
-    	</dependency>
-    	<dependency org="commons-codec" name="commons-codec" rev="1.3" conf="buildtime, jsf12->default" />
-    	<dependency org="commons-discovery" name="commons-discovery" rev="0.4" conf="buildtime, jsf12->default" />
-    	<dependency org="commons-collections" name="commons-collections" rev="3.2" conf="buildtime, jsf12->default" />
-    	<dependency org="org.apache.shale" name="shale-remoting" rev="1.0.4" conf="buildtime, jsf12->default" />
-
 		<!-- build time only dependencies -->
 		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
 		<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="buildtime->default" />
 		<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" conf="buildtime->default" />
-		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default" />
-		
 		<dependency org="org.springframework" name="spring-orm" rev="2.1-m3" conf="buildtime->default" />
 		<dependency org="org.springframework" name="spring-tx" rev="2.1-m3" conf="buildtime->default" />
 		<dependency org="javax.persistence" name="persistence-api" rev="1.0b" conf="buildtime->default" />
+		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime->default" />
 	
 		<!-- test time only dependencies -->
-		<dependency org="jboss" name="jboss-el" rev="1.0" conf="test->default"/>
 		<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="test->default" />
 		<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default" />
 		<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
 		<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
 		<dependency org="org.springframework" name="spring-jdbc" rev="2.1-m3" conf="test->default" />
 		<dependency org="org.springframework" name="spring-mock" rev="2.1-m3" conf="test->default" />
-		<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
 		<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" conf="test->default" />
 		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="test->default" />
 		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="test->default" />