diff --git a/spring-webflow-samples/booking-jsf/.classpath b/spring-webflow-samples/booking-jsf/.classpath
index 91938774..372dcaf4 100755
--- a/spring-webflow-samples/booking-jsf/.classpath
+++ b/spring-webflow-samples/booking-jsf/.classpath
@@ -6,8 +6,5 @@
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="lib" path="lib/test/junit.jar"/>
 	<classpathentry kind="lib" path="lib/test/spring-mock.jar"/>
-	<classpathentry kind="lib" path="lib/global/freemarker.jar"/>
-	<classpathentry kind="lib" path="lib/global/hibernate.jar"/>
-	<classpathentry kind="lib" path="lib/global/hibernate-tools.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.core.prefs
index 63c85b13..dc8ffbcd 100755
--- a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Tue Jul 31 15:11:23 EDT 2007
+#Thu Aug 09 13:12:30 EDT 2007
 eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.ui.prefs
index 64363ef0..e0d5724c 100755
--- a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.ui.prefs
+++ b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.ui.prefs
@@ -1,8 +1,9 @@
-#Tue Jul 31 15:09:12 EDT 2007
+#Thu Aug 09 13:12:30 EDT 2007
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_Spring Java Conventions
 formatter_settings_version=11
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jpt.core.prefs b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jpt.core.prefs
index 95837dae..102d5856 100755
--- a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jpt.core.prefs
+++ b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jpt.core.prefs
@@ -1,4 +1,5 @@
-#Fri Aug 03 12:43:55 EDT 2007
+#Thu Aug 09 13:12:30 EDT 2007
 eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 org.eclipse.jpt.core.discoverAnnotatedClasses=true
 org.eclipse.jpt.core.platform=generic
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs
index 1973f017..7a3d18a6 100755
--- a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs
@@ -1,4 +1,5 @@
-#Mon Nov 13 17:23:47 PST 2006
+#Thu Aug 09 13:12:30 EDT 2007
 classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0
 classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4
 eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.validation.prefs b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.validation.prefs
index 1c7d6317..f5f51015 100755
--- a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.validation.prefs
+++ b/spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.validation.prefs
@@ -1,6 +1,7 @@
-#Mon Nov 13 17:29:33 PST 2006
+#Thu Aug 09 13:12:30 EDT 2007
 DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
 USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
 USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
 USER_PREFERENCE=overrideGlobalPreferencesfalse
 eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.hibernate.eclipse.console.prefs b/spring-webflow-samples/booking-jsf/.settings/org.hibernate.eclipse.console.prefs
index f979d2ef..968ada6c 100755
--- a/spring-webflow-samples/booking-jsf/.settings/org.hibernate.eclipse.console.prefs
+++ b/spring-webflow-samples/booking-jsf/.settings/org.hibernate.eclipse.console.prefs
@@ -1,4 +1,5 @@
-#Fri Aug 03 13:03:09 EDT 2007
+#Thu Aug 09 13:12:30 EDT 2007
 default.configuration=swf-booking-jsf
 eclipse.preferences.version=1
 hibernate3.enabled=true
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.springframework.ide.eclipse.core.prefs b/spring-webflow-samples/booking-jsf/.settings/org.springframework.ide.eclipse.core.prefs
index a2e2974e..c2d8ea59 100755
--- a/spring-webflow-samples/booking-jsf/.settings/org.springframework.ide.eclipse.core.prefs
+++ b/spring-webflow-samples/booking-jsf/.settings/org.springframework.ide.eclipse.core.prefs
@@ -1,5 +1,6 @@
-#Thu Aug 02 15:26:32 EDT 2007
+#Thu Aug 09 13:12:30 EDT 2007
 eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true
 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true
 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true
diff --git a/spring-webflow-samples/booking-jsf/ivy.xml b/spring-webflow-samples/booking-jsf/ivy.xml
index 39d08464..dfdb38b8 100755
--- a/spring-webflow-samples/booking-jsf/ivy.xml
+++ b/spring-webflow-samples/booking-jsf/ivy.xml
@@ -1,6 +1,6 @@
 <ivy-module version="1.1">
 
-  <info organisation="org.springframework" module="swf-sellitem-jsf"/>
+  <info organisation="org.springframework" module="swf-booking-jsf"/>
 	
   <configurations>
     <conf name="default" extends="global"/>
@@ -15,28 +15,24 @@
     <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,jsf"/>
-    <dependency org="org.springframework" name="spring-aop" rev="2.0.6"/>
-    <dependency org="org.springframework" name="spring-dao" rev="2.0.6"/>
-    <dependency org="org.springframework" name="spring-jdbc" rev="2.0.6"/>
-	<dependency org="org.springframework" name="spring-hibernate3" rev="2.0.6"/>	
+    <dependency org="org.springframework" name="spring-webflow" 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"/>
+    <dependency org="org.springframework" name="spring-tx" rev="2.1-m3"/>
+    <dependency org="jboss" name="jboss-el" rev="1.0"/>
 	<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" />
-	<dependency org="org.hibernate" name="hibernate-tools" rev="3.2.0.beta9a" />
 	<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga"/>
 	<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga"/>
-	<dependency org="concurrent" name="concurrent" rev="1.3.4"/>
 	<dependency org="javax.persistence" name="persistence-api" rev="1.0b"/>
-	<dependency org="toplink.essentials" name="toplink-essentials" rev="2.0-56"/>
-	<dependency org="org.springframework" name="spring-jpa" rev="2.0.6"/>
-    <dependency org="commons-digester" name="commons-digester" rev="1.8"/> <!-- MyFaces 1.2 dependency? -->
-    <dependency org="commons-codec" name="commons-codec" rev="1.3"/> <!-- MyFaces 1.2 dependency? -->
-    <dependency org="commons-discovery" name="commons-discovery" rev="0.4"/> <!-- MyFaces 1.2 dependency? -->
-    <dependency org="commons-collections" name="commons-collections" rev="3.2"/> <!-- MyFaces 1.2 dependency? -->
+	
     <dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.13"/>
 	<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7"/>
     
     <!-- 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"/>
+	
 	
 	<!-- test-time only dependencies -->
     <dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/META-INF/persistence.xml b/spring-webflow-samples/booking-jsf/src/main/java/META-INF/persistence.xml
index f4e3d6a7..a104e6ed 100755
--- a/spring-webflow-samples/booking-jsf/src/main/java/META-INF/persistence.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/java/META-INF/persistence.xml
@@ -5,9 +5,9 @@
              version="1.0">
    <persistence-unit name="bookingDatabase">
       <provider>org.hibernate.ejb.HibernatePersistence</provider>
-      <class>org.springframework.webflow.samples.booking.User</class>
-      <class>org.springframework.webflow.samples.booking.Booking</class>
-      <class>org.springframework.webflow.samples.booking.Hotel</class>
+      <class>org.springframework.webflow.samples.booking.model.User</class>
+      <class>org.springframework.webflow.samples.booking.model.Booking</class>
+      <class>org.springframework.webflow.samples.booking.model.Hotel</class>
       <properties>
       	 <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
       	 <property name="hibernate.hbm2ddl.auto" value="create-drop" />
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchAction.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchAction.java
index f83007b4..8410b644 100644
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchAction.java
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchAction.java
@@ -2,11 +2,13 @@ package org.springframework.webflow.samples.booking;
 
 import java.util.List;
 
-import javax.faces.context.FacesContext;
-
 import org.springframework.webflow.action.MultiAction;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
+import org.springframework.webflow.samples.booking.model.Booking;
+import org.springframework.webflow.samples.booking.model.Hotel;
+import org.springframework.webflow.samples.booking.model.User;
+import org.springframework.webflow.samples.booking.service.BookingService;
 
 public class SearchAction extends MultiAction {
 
@@ -37,15 +39,6 @@ public class SearchAction extends MultiAction {
 	return success();
     }
 
-    public String nextPage() {
-	HotelSearch search = (HotelSearch) FacesContext.getCurrentInstance().getApplication().getVariableResolver()
-		.resolveVariable(FacesContext.getCurrentInstance(), "hotelSearch");
-
-	search.setPage(search.getPage() + 1);
-
-	return "findHotels";
-    }
-
     public void setBookingService(BookingService bookingService) {
 	this.bookingService = bookingService;
     }
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/ValidateBookingAction.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/ValidateBookingAction.java
index 5b3973ab..e9a6a238 100644
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/ValidateBookingAction.java
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/ValidateBookingAction.java
@@ -8,6 +8,7 @@ import javax.faces.context.FacesContext;
 import org.springframework.webflow.action.AbstractAction;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
+import org.springframework.webflow.samples.booking.model.Booking;
 
 public class ValidateBookingAction extends AbstractAction {
 
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Booking.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/model/Booking.java
similarity index 94%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Booking.java
rename to spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/model/Booking.java
index 08d498e5..e642783b 100755
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Booking.java
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/model/Booking.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.samples.booking;
+package org.springframework.webflow.samples.booking.model;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -16,6 +16,7 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
+
 //import org.hibernate.validator.Length;
 //import org.hibernate.validator.NotNull;
 //import org.hibernate.validator.Pattern;
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Hotel.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/model/Hotel.java
similarity index 97%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Hotel.java
rename to spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/model/Hotel.java
index 0cd4afad..e6800add 100755
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Hotel.java
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/model/Hotel.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.samples.booking;
+package org.springframework.webflow.samples.booking.model;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/User.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/model/User.java
similarity index 91%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/User.java
rename to spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/model/User.java
index 4a11fd90..e7c0d04c 100755
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/User.java
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/model/User.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.samples.booking;
+package org.springframework.webflow.samples.booking.model;
 
 import java.io.Serializable;
 
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/BookingService.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/service/BookingService.java
similarity index 56%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/BookingService.java
rename to spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/service/BookingService.java
index 5fc793d7..9fd00efc 100755
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/BookingService.java
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/service/BookingService.java
@@ -1,7 +1,11 @@
-package org.springframework.webflow.samples.booking;
+package org.springframework.webflow.samples.booking.service;
 
 import java.util.List;
 
+import org.springframework.webflow.samples.booking.model.Booking;
+import org.springframework.webflow.samples.booking.model.Hotel;
+import org.springframework.webflow.samples.booking.model.User;
+
 public interface BookingService {
 
     public List<Booking> findBookings(User user);
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/service/JpaBookingService.java
similarity index 87%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
rename to spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/service/JpaBookingService.java
index 6cb99058..09334c56 100755
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/service/JpaBookingService.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.samples.booking;
+package org.springframework.webflow.samples.booking.service;
 
 import java.util.List;
 
@@ -8,6 +8,9 @@ import javax.persistence.PersistenceContext;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
+import org.springframework.webflow.samples.booking.model.Booking;
+import org.springframework.webflow.samples.booking.model.Hotel;
+import org.springframework.webflow.samples.booking.model.User;
 
 @Repository
 public class JpaBookingService implements BookingService {
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/services-config-jpa.xml b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/service/services-config-jpa.xml
similarity index 95%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/services-config-jpa.xml
rename to spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/service/services-config-jpa.xml
index f3cfae27..126f0c91 100755
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/services-config-jpa.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/service/services-config-jpa.xml
@@ -25,7 +25,7 @@
 	<tx:annotation-driven transaction-manager="txManager"/>
 
 	<bean id="bookingService"
-		class="org.springframework.webflow.samples.booking.JpaBookingService" />
+		class="org.springframework.webflow.samples.booking.service.JpaBookingService" />
 
 	<bean id="entityManagerFactory"
 		class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/DebuggingPhaseListener.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/util/DebuggingPhaseListener.java
similarity index 92%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/DebuggingPhaseListener.java
rename to spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/util/DebuggingPhaseListener.java
index 8274d5ff..c3ae80d7 100644
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/DebuggingPhaseListener.java
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/util/DebuggingPhaseListener.java
@@ -1,4 +1,4 @@
-package org.springframework.webflow.samples.booking;
+package org.springframework.webflow.samples.booking.util;
 
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/META-INF/MANIFEST.MF b/spring-webflow-samples/booking-jsf/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..58630c02
--- /dev/null
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/faces-config.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 36489e62..d7b5ce35 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/faces-config.xml
@@ -12,7 +12,7 @@
 	</application>
 	
 	<lifecycle>
-		<phase-listener>org.springframework.webflow.samples.booking.DebuggingPhaseListener</phase-listener>
+		<phase-listener>org.springframework.webflow.samples.booking.util.DebuggingPhaseListener</phase-listener>
 		<phase-listener>org.springframework.webflow.executor.jsf.FlowPhaseListener</phase-listener>
 	</lifecycle>
 	
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml
index 2b142616..f618a581 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
-			classpath:org/springframework/webflow/samples/booking/services-config-jpa.xml
+			classpath:org/springframework/webflow/samples/booking/service/services-config-jpa.xml
 			/WEB-INF/webflow-config.xml
 		</param-value>
 	</context-param>
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml
index 6829c8e9..f0365bbd 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:flow="http://www.springframework.org/schema/webflow-config"
+       xmlns:flow="http://www.springframework.org/schema/webflow-config"
+       xmlns:aop="http://www.springframework.org/schema/aop"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-1.1.xsd">
+           http://www.springframework.org/schema/webflow-config/spring-webflow-config-1.1.xsd
+           http://www.springframework.org/schema/aop
+           http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	
 	<flow:enable-scopes/>
 
-	<bean id="user" class="org.springframework.webflow.samples.booking.User" scope="conversation">
+	<bean id="user" class="org.springframework.webflow.samples.booking.model.User" scope="conversation">
 		<property name="username" value="jeremy"/>
 		<property name="password" value="barfoo"/>
 		<property name="name" value="Jeremy Grelle"/>
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main-flow.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main-flow.xml
index f950199c..33c2eed7 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main-flow.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flows/main/main-flow.xml
@@ -5,7 +5,7 @@
                           http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
 	
 	<var name="hotelSearch" class="org.springframework.webflow.samples.booking.HotelSearch" scope="flow"/>
-	<var name="user" bean="user"/>
+	<var name="user" bean="user"/>  <!-- Can replace this when we can replace searchAction with bean-actions -->
 	
 	<start-state idref="findBookings"/>
 	
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml
index 77deed35..c7f980a3 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml
@@ -11,12 +11,9 @@
 	<div align="left">
 		<p>
 			<h:form>
-			    <h:commandLink value="Book Hotels" action="flowId:main-flow"/> (launch with a JSF command link)
+			    <h:commandLink value="Book Hotels" action="flowId:main-flow"/>
 			</h:form>
 		</p>
-		<p>
-			<a href="controller.swf?_flowId=main-flow">Book Hotels</a> (launch with a regular anchor tag)
-		</p>
 	</div>
 	<hr/>
 </f:view>