diff --git a/spring-batch-samples/src/main/resources/hibernate-context.xml b/spring-batch-samples/src/main/resources/hibernate-context.xml
index 3bf4e30e9..baf2a9b5e 100644
--- a/spring-batch-samples/src/main/resources/hibernate-context.xml
+++ b/spring-batch-samples/src/main/resources/hibernate-context.xml
@@ -5,7 +5,7 @@
 
 	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
-		<property name="mappingLocations" value="classpath*:/*.hbm.xml" />
+		<property name="mappingLocations" value="classpath*:/org/springframework/batch/sample/domain/**/*.hbm.xml" />
 		<property name="hibernateProperties">
 			<value>
 				<![CDATA[
diff --git a/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/sample/domain/trade/CustomerCredit.hbm.xml
similarity index 100%
rename from spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml
rename to spring-batch-samples/src/main/resources/org/springframework/batch/sample/domain/trade/CustomerCredit.hbm.xml