diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
index 47a851927b..5e8431bd3e 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * Demonstrating the file copy scenario using binary file source and target.
+ * See the 'fileCopyDemo-binary.xml' configuration file for details.
  * 
  * @author Marius Bogoevici
  */
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
index 8004c3e5b4..23426ef78b 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * Demonstrating the file copy scenario using file-based source and target.
+ * See the 'fileCopyDemo-file.xml' configuration file for details.
  *
  * @author Marius Bogoevici
  */
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
index 490fcb2dda..35d8a7dd9a 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@ package org.springframework.integration.samples.filecopy;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
- * Demo of file source and target adapters.
+ * Demonstrating the file copy scenario using text-based source and target.
+ * See the 'fileCopyDemo-text.xml' configuration file for details.
  * 
  * @author Mark Fisher
  * @author Marius Bogoevici
diff --git a/spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
similarity index 100%
rename from spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
diff --git a/spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
similarity index 100%
rename from spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
diff --git a/spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
similarity index 100%
rename from spring-integration-samples/filecopy/src/main/resources/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml