diff --git a/intermediate/travel/spring-integration-travel-demo/.classpath b/intermediate/travel/.classpath
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/.classpath
rename to intermediate/travel/.classpath
diff --git a/intermediate/travel/spring-integration-travel-demo/.gitignore b/intermediate/travel/.gitignore
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/.gitignore
rename to intermediate/travel/.gitignore
diff --git a/intermediate/travel/spring-integration-travel-demo/.project b/intermediate/travel/.project
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/.project
rename to intermediate/travel/.project
diff --git a/intermediate/travel/spring-integration-travel-demo/.settings/com.springsource.sts.config.flow.prefs b/intermediate/travel/.settings/com.springsource.sts.config.flow.prefs
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/.settings/com.springsource.sts.config.flow.prefs
rename to intermediate/travel/.settings/com.springsource.sts.config.flow.prefs
diff --git a/intermediate/travel/spring-integration-travel-demo/.settings/org.eclipse.jdt.core.prefs b/intermediate/travel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/.settings/org.eclipse.jdt.core.prefs
rename to intermediate/travel/.settings/org.eclipse.jdt.core.prefs
diff --git a/intermediate/travel/spring-integration-travel-demo/.settings/org.maven.ide.eclipse.prefs b/intermediate/travel/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/.settings/org.maven.ide.eclipse.prefs
rename to intermediate/travel/.settings/org.maven.ide.eclipse.prefs
diff --git a/intermediate/travel/spring-integration-travel-demo/.springBeans b/intermediate/travel/.springBeans
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/.springBeans
rename to intermediate/travel/.springBeans
diff --git a/intermediate/travel/spring-integration-travel-demo/pom.xml b/intermediate/travel/pom.xml
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/pom.xml
rename to intermediate/travel/pom.xml
diff --git a/intermediate/travel/spring-integration-travel-demo/readme.txt b/intermediate/travel/readme.txt
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/readme.txt
rename to intermediate/travel/readme.txt
diff --git a/intermediate/travel/spring-integration-travel-demo/src/main/java/org/springframework/integration/samples/travel/TravelGateway.java b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/TravelGateway.java
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/src/main/java/org/springframework/integration/samples/travel/TravelGateway.java
rename to intermediate/travel/src/main/java/org/springframework/integration/samples/travel/TravelGateway.java
diff --git a/intermediate/travel/spring-integration-travel-demo/src/main/java/org/springframework/integration/samples/travel/WeatherRequestTransformer.java b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/WeatherRequestTransformer.java
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/src/main/java/org/springframework/integration/samples/travel/WeatherRequestTransformer.java
rename to intermediate/travel/src/main/java/org/springframework/integration/samples/travel/WeatherRequestTransformer.java
diff --git a/intermediate/travel/spring-integration-travel-demo/src/main/resources/META-INF/spring/integration-context.xml b/intermediate/travel/src/main/resources/META-INF/spring/integration-context.xml
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/src/main/resources/META-INF/spring/integration-context.xml
rename to intermediate/travel/src/main/resources/META-INF/spring/integration-context.xml
diff --git a/intermediate/travel/spring-integration-travel-demo/src/main/resources/META-INF/spring/integration-http-context.xml b/intermediate/travel/src/main/resources/META-INF/spring/integration-http-context.xml
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/src/main/resources/META-INF/spring/integration-http-context.xml
rename to intermediate/travel/src/main/resources/META-INF/spring/integration-http-context.xml
diff --git a/intermediate/travel/spring-integration-travel-demo/src/main/resources/META-INF/spring/integration-ws-context.xml b/intermediate/travel/src/main/resources/META-INF/spring/integration-ws-context.xml
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/src/main/resources/META-INF/spring/integration-ws-context.xml
rename to intermediate/travel/src/main/resources/META-INF/spring/integration-ws-context.xml
diff --git a/intermediate/travel/spring-integration-travel-demo/src/test/java/org/springframework/integration/samples/travel/TravelDemo.java b/intermediate/travel/src/test/java/org/springframework/integration/samples/travel/TravelDemo.java
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/src/test/java/org/springframework/integration/samples/travel/TravelDemo.java
rename to intermediate/travel/src/test/java/org/springframework/integration/samples/travel/TravelDemo.java
diff --git a/intermediate/travel/spring-integration-travel-demo/src/test/resources/log4j.xml b/intermediate/travel/src/test/resources/log4j.xml
similarity index 100%
rename from intermediate/travel/spring-integration-travel-demo/src/test/resources/log4j.xml
rename to intermediate/travel/src/test/resources/log4j.xml