diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml
new file mode 100644
index 00000000..00b187c7
--- /dev/null
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml
@@ -0,0 +1,35 @@
+<?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:tx="http://www.springframework.org/schema/tx"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/tx
+           http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+
+	<!-- Instructs Spring to perfrom declarative transaction managemenet on annotated classes -->
+	<tx:annotation-driven />
+
+	<!-- Drives transactions using local JPA APIs -->
+	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>
+		
+	<!-- Creates a EntityManagerFactory for use with the Hibernate JPA provider and a simple in-memory data source populated with test data -->
+	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+		<property name="jpaVendorAdapter">
+			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
+		</property>
+	</bean>
+
+	<!-- Deploys a in-memory "booking" datasource populated -->
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
+		<property name="url" value="jdbc:hsqldb:mem:booking" />
+		<property name="username" value="sa" />
+		<property name="password" value="" />
+	</bean>
+	
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/dispatcher-portlet-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/dispatcher-portlet-config.xml
new file mode 100644
index 00000000..3da3506e
--- /dev/null
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/dispatcher-portlet-config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<!-- No special configuration needed here - all configuration is driven by web-application-config.xml -->
+	
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
new file mode 100644
index 00000000..df8021ce
--- /dev/null
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
@@ -0,0 +1,22 @@
+<?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:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+	<!-- Activates annotation-based bean configuration -->
+	<context:annotation-config />
+	
+	<!-- Scans for application @Components to deploy -->
+	<context:component-scan base-package="org.springframework.webflow.samples.booking" />
+
+	<!-- Imports the configurations of the different infrastructure systems of the application -->
+	<import resource="webmvc-config.xml" />
+	<import resource="webflow-config.xml" />
+	<import resource="data-access-config.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
new file mode 100644
index 00000000..6274e076
--- /dev/null
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
@@ -0,0 +1,34 @@
+<?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:webflow="http://www.springframework.org/schema/webflow-config"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/webflow-config
+           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
+
+	<!-- Executes flows: the central entry point into the Spring Web Flow system -->
+	<webflow:flow-executor id="flowExecutor">
+		<webflow:flow-execution-attributes>
+			<webflow:always-redirect-on-pause value="false"/>
+		</webflow:flow-execution-attributes>
+		<webflow:flow-execution-listeners>
+			<webflow:listener ref="jpaFlowExecutionListener" />
+		</webflow:flow-execution-listeners>
+	</webflow:flow-executor>
+	
+	<!-- The registry of executable flow definitions -->
+	<webflow:flow-registry id="flowRegistry">
+		<webflow:flow-location path="/WEB-INF/flows/view/view.xml" />
+		<webflow:flow-location path="/WEB-INF/flows/main/main.xml" />
+		<webflow:flow-location path="/WEB-INF/flows/booking/booking.xml" />
+	</webflow:flow-registry>	
+		
+	<!-- Installs a listener that manages JPA persistence contexts for flows that require them -->
+	<bean id="jpaFlowExecutionListener" class="org.springframework.webflow.persistence.JpaFlowExecutionListener">
+		<constructor-arg ref="entityManagerFactory" />
+		<constructor-arg ref="transactionManager" />
+	</bean>
+	
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
new file mode 100644
index 00000000..0b362034
--- /dev/null
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<!-- Maps portlet modes to handlers -->	
+	<bean id="portletModeHandlerMapping" class="org.springframework.web.portlet.handler.PortletModeHandlerMapping">
+		<property name="portletModeMap">
+			<map>
+				<entry key="view">
+					<bean class="org.springframework.webflow.samples.booking.ViewFlowHandler" />
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+	<!-- Maps logical view names selected by the url filename controller to .jsp view templates within the /WEB-INF directory -->	
+	<bean id="internalJspViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/WEB-INF/" />
+		<property name="suffix" value=".jsp" />
+	</bean>
+	
+	<!-- Enables FlowHandlers -->
+	<bean class="org.springframework.webflow.mvc.portlet.FlowHandlerAdapter">
+		<property name="flowExecutor" ref="flowExecutor"/>
+	</bean>
+	
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml
index 1d59b081..f66ec018 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml
@@ -7,7 +7,7 @@
 
 	<persistence-context/>
 	
-	<input name="hotelId" value="flowScope.hotelId" />
+	<input name="hotelId" />
 	
 	<on-start>
 		<evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" result="flowScope.booking" />
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml
index 92b7b38e..81c9d5a8 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml
@@ -15,7 +15,7 @@
 		<init-param>
 			<name>contextConfigLocation</name>
 			<value>
-				/WEB-INF/web-application-config.xml
+				/WEB-INF/config/dispatcher-portlet-config.xml
 			</value>
 		</init-param>
 
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web-application-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web-application-config.xml
deleted file mode 100644
index fa56bcc4..00000000
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web-application-config.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?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:context="http://www.springframework.org/schema/context"
-       xmlns:webflow="http://www.springframework.org/schema/webflow-config"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-           http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context-2.5.xsd
-           http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd
-           http://www.springframework.org/schema/tx
-           http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
-	
-	<!-- Activates annotation-based bean configuration -->
-	<context:annotation-config />
-	
-	<!-- Scans for application @Components to deploy -->
-	<context:component-scan base-package="org.springframework.webflow.samples.booking" />
-	
-	<bean id="portletModeHandlerMapping" class="org.springframework.web.portlet.handler.PortletModeHandlerMapping">
-		<property name="portletModeMap">
-			<map>
-				<entry key="view">
-					<bean class="org.springframework.webflow.samples.booking.ViewFlowHandler" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<!-- Handles requests mapped to the Spring Web Flow system -->
-	<bean id="flowHandlerAdapter" class="org.springframework.webflow.mvc.portlet.FlowHandlerAdapter">
-		<constructor-arg ref="flowExecutor" />
-	</bean>
-	
-	<!-- Executes flows: the central entry point into the Spring Web Flow system -->	
-	<webflow:flow-executor id="flowExecutor" flow-registry="flowRegistry">
-		<webflow:flow-execution-attributes>
-			<webflow:always-redirect-on-pause value="false"/>
-		</webflow:flow-execution-attributes>
-		<webflow:flow-execution-listeners>
-			<webflow:listener ref="jpaFlowExecutionListener" />
-		</webflow:flow-execution-listeners>
-	</webflow:flow-executor>
-
-	<!-- The registry of executable flow definitions -->
-	<webflow:flow-registry id="flowRegistry">
-		<webflow:flow-location path="/WEB-INF/flows/view/view.xml" />
-		<webflow:flow-location path="/WEB-INF/flows/main/main.xml" />
-		<webflow:flow-location path="/WEB-INF/flows/booking/booking.xml" />
-	</webflow:flow-registry>
-	
-	<!-- Installs a listener that manages JPA persistence contexts for flows that require them -->
-	<bean id="jpaFlowExecutionListener" class="org.springframework.webflow.persistence.JpaFlowExecutionListener">
-		<constructor-arg ref="entityManagerFactory" />
-		<constructor-arg ref="transactionManager" />
-	</bean>
-	
-	<!-- Maps logical view names selected by the url filename controller to .jsp view templates within the /WEB-INF directory -->	
-	<bean id="internalJspViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/WEB-INF/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
-	
-	<!-- The central service of this application that can query hotels and bookings, as well as cancel bookings -->
-	<bean id="bookingService" class="org.springframework.webflow.samples.booking.JpaBookingService" />
-
-	<!-- Creates a EntityManagerFactory for use with the Hibernate JPA provider and a simple in-memory data source populated with test data -->
-	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="jpaVendorAdapter">
-			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
-		</property>
-	</bean>
-
-	<!-- Deploys a in-memory "booking" datasource -->
-	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<property name="url" value="jdbc:hsqldb:mem:booking" />
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-	</bean>
-
-	<!-- Executes transactions around @Transactional methods -->
-	<tx:annotation-driven />
-
-	<!-- Drives transactions using local JPA APIs -->
-	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="entityManagerFactory" ref="entityManagerFactory" />
-	</bean>
-
-	<!-- Automatically injects EntityManager references into data access objects that require one -->
-	<bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
-
-	<!-- Maps JPA exceptions that occur to Spring's DataAccessException hierarchy -->
-	<bean class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
-			
-</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
index 93b0b3ff..c94c82ac 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
@@ -11,7 +11,7 @@
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
-			/WEB-INF/web-application-config.xml
+			/WEB-INF/config/web-application-config.xml
 		</param-value>
 	</context-param>