diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml b/spring-integration-samples/cafe/src/main/resources/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
similarity index 100%
rename from spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
rename to spring-integration-samples/cafe/src/main/resources/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml b/spring-integration-samples/cafe/src/main/resources/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
similarity index 100%
rename from spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
rename to spring-integration-samples/cafe/src/main/resources/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
diff --git a/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml b/spring-integration-samples/errorhandling/src/main/resources/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
similarity index 100%
rename from spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
rename to spring-integration-samples/errorhandling/src/main/resources/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml b/spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
similarity index 100%
rename from spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
rename to spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml b/spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
similarity index 100%
rename from spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
rename to spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml b/spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
similarity index 100%
rename from spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
rename to spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
diff --git a/spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml b/spring-integration-samples/helloworld/src/main/resources/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
similarity index 100%
rename from spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
rename to spring-integration-samples/helloworld/src/main/resources/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml b/spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/common.xml
similarity index 100%
rename from spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml
rename to spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/common.xml
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml b/spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
similarity index 100%
rename from spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
rename to spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml b/spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/inboundGateway.xml
similarity index 100%
rename from spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
rename to spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/inboundGateway.xml
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml b/spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
similarity index 100%
rename from spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
rename to spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml b/spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/outboundGateway.xml
similarity index 100%
rename from spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
rename to spring-integration-samples/jms/src/main/resources/org/springframework/integration/samples/jms/outboundGateway.xml
diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/resources/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
similarity index 100%
rename from spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
rename to spring-integration-samples/oddeven/src/main/resources/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/resources/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
similarity index 100%
rename from spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
rename to spring-integration-samples/oddeven/src/main/resources/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
diff --git a/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml b/spring-integration-samples/quote/src/main/resources/org/springframework/integration/samples/quote/quoteDemo.xml
similarity index 100%
rename from spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
rename to spring-integration-samples/quote/src/main/resources/org/springframework/integration/samples/quote/quoteDemo.xml
diff --git a/spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml b/spring-integration-samples/ws/src/main/resources/org/springframework/integration/samples/ws/temperatureConversion.xml
similarity index 100%
rename from spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
rename to spring-integration-samples/ws/src/main/resources/org/springframework/integration/samples/ws/temperatureConversion.xml
diff --git a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/order.xml b/spring-integration-samples/xml/src/main/resources/org/springframework/integration/samples/xml/order.xml
similarity index 100%
rename from spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/order.xml
rename to spring-integration-samples/xml/src/main/resources/org/springframework/integration/samples/xml/order.xml
diff --git a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml b/spring-integration-samples/xml/src/main/resources/org/springframework/integration/samples/xml/orderProcessingSample.xml
similarity index 100%
rename from spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml
rename to spring-integration-samples/xml/src/main/resources/org/springframework/integration/samples/xml/orderProcessingSample.xml