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/application-config.xml
similarity index 78%
rename from spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml
rename to spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/application-config.xml
index 00b187c7..295df2e2 100644
--- 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/application-config.xml
@@ -1,13 +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"      
        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/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" />
+
 	<!-- Instructs Spring to perfrom declarative transaction managemenet on annotated classes -->
 	<tx:annotation-driven />
 
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml
index 54cb750b..d0ddb05a 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml
@@ -1,21 +1,56 @@
 <?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"
        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">
 
-	<!-- Activates annotation-based bean configuration -->
-	<context:annotation-config />
+	<!-- 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>
 	
-	<!-- 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" />
+	<!-- Enables FlowHandlers -->
+	<bean class="org.springframework.webflow.mvc.portlet.FlowHandlerAdapter">
+		<property name="flowExecutor" ref="flowExecutor"/>
+	</bean>
 
+	<!-- 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/webflow-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
deleted file mode 100644
index 6274e076..00000000
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
+++ /dev/null
@@ -1,34 +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: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
deleted file mode 100644
index 0b362034..00000000
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ /dev/null
@@ -1,30 +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"
-       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/web.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
index 40d44004..96b3c98b 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/config/data-access-config.xml
+			/WEB-INF/config/application-config.xml
 		</param-value>
 	</context-param>