diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractorTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowNavigationHandlerArgumentExtractorTests.java
similarity index 97%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractorTests.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/FlowNavigationHandlerArgumentExtractorTests.java
index 4e281e6f..ac7b42f1 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowNavigationHandlerArgumentExtractorTests.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowNavigationHandlerArgumentExtractorTests.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 junit.framework.TestCase;
 
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowPropertyResolverTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowPropertyResolverTests.java
similarity index 98%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowPropertyResolverTests.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/FlowPropertyResolverTests.java
index ad8b3b8c..2d9b8230 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowPropertyResolverTests.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowPropertyResolverTests.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.el.EvaluationException;
 import javax.faces.el.PropertyNotFoundException;
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilterTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowSystemCleanupFilterTests.java
similarity index 98%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilterTests.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/FlowSystemCleanupFilterTests.java
index 07d9cc07..d9fbdee7 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowSystemCleanupFilterTests.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowSystemCleanupFilterTests.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-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowVariableResolverTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowVariableResolverTests.java
similarity index 98%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowVariableResolverTests.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/FlowVariableResolverTests.java
index bda513e1..382a58f6 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/FlowVariableResolverTests.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowVariableResolverTests.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;
 import javax.faces.el.EvaluationException;
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF11ManagedBeanAccessTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JSF11ManagedBeanAccessTests.java
similarity index 88%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF11ManagedBeanAccessTests.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/JSF11ManagedBeanAccessTests.java
index d1c987ff..3ce2df95 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF11ManagedBeanAccessTests.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JSF11ManagedBeanAccessTests.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.io.FileNotFoundException;
 
@@ -12,10 +12,6 @@ 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;
@@ -124,7 +120,7 @@ public class JSF11ManagedBeanAccessTests extends AbstractXmlFlowExecutionTests {
 	protected FlowDefinitionResource getFlowDefinitionResource() {
 		try {
 			return createFlowDefinitionResource(ResourceUtils.getFile(
-					"classpath:org/springframework/webflow/executor/jsf/jsf-flow.xml").getPath());
+					"classpath:org/springframework/faces/webflow/jsf-flow.xml").getPath());
 		} catch (FileNotFoundException e) {
 			fail(e.getMessage());
 			return null;
@@ -137,8 +133,7 @@ public class JSF11ManagedBeanAccessTests extends AbstractXmlFlowExecutionTests {
 
 		ctx = new GenericWebApplicationContext();
 		XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(ctx);
-		xmlReader.loadBeanDefinitions(new ClassPathResource(
-				"org/springframework/webflow/executor/jsf/jsf-flow-beans.xml"));
+		xmlReader.loadBeanDefinitions(new ClassPathResource("org/springframework/faces/webflow/jsf-flow-beans.xml"));
 		ctx.refresh();
 
 		jsf.externalContext().getApplicationMap().put(
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF12ManagedBeanAccessTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JSF12ManagedBeanAccessTests.java
similarity index 95%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF12ManagedBeanAccessTests.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/JSF12ManagedBeanAccessTests.java
index 941009cc..33a6b99e 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSF12ManagedBeanAccessTests.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JSF12ManagedBeanAccessTests.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import org.jboss.el.ExpressionFactoryImpl;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFManagedBean.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JSFManagedBean.java
similarity index 85%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFManagedBean.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/JSFManagedBean.java
index fc2f4214..113e418a 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFManagedBean.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JSFManagedBean.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFMockHelper.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JSFMockHelper.java
similarity index 94%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFMockHelper.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/JSFMockHelper.java
index c10abe75..82aa35ec 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFMockHelper.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JSFMockHelper.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import org.apache.shale.test.base.AbstractJsfTestCase;
 import org.apache.shale.test.mock.MockApplication;
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFModel.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JSFModel.java
similarity index 70%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFModel.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/JSFModel.java
index 26ab121b..393af2b2 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/JSFModel.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JSFModel.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 public class JSFModel {
 	String value;
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockApplication.java b/spring-faces/src/test/java/org/springframework/faces/webflow/MockApplication.java
similarity index 98%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockApplication.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/MockApplication.java
index 58283dd2..cfd98a40 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockApplication.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/MockApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockFacesContext.java b/spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.java
similarity index 98%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockFacesContext.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.java
index 5d50247e..65481129 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockFacesContext.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.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.util.Iterator;
 
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockJsfExternalContext.java b/spring-faces/src/test/java/org/springframework/faces/webflow/MockJsfExternalContext.java
similarity index 98%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockJsfExternalContext.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/MockJsfExternalContext.java
index 7c4c678e..6fa0fe4c 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockJsfExternalContext.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/MockJsfExternalContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockService.java b/spring-faces/src/test/java/org/springframework/faces/webflow/MockService.java
similarity index 56%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockService.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/MockService.java
index 5e629066..5b3f9006 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockService.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/MockService.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 public interface MockService {
 
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockViewHandler.java b/spring-faces/src/test/java/org/springframework/faces/webflow/MockViewHandler.java
similarity index 97%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockViewHandler.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/MockViewHandler.java
index f154410b..8589448a 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/MockViewHandler.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/MockViewHandler.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.Locale;
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow-beans.xml b/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml
similarity index 74%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow-beans.xml
rename to spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml
index a82cd012..7fe80fd6 100644
--- a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow-beans.xml
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml
@@ -10,8 +10,8 @@
 
 	<flow:enable-scopes/>
 	
-	<bean name="jsfModel" class="org.springframework.webflow.executor.jsf.JSFModel" scope="prototype"/>
+	<bean name="jsfModel" class="org.springframework.faces.webflow.JSFModel" scope="prototype"/>
 	
-	<bean name="flowScopedModel" class="org.springframework.webflow.executor.jsf.JSFModel" scope="flow"/>
+	<bean name="flowScopedModel" class="org.springframework.faces.webflow.JSFModel" scope="flow"/>
 
 </beans>
diff --git a/spring-faces/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow.xml b/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow.xml
similarity index 100%
rename from spring-faces/src/test/java/org/springframework/webflow/executor/jsf/jsf-flow.xml
rename to spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow.xml