diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
index 9110dcf8c6..cb058e3b02 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.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,6 +19,12 @@ package org.springframework.integration.samples.oddeven;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
+ * Demonstrates a method-invoking inbound Channel Adapter with a
+ * Cron-based polling trigger followed by a simple method-invoking
+ * router.
+ * <p>
+ * See the 'cronOddEvenDemo.xml' configuration file for more detail.
+ * 
  * @author Mark Fisher
  */
 public class CronOddEvenDemo {
diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java
index 5456ec1960..7fba9686ed 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.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,6 +19,12 @@ package org.springframework.integration.samples.oddeven;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
+ * Demonstrates a method-invoking inbound Channel Adapter with an
+ * Interval-based polling trigger followed by a simple method-invoking
+ * router.
+ * <p>
+ * See the 'intervalOddEvenDemo.xml' configuration file for more detail.
+ * 
  * @author Mark Fisher
  */
 public class IntervalOddEvenDemo {
diff --git a/spring-integration-samples/oddeven/src/main/resources/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
similarity index 100%
rename from spring-integration-samples/oddeven/src/main/resources/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
diff --git a/spring-integration-samples/oddeven/src/main/resources/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
similarity index 100%
rename from spring-integration-samples/oddeven/src/main/resources/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml