diff --git a/adapter-development/readme.txt b/advanced/readme.txt
similarity index 100%
rename from adapter-development/readme.txt
rename to advanced/readme.txt
diff --git a/case-studies/cafe/.classpath b/applications/cafe/.classpath
similarity index 100%
rename from case-studies/cafe/.classpath
rename to applications/cafe/.classpath
diff --git a/case-studies/cafe/.gitignore b/applications/cafe/.gitignore
similarity index 100%
rename from case-studies/cafe/.gitignore
rename to applications/cafe/.gitignore
diff --git a/case-studies/cafe/.project b/applications/cafe/.project
similarity index 100%
rename from case-studies/cafe/.project
rename to applications/cafe/.project
diff --git a/case-studies/cafe/.settings/org.eclipse.jdt.core.prefs b/applications/cafe/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from case-studies/cafe/.settings/org.eclipse.jdt.core.prefs
rename to applications/cafe/.settings/org.eclipse.jdt.core.prefs
diff --git a/case-studies/cafe/pom.xml b/applications/cafe/pom.xml
similarity index 100%
rename from case-studies/cafe/pom.xml
rename to applications/cafe/pom.xml
diff --git a/case-studies/cafe/readme.txt b/applications/cafe/readme.txt
similarity index 100%
rename from case-studies/cafe/readme.txt
rename to applications/cafe/readme.txt
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/Delivery.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Delivery.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/Delivery.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Delivery.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/Drink.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Drink.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/Drink.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Drink.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/Order.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Order.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/Order.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Order.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java
diff --git a/case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java
similarity index 100%
rename from case-studies/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java
rename to applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java
diff --git a/case-studies/cafe/src/main/resources/META-INF/spring/integration/cafeDemo-annotation.xml b/applications/cafe/src/main/resources/META-INF/spring/integration/cafeDemo-annotation.xml
similarity index 100%
rename from case-studies/cafe/src/main/resources/META-INF/spring/integration/cafeDemo-annotation.xml
rename to applications/cafe/src/main/resources/META-INF/spring/integration/cafeDemo-annotation.xml
diff --git a/case-studies/cafe/src/main/resources/META-INF/spring/integration/cafeDemo-xml.xml b/applications/cafe/src/main/resources/META-INF/spring/integration/cafeDemo-xml.xml
similarity index 100%
rename from case-studies/cafe/src/main/resources/META-INF/spring/integration/cafeDemo-xml.xml
rename to applications/cafe/src/main/resources/META-INF/spring/integration/cafeDemo-xml.xml
diff --git a/case-studies/cafe/src/test/java/org/springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java b/applications/cafe/src/test/java/org/springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java
similarity index 100%
rename from case-studies/cafe/src/test/java/org/springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java
rename to applications/cafe/src/test/java/org/springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java
diff --git a/case-studies/cafe/src/test/java/org/springframework/integration/samples/cafe/xml/CafeDemoXmlConfiguredTest.java b/applications/cafe/src/test/java/org/springframework/integration/samples/cafe/xml/CafeDemoXmlConfiguredTest.java
similarity index 100%
rename from case-studies/cafe/src/test/java/org/springframework/integration/samples/cafe/xml/CafeDemoXmlConfiguredTest.java
rename to applications/cafe/src/test/java/org/springframework/integration/samples/cafe/xml/CafeDemoXmlConfiguredTest.java
diff --git a/case-studies/cafe/src/test/resources/log4j.xml b/applications/cafe/src/test/resources/log4j.xml
similarity index 100%
rename from case-studies/cafe/src/test/resources/log4j.xml
rename to applications/cafe/src/test/resources/log4j.xml
diff --git a/case-studies/loan-broker/.classpath b/applications/loan-broker/.classpath
similarity index 100%
rename from case-studies/loan-broker/.classpath
rename to applications/loan-broker/.classpath
diff --git a/case-studies/loan-broker/.gitignore b/applications/loan-broker/.gitignore
similarity index 100%
rename from case-studies/loan-broker/.gitignore
rename to applications/loan-broker/.gitignore
diff --git a/case-studies/loan-broker/.project b/applications/loan-broker/.project
similarity index 100%
rename from case-studies/loan-broker/.project
rename to applications/loan-broker/.project
diff --git a/case-studies/loan-broker/.springBeans b/applications/loan-broker/.springBeans
similarity index 100%
rename from case-studies/loan-broker/.springBeans
rename to applications/loan-broker/.springBeans
diff --git a/case-studies/loan-broker/pom.xml b/applications/loan-broker/pom.xml
similarity index 100%
rename from case-studies/loan-broker/pom.xml
rename to applications/loan-broker/pom.xml
diff --git a/case-studies/loan-broker/readme.txt b/applications/loan-broker/readme.txt
similarity index 100%
rename from case-studies/loan-broker/readme.txt
rename to applications/loan-broker/readme.txt
diff --git a/case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanBrokerGateway.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanBrokerGateway.java
similarity index 100%
rename from case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanBrokerGateway.java
rename to applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanBrokerGateway.java
diff --git a/case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java
similarity index 100%
rename from case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java
rename to applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java
diff --git a/case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Address.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Address.java
similarity index 100%
rename from case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Address.java
rename to applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Address.java
diff --git a/case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/CreditScore.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/CreditScore.java
similarity index 100%
rename from case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/CreditScore.java
rename to applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/CreditScore.java
diff --git a/case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Customer.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Customer.java
similarity index 100%
rename from case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Customer.java
rename to applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Customer.java
diff --git a/case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanQuote.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanQuote.java
similarity index 100%
rename from case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanQuote.java
rename to applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanQuote.java
diff --git a/case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanRequest.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanRequest.java
similarity index 100%
rename from case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanRequest.java
rename to applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanRequest.java
diff --git a/case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/BankStub.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/BankStub.java
similarity index 100%
rename from case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/BankStub.java
rename to applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/BankStub.java
diff --git a/case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java
similarity index 100%
rename from case-studies/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java
rename to applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java
diff --git a/case-studies/loan-broker/src/main/resources/META-INF/spring/integration/bank-channel-mappings-config.xml b/applications/loan-broker/src/main/resources/META-INF/spring/integration/bank-channel-mappings-config.xml
similarity index 100%
rename from case-studies/loan-broker/src/main/resources/META-INF/spring/integration/bank-channel-mappings-config.xml
rename to applications/loan-broker/src/main/resources/META-INF/spring/integration/bank-channel-mappings-config.xml
diff --git a/case-studies/loan-broker/src/main/resources/META-INF/spring/integration/bootstrap-config/stubbed-loan-broker-multicast.xml b/applications/loan-broker/src/main/resources/META-INF/spring/integration/bootstrap-config/stubbed-loan-broker-multicast.xml
similarity index 100%
rename from case-studies/loan-broker/src/main/resources/META-INF/spring/integration/bootstrap-config/stubbed-loan-broker-multicast.xml
rename to applications/loan-broker/src/main/resources/META-INF/spring/integration/bootstrap-config/stubbed-loan-broker-multicast.xml
diff --git a/case-studies/loan-broker/src/main/resources/META-INF/spring/integration/bootstrap-config/stubbed-loan-broker.xml b/applications/loan-broker/src/main/resources/META-INF/spring/integration/bootstrap-config/stubbed-loan-broker.xml
similarity index 100%
rename from case-studies/loan-broker/src/main/resources/META-INF/spring/integration/bootstrap-config/stubbed-loan-broker.xml
rename to applications/loan-broker/src/main/resources/META-INF/spring/integration/bootstrap-config/stubbed-loan-broker.xml
diff --git a/case-studies/loan-broker/src/main/resources/META-INF/spring/integration/loan-broker-config.xml b/applications/loan-broker/src/main/resources/META-INF/spring/integration/loan-broker-config.xml
similarity index 100%
rename from case-studies/loan-broker/src/main/resources/META-INF/spring/integration/loan-broker-config.xml
rename to applications/loan-broker/src/main/resources/META-INF/spring/integration/loan-broker-config.xml
diff --git a/case-studies/loan-broker/src/main/resources/META-INF/spring/integration/shark-detector-config.xml b/applications/loan-broker/src/main/resources/META-INF/spring/integration/shark-detector-config.xml
similarity index 100%
rename from case-studies/loan-broker/src/main/resources/META-INF/spring/integration/shark-detector-config.xml
rename to applications/loan-broker/src/main/resources/META-INF/spring/integration/shark-detector-config.xml
diff --git a/case-studies/loan-broker/src/main/resources/META-INF/spring/integration/stub-services-config.xml b/applications/loan-broker/src/main/resources/META-INF/spring/integration/stub-services-config.xml
similarity index 100%
rename from case-studies/loan-broker/src/main/resources/META-INF/spring/integration/stub-services-config.xml
rename to applications/loan-broker/src/main/resources/META-INF/spring/integration/stub-services-config.xml
diff --git a/case-studies/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java b/applications/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java
similarity index 100%
rename from case-studies/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java
rename to applications/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java
diff --git a/case-studies/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java b/applications/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java
similarity index 100%
rename from case-studies/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java
rename to applications/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java
diff --git a/case-studies/loan-broker/src/test/resources/log4j.xml b/applications/loan-broker/src/test/resources/log4j.xml
similarity index 100%
rename from case-studies/loan-broker/src/test/resources/log4j.xml
rename to applications/loan-broker/src/test/resources/log4j.xml
diff --git a/case-studies/loan-broker/udps.groovy b/applications/loan-broker/udps.groovy
similarity index 100%
rename from case-studies/loan-broker/udps.groovy
rename to applications/loan-broker/udps.groovy
diff --git a/case-studies/loan-broker/udps.pl b/applications/loan-broker/udps.pl
similarity index 100%
rename from case-studies/loan-broker/udps.pl
rename to applications/loan-broker/udps.pl
diff --git a/case-studies/loanshark/.classpath b/applications/loanshark/.classpath
similarity index 100%
rename from case-studies/loanshark/.classpath
rename to applications/loanshark/.classpath
diff --git a/case-studies/loanshark/.gitignore b/applications/loanshark/.gitignore
similarity index 100%
rename from case-studies/loanshark/.gitignore
rename to applications/loanshark/.gitignore
diff --git a/case-studies/loanshark/.project b/applications/loanshark/.project
similarity index 100%
rename from case-studies/loanshark/.project
rename to applications/loanshark/.project
diff --git a/case-studies/loanshark/.settings/org.eclipse.jdt.core.prefs b/applications/loanshark/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from case-studies/loanshark/.settings/org.eclipse.jdt.core.prefs
rename to applications/loanshark/.settings/org.eclipse.jdt.core.prefs
diff --git a/case-studies/loanshark/.settings/org.eclipse.wst.common.component b/applications/loanshark/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from case-studies/loanshark/.settings/org.eclipse.wst.common.component
rename to applications/loanshark/.settings/org.eclipse.wst.common.component
diff --git a/case-studies/loanshark/.settings/org.eclipse.wst.common.project.facet.core.xml b/applications/loanshark/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from case-studies/loanshark/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to applications/loanshark/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/case-studies/loanshark/.settings/org.eclipse.wst.validation.prefs b/applications/loanshark/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from case-studies/loanshark/.settings/org.eclipse.wst.validation.prefs
rename to applications/loanshark/.settings/org.eclipse.wst.validation.prefs
diff --git a/case-studies/loanshark/.settings/org.springframework.ide.eclipse.beans.core.prefs b/applications/loanshark/.settings/org.springframework.ide.eclipse.beans.core.prefs
similarity index 100%
rename from case-studies/loanshark/.settings/org.springframework.ide.eclipse.beans.core.prefs
rename to applications/loanshark/.settings/org.springframework.ide.eclipse.beans.core.prefs
diff --git a/case-studies/loanshark/.settings/org.springframework.ide.eclipse.core.prefs b/applications/loanshark/.settings/org.springframework.ide.eclipse.core.prefs
similarity index 100%
rename from case-studies/loanshark/.settings/org.springframework.ide.eclipse.core.prefs
rename to applications/loanshark/.settings/org.springframework.ide.eclipse.core.prefs
diff --git a/case-studies/loanshark/.springBeans b/applications/loanshark/.springBeans
similarity index 100%
rename from case-studies/loanshark/.springBeans
rename to applications/loanshark/.springBeans
diff --git a/case-studies/loanshark/README.txt b/applications/loanshark/README.txt
similarity index 100%
rename from case-studies/loanshark/README.txt
rename to applications/loanshark/README.txt
diff --git a/case-studies/loanshark/pom.xml b/applications/loanshark/pom.xml
similarity index 100%
rename from case-studies/loanshark/pom.xml
rename to applications/loanshark/pom.xml
diff --git a/case-studies/loanshark/script.roo b/applications/loanshark/script.roo
similarity index 100%
rename from case-studies/loanshark/script.roo
rename to applications/loanshark/script.roo
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/Accumulator.java b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/Accumulator.java
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/Accumulator.java
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/Accumulator.java
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/SharkQuote.java b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/SharkQuote.java
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/SharkQuote.java
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/SharkQuote.java
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/SharkTransformer.java b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/SharkTransformer.java
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/SharkTransformer.java
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/biz/SharkTransformer.java
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Json.aj b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Json.aj
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Json.aj
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Json.aj
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java
diff --git a/case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj
similarity index 100%
rename from case-studies/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj
rename to applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj
diff --git a/case-studies/loanshark/src/main/resources/META-INF/persistence.xml b/applications/loanshark/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from case-studies/loanshark/src/main/resources/META-INF/persistence.xml
rename to applications/loanshark/src/main/resources/META-INF/persistence.xml
diff --git a/case-studies/loanshark/src/main/resources/META-INF/spring/applicationContext.xml b/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml
similarity index 100%
rename from case-studies/loanshark/src/main/resources/META-INF/spring/applicationContext.xml
rename to applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml
diff --git a/case-studies/loanshark/src/main/resources/META-INF/spring/database.properties b/applications/loanshark/src/main/resources/META-INF/spring/database.properties
similarity index 100%
rename from case-studies/loanshark/src/main/resources/META-INF/spring/database.properties
rename to applications/loanshark/src/main/resources/META-INF/spring/database.properties
diff --git a/case-studies/loanshark/src/main/resources/META-INF/spring/integrationContext.xml b/applications/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
similarity index 100%
rename from case-studies/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
rename to applications/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
diff --git a/case-studies/loanshark/src/main/resources/log4j.properties b/applications/loanshark/src/main/resources/log4j.properties
similarity index 100%
rename from case-studies/loanshark/src/main/resources/log4j.properties
rename to applications/loanshark/src/main/resources/log4j.properties
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/classes/alt.properties b/applications/loanshark/src/main/webapp/WEB-INF/classes/alt.properties
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/classes/alt.properties
rename to applications/loanshark/src/main/webapp/WEB-INF/classes/alt.properties
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/classes/standard.properties b/applications/loanshark/src/main/webapp/WEB-INF/classes/standard.properties
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/classes/standard.properties
rename to applications/loanshark/src/main/webapp/WEB-INF/classes/standard.properties
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/i18n/application.properties b/applications/loanshark/src/main/webapp/WEB-INF/i18n/application.properties
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/i18n/application.properties
rename to applications/loanshark/src/main/webapp/WEB-INF/i18n/application.properties
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/i18n/messages.properties b/applications/loanshark/src/main/webapp/WEB-INF/i18n/messages.properties
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/i18n/messages.properties
rename to applications/loanshark/src/main/webapp/WEB-INF/i18n/messages.properties
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/layouts/default.jspx b/applications/loanshark/src/main/webapp/WEB-INF/layouts/default.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/layouts/default.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/layouts/default.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/layouts/layouts.xml b/applications/loanshark/src/main/webapp/WEB-INF/layouts/layouts.xml
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/layouts/layouts.xml
rename to applications/loanshark/src/main/webapp/WEB-INF/layouts/layouts.xml
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml b/applications/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml
rename to applications/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/create.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/create.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/create.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/create.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/dependency.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/dependency.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/dependency.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/dependency.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/column.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/column.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/column.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/column.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/display.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/display.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/display.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/display.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/input.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/input.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/input.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/input.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/select.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/table.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/find.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/find.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/find.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/find.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/list.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/list.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/list.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/list.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/show.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/show.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/show.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/show.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/update.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/form/update.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/form/update.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/form/update.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/menu/category.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/menu/category.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/menu/category.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/menu/category.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/menu/item.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/menu/item.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/menu/item.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/menu/item.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/menu/menu.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/menu/menu.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/menu/menu.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/menu/menu.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/language.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/util/language.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/language.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/util/language.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/pagination.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/util/pagination.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/pagination.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/util/pagination.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/panel.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/util/panel.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/panel.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/util/panel.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/placeholder.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/util/placeholder.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/placeholder.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/util/placeholder.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/theme.tagx b/applications/loanshark/src/main/webapp/WEB-INF/tags/util/theme.tagx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/tags/util/theme.tagx
rename to applications/loanshark/src/main/webapp/WEB-INF/tags/util/theme.tagx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/footer.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/footer.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/footer.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/footer.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/header.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/header.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/header.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/header.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/index-template.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/index-template.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/index-template.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/index-template.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/index.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/index.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/index.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/index.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/create.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/create.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/create.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/create.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/findLoanSharksByName.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/findLoanSharksByName.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/findLoanSharksByName.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/findLoanSharksByName.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/list.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/list.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/list.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/list.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/show.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/show.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/show.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/show.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/update.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/update.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/update.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/update.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/views.xml b/applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/views.xml
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/loansharks/views.xml
rename to applications/loanshark/src/main/webapp/WEB-INF/views/loansharks/views.xml
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/menu.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/menu.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/menu.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/menu.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/resourceNotFound.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/resourceNotFound.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/resourceNotFound.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/resourceNotFound.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/uncaughtException.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/uncaughtException.jspx
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/uncaughtException.jspx
rename to applications/loanshark/src/main/webapp/WEB-INF/views/uncaughtException.jspx
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/views/views.xml b/applications/loanshark/src/main/webapp/WEB-INF/views/views.xml
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/views/views.xml
rename to applications/loanshark/src/main/webapp/WEB-INF/views/views.xml
diff --git a/case-studies/loanshark/src/main/webapp/WEB-INF/web.xml b/applications/loanshark/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/WEB-INF/web.xml
rename to applications/loanshark/src/main/webapp/WEB-INF/web.xml
diff --git a/case-studies/loanshark/src/main/webapp/images/add.png b/applications/loanshark/src/main/webapp/images/add.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/add.png
rename to applications/loanshark/src/main/webapp/images/add.png
diff --git a/case-studies/loanshark/src/main/webapp/images/banner-graphic.png b/applications/loanshark/src/main/webapp/images/banner-graphic.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/banner-graphic.png
rename to applications/loanshark/src/main/webapp/images/banner-graphic.png
diff --git a/case-studies/loanshark/src/main/webapp/images/create.png b/applications/loanshark/src/main/webapp/images/create.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/create.png
rename to applications/loanshark/src/main/webapp/images/create.png
diff --git a/case-studies/loanshark/src/main/webapp/images/delete.png b/applications/loanshark/src/main/webapp/images/delete.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/delete.png
rename to applications/loanshark/src/main/webapp/images/delete.png
diff --git a/case-studies/loanshark/src/main/webapp/images/en.png b/applications/loanshark/src/main/webapp/images/en.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/en.png
rename to applications/loanshark/src/main/webapp/images/en.png
diff --git a/case-studies/loanshark/src/main/webapp/images/favicon.ico b/applications/loanshark/src/main/webapp/images/favicon.ico
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/favicon.ico
rename to applications/loanshark/src/main/webapp/images/favicon.ico
diff --git a/case-studies/loanshark/src/main/webapp/images/list.png b/applications/loanshark/src/main/webapp/images/list.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/list.png
rename to applications/loanshark/src/main/webapp/images/list.png
diff --git a/case-studies/loanshark/src/main/webapp/images/resultset_first.png b/applications/loanshark/src/main/webapp/images/resultset_first.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/resultset_first.png
rename to applications/loanshark/src/main/webapp/images/resultset_first.png
diff --git a/case-studies/loanshark/src/main/webapp/images/resultset_last.png b/applications/loanshark/src/main/webapp/images/resultset_last.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/resultset_last.png
rename to applications/loanshark/src/main/webapp/images/resultset_last.png
diff --git a/case-studies/loanshark/src/main/webapp/images/resultset_next.png b/applications/loanshark/src/main/webapp/images/resultset_next.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/resultset_next.png
rename to applications/loanshark/src/main/webapp/images/resultset_next.png
diff --git a/case-studies/loanshark/src/main/webapp/images/resultset_previous.png b/applications/loanshark/src/main/webapp/images/resultset_previous.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/resultset_previous.png
rename to applications/loanshark/src/main/webapp/images/resultset_previous.png
diff --git a/case-studies/loanshark/src/main/webapp/images/show.png b/applications/loanshark/src/main/webapp/images/show.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/show.png
rename to applications/loanshark/src/main/webapp/images/show.png
diff --git a/case-studies/loanshark/src/main/webapp/images/springsource-logo.png b/applications/loanshark/src/main/webapp/images/springsource-logo.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/springsource-logo.png
rename to applications/loanshark/src/main/webapp/images/springsource-logo.png
diff --git a/case-studies/loanshark/src/main/webapp/images/update.png b/applications/loanshark/src/main/webapp/images/update.png
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/images/update.png
rename to applications/loanshark/src/main/webapp/images/update.png
diff --git a/case-studies/loanshark/src/main/webapp/styles/alt.css b/applications/loanshark/src/main/webapp/styles/alt.css
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/styles/alt.css
rename to applications/loanshark/src/main/webapp/styles/alt.css
diff --git a/case-studies/loanshark/src/main/webapp/styles/standard.css b/applications/loanshark/src/main/webapp/styles/standard.css
similarity index 100%
rename from case-studies/loanshark/src/main/webapp/styles/standard.css
rename to applications/loanshark/src/main/webapp/styles/standard.css
diff --git a/case-studies/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java
similarity index 100%
rename from case-studies/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java
rename to applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java
diff --git a/case-studies/loanshark/src/test/resources/log4j.properties b/applications/loanshark/src/test/resources/log4j.properties
similarity index 100%
rename from case-studies/loanshark/src/test/resources/log4j.properties
rename to applications/loanshark/src/test/resources/log4j.properties
diff --git a/case-studies/loanshark/udps.groovy b/applications/loanshark/udps.groovy
similarity index 100%
rename from case-studies/loanshark/udps.groovy
rename to applications/loanshark/udps.groovy
diff --git a/case-studies/loanshark/udps.pl b/applications/loanshark/udps.pl
similarity index 100%
rename from case-studies/loanshark/udps.pl
rename to applications/loanshark/udps.pl
diff --git a/api/readme.txt b/applications/readme.txt
similarity index 100%
rename from api/readme.txt
rename to applications/readme.txt
diff --git a/getting-started/file/.classpath b/basic/file/.classpath
similarity index 100%
rename from getting-started/file/.classpath
rename to basic/file/.classpath
diff --git a/cookbooks/async-gateway/.gitignore b/basic/file/.gitignore
similarity index 100%
rename from cookbooks/async-gateway/.gitignore
rename to basic/file/.gitignore
diff --git a/getting-started/file/.project b/basic/file/.project
similarity index 100%
rename from getting-started/file/.project
rename to basic/file/.project
diff --git a/getting-started/file/.settings/com.springsource.sts.config.flow.prefs b/basic/file/.settings/com.springsource.sts.config.flow.prefs
similarity index 100%
rename from getting-started/file/.settings/com.springsource.sts.config.flow.prefs
rename to basic/file/.settings/com.springsource.sts.config.flow.prefs
diff --git a/getting-started/file/.settings/org.springframework.ide.eclipse.core.prefs b/basic/file/.settings/org.springframework.ide.eclipse.core.prefs
similarity index 100%
rename from getting-started/file/.settings/org.springframework.ide.eclipse.core.prefs
rename to basic/file/.settings/org.springframework.ide.eclipse.core.prefs
diff --git a/cookbooks/async-gateway/.springBeans b/basic/file/.springBeans
similarity index 100%
rename from cookbooks/async-gateway/.springBeans
rename to basic/file/.springBeans
diff --git a/getting-started/file/input/file_0.txt b/basic/file/input/file_0.txt
similarity index 100%
rename from getting-started/file/input/file_0.txt
rename to basic/file/input/file_0.txt
diff --git a/getting-started/file/input/file_1.txt b/basic/file/input/file_1.txt
similarity index 100%
rename from getting-started/file/input/file_1.txt
rename to basic/file/input/file_1.txt
diff --git a/getting-started/file/input/file_2.txt b/basic/file/input/file_2.txt
similarity index 100%
rename from getting-started/file/input/file_2.txt
rename to basic/file/input/file_2.txt
diff --git a/getting-started/file/input/file_3.txt b/basic/file/input/file_3.txt
similarity index 100%
rename from getting-started/file/input/file_3.txt
rename to basic/file/input/file_3.txt
diff --git a/getting-started/file/input/file_4.txt b/basic/file/input/file_4.txt
similarity index 100%
rename from getting-started/file/input/file_4.txt
rename to basic/file/input/file_4.txt
diff --git a/getting-started/file/pom.xml b/basic/file/pom.xml
similarity index 100%
rename from getting-started/file/pom.xml
rename to basic/file/pom.xml
diff --git a/getting-started/file/readme.txt b/basic/file/readme.txt
similarity index 100%
rename from getting-started/file/readme.txt
rename to basic/file/readme.txt
diff --git a/getting-started/file/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java b/basic/file/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
similarity index 100%
rename from getting-started/file/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
rename to basic/file/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
diff --git a/getting-started/file/src/main/java/org/springframework/integration/samples/filecopy/Handler.java b/basic/file/src/main/java/org/springframework/integration/samples/filecopy/Handler.java
similarity index 100%
rename from getting-started/file/src/main/java/org/springframework/integration/samples/filecopy/Handler.java
rename to basic/file/src/main/java/org/springframework/integration/samples/filecopy/Handler.java
diff --git a/getting-started/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-binary.xml b/basic/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-binary.xml
similarity index 100%
rename from getting-started/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-binary.xml
rename to basic/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-binary.xml
diff --git a/getting-started/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-file.xml b/basic/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-file.xml
similarity index 100%
rename from getting-started/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-file.xml
rename to basic/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-file.xml
diff --git a/getting-started/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-text.xml b/basic/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-text.xml
similarity index 100%
rename from getting-started/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-text.xml
rename to basic/file/src/main/resources/META-INF/spring/integration/fileCopyDemo-text.xml
diff --git a/getting-started/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java
similarity index 100%
rename from getting-started/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java
rename to basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java
diff --git a/getting-started/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java
similarity index 100%
rename from getting-started/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java
rename to basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java
diff --git a/getting-started/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java
similarity index 100%
rename from getting-started/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java
rename to basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java
diff --git a/getting-started/file/src/test/resources/log4j.xml b/basic/file/src/test/resources/log4j.xml
similarity index 100%
rename from getting-started/file/src/test/resources/log4j.xml
rename to basic/file/src/test/resources/log4j.xml
diff --git a/getting-started/helloworld/.classpath b/basic/helloworld/.classpath
similarity index 100%
rename from getting-started/helloworld/.classpath
rename to basic/helloworld/.classpath
diff --git a/cookbooks/errorhandling/.gitignore b/basic/helloworld/.gitignore
similarity index 100%
rename from cookbooks/errorhandling/.gitignore
rename to basic/helloworld/.gitignore
diff --git a/getting-started/helloworld/.project b/basic/helloworld/.project
similarity index 100%
rename from getting-started/helloworld/.project
rename to basic/helloworld/.project
diff --git a/cookbooks/file-processing/.springBeans b/basic/helloworld/.springBeans
similarity index 100%
rename from cookbooks/file-processing/.springBeans
rename to basic/helloworld/.springBeans
diff --git a/getting-started/helloworld/pom.xml b/basic/helloworld/pom.xml
similarity index 100%
rename from getting-started/helloworld/pom.xml
rename to basic/helloworld/pom.xml
diff --git a/getting-started/helloworld/readme.txt b/basic/helloworld/readme.txt
similarity index 100%
rename from getting-started/helloworld/readme.txt
rename to basic/helloworld/readme.txt
diff --git a/getting-started/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
similarity index 100%
rename from getting-started/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
rename to basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
diff --git a/getting-started/helloworld/src/main/resources/META-INF/spring/integration/helloWorldDemo.xml b/basic/helloworld/src/main/resources/META-INF/spring/integration/helloWorldDemo.xml
similarity index 100%
rename from getting-started/helloworld/src/main/resources/META-INF/spring/integration/helloWorldDemo.xml
rename to basic/helloworld/src/main/resources/META-INF/spring/integration/helloWorldDemo.xml
diff --git a/getting-started/helloworld/src/test/java/org/springframework/integration/samples/helloworld/HelloWorldDemoTest.java b/basic/helloworld/src/test/java/org/springframework/integration/samples/helloworld/HelloWorldDemoTest.java
similarity index 100%
rename from getting-started/helloworld/src/test/java/org/springframework/integration/samples/helloworld/HelloWorldDemoTest.java
rename to basic/helloworld/src/test/java/org/springframework/integration/samples/helloworld/HelloWorldDemoTest.java
diff --git a/getting-started/helloworld/src/test/resources/log4j.xml b/basic/helloworld/src/test/resources/log4j.xml
similarity index 100%
rename from getting-started/helloworld/src/test/resources/log4j.xml
rename to basic/helloworld/src/test/resources/log4j.xml
diff --git a/getting-started/jms/.classpath b/basic/jms/.classpath
similarity index 100%
rename from getting-started/jms/.classpath
rename to basic/jms/.classpath
diff --git a/getting-started/jms/.gitignore b/basic/jms/.gitignore
similarity index 100%
rename from getting-started/jms/.gitignore
rename to basic/jms/.gitignore
diff --git a/getting-started/jms/.project b/basic/jms/.project
similarity index 100%
rename from getting-started/jms/.project
rename to basic/jms/.project
diff --git a/getting-started/jms/pom.xml b/basic/jms/pom.xml
similarity index 100%
rename from getting-started/jms/pom.xml
rename to basic/jms/pom.xml
diff --git a/getting-started/jms/readme.txt b/basic/jms/readme.txt
similarity index 100%
rename from getting-started/jms/readme.txt
rename to basic/jms/readme.txt
diff --git a/getting-started/jms/src/main/java/org/springframework/integration/samples/jms/ActiveMqTestUtils.java b/basic/jms/src/main/java/org/springframework/integration/samples/jms/ActiveMqTestUtils.java
similarity index 100%
rename from getting-started/jms/src/main/java/org/springframework/integration/samples/jms/ActiveMqTestUtils.java
rename to basic/jms/src/main/java/org/springframework/integration/samples/jms/ActiveMqTestUtils.java
diff --git a/getting-started/jms/src/main/java/org/springframework/integration/samples/jms/DemoBean.java b/basic/jms/src/main/java/org/springframework/integration/samples/jms/DemoBean.java
similarity index 100%
rename from getting-started/jms/src/main/java/org/springframework/integration/samples/jms/DemoBean.java
rename to basic/jms/src/main/java/org/springframework/integration/samples/jms/DemoBean.java
diff --git a/getting-started/jms/src/main/resources/META-INF/spring/integration/common.xml b/basic/jms/src/main/resources/META-INF/spring/integration/common.xml
similarity index 100%
rename from getting-started/jms/src/main/resources/META-INF/spring/integration/common.xml
rename to basic/jms/src/main/resources/META-INF/spring/integration/common.xml
diff --git a/getting-started/jms/src/main/resources/META-INF/spring/integration/inboundChannelAdapter.xml b/basic/jms/src/main/resources/META-INF/spring/integration/inboundChannelAdapter.xml
similarity index 100%
rename from getting-started/jms/src/main/resources/META-INF/spring/integration/inboundChannelAdapter.xml
rename to basic/jms/src/main/resources/META-INF/spring/integration/inboundChannelAdapter.xml
diff --git a/getting-started/jms/src/main/resources/META-INF/spring/integration/inboundGateway.xml b/basic/jms/src/main/resources/META-INF/spring/integration/inboundGateway.xml
similarity index 100%
rename from getting-started/jms/src/main/resources/META-INF/spring/integration/inboundGateway.xml
rename to basic/jms/src/main/resources/META-INF/spring/integration/inboundGateway.xml
diff --git a/getting-started/jms/src/main/resources/META-INF/spring/integration/outboundChannelAdapter.xml b/basic/jms/src/main/resources/META-INF/spring/integration/outboundChannelAdapter.xml
similarity index 100%
rename from getting-started/jms/src/main/resources/META-INF/spring/integration/outboundChannelAdapter.xml
rename to basic/jms/src/main/resources/META-INF/spring/integration/outboundChannelAdapter.xml
diff --git a/getting-started/jms/src/main/resources/META-INF/spring/integration/outboundGateway.xml b/basic/jms/src/main/resources/META-INF/spring/integration/outboundGateway.xml
similarity index 100%
rename from getting-started/jms/src/main/resources/META-INF/spring/integration/outboundGateway.xml
rename to basic/jms/src/main/resources/META-INF/spring/integration/outboundGateway.xml
diff --git a/getting-started/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
similarity index 100%
rename from getting-started/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
rename to basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
diff --git a/getting-started/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemo.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemo.java
similarity index 100%
rename from getting-started/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemo.java
rename to basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemo.java
diff --git a/getting-started/jms/src/test/resources/log4j.xml b/basic/jms/src/test/resources/log4j.xml
similarity index 100%
rename from getting-started/jms/src/test/resources/log4j.xml
rename to basic/jms/src/test/resources/log4j.xml
diff --git a/getting-started/jmx/.classpath b/basic/jmx/.classpath
similarity index 100%
rename from getting-started/jmx/.classpath
rename to basic/jmx/.classpath
diff --git a/cookbooks/multipart-http/.gitignore b/basic/jmx/.gitignore
similarity index 100%
rename from cookbooks/multipart-http/.gitignore
rename to basic/jmx/.gitignore
diff --git a/getting-started/jmx/.project b/basic/jmx/.project
similarity index 100%
rename from getting-started/jmx/.project
rename to basic/jmx/.project
diff --git a/getting-started/file/.springBeans b/basic/jmx/.springBeans
similarity index 100%
rename from getting-started/file/.springBeans
rename to basic/jmx/.springBeans
diff --git a/getting-started/jmx/pom.xml b/basic/jmx/pom.xml
similarity index 100%
rename from getting-started/jmx/pom.xml
rename to basic/jmx/pom.xml
diff --git a/getting-started/jmx/readme.txt b/basic/jmx/readme.txt
similarity index 100%
rename from getting-started/jmx/readme.txt
rename to basic/jmx/readme.txt
diff --git a/getting-started/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java b/basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java
similarity index 100%
rename from getting-started/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java
rename to basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java
diff --git a/getting-started/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml b/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml
similarity index 100%
rename from getting-started/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml
rename to basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml
diff --git a/getting-started/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java b/basic/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java
similarity index 100%
rename from getting-started/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java
rename to basic/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java
diff --git a/cookbooks/errorhandling/src/test/resources/log4j.xml b/basic/jmx/src/test/resources/log4j.xml
similarity index 100%
rename from cookbooks/errorhandling/src/test/resources/log4j.xml
rename to basic/jmx/src/test/resources/log4j.xml
diff --git a/cookbooks/file-processing/.classpath b/basic/mail/.classpath
similarity index 100%
rename from cookbooks/file-processing/.classpath
rename to basic/mail/.classpath
diff --git a/getting-started/file/.gitignore b/basic/mail/.gitignore
similarity index 100%
rename from getting-started/file/.gitignore
rename to basic/mail/.gitignore
diff --git a/getting-started/mail/.project b/basic/mail/.project
similarity index 100%
rename from getting-started/mail/.project
rename to basic/mail/.project
diff --git a/getting-started/mail/.settings/com.springsource.sts.config.flow.prefs b/basic/mail/.settings/com.springsource.sts.config.flow.prefs
similarity index 100%
rename from getting-started/mail/.settings/com.springsource.sts.config.flow.prefs
rename to basic/mail/.settings/com.springsource.sts.config.flow.prefs
diff --git a/getting-started/mail/.settings/org.eclipse.jdt.core.prefs b/basic/mail/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from getting-started/mail/.settings/org.eclipse.jdt.core.prefs
rename to basic/mail/.settings/org.eclipse.jdt.core.prefs
diff --git a/getting-started/mail/.settings/org.maven.ide.eclipse.prefs b/basic/mail/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from getting-started/mail/.settings/org.maven.ide.eclipse.prefs
rename to basic/mail/.settings/org.maven.ide.eclipse.prefs
diff --git a/getting-started/mail/.settings/org.springframework.ide.eclipse.core.prefs b/basic/mail/.settings/org.springframework.ide.eclipse.core.prefs
similarity index 100%
rename from getting-started/mail/.settings/org.springframework.ide.eclipse.core.prefs
rename to basic/mail/.settings/org.springframework.ide.eclipse.core.prefs
diff --git a/getting-started/mail/.springBeans b/basic/mail/.springBeans
similarity index 100%
rename from getting-started/mail/.springBeans
rename to basic/mail/.springBeans
diff --git a/getting-started/mail/pom.xml b/basic/mail/pom.xml
similarity index 100%
rename from getting-started/mail/pom.xml
rename to basic/mail/pom.xml
diff --git a/getting-started/mail/readme.txt b/basic/mail/readme.txt
similarity index 100%
rename from getting-started/mail/readme.txt
rename to basic/mail/readme.txt
diff --git a/getting-started/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml
similarity index 100%
rename from getting-started/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml
rename to basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml
diff --git a/getting-started/mail/src/main/resources/META-INF/spring/integration/gmail-pop3-config.xml b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-pop3-config.xml
similarity index 100%
rename from getting-started/mail/src/main/resources/META-INF/spring/integration/gmail-pop3-config.xml
rename to basic/mail/src/main/resources/META-INF/spring/integration/gmail-pop3-config.xml
diff --git a/getting-started/mail/src/test/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTest.java b/basic/mail/src/test/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTest.java
similarity index 100%
rename from getting-started/mail/src/test/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTest.java
rename to basic/mail/src/test/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTest.java
diff --git a/getting-started/mail/src/test/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTest.java b/basic/mail/src/test/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTest.java
similarity index 100%
rename from getting-started/mail/src/test/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTest.java
rename to basic/mail/src/test/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTest.java
diff --git a/getting-started/mail/src/test/resources/log4j.xml b/basic/mail/src/test/resources/log4j.xml
similarity index 100%
rename from getting-started/mail/src/test/resources/log4j.xml
rename to basic/mail/src/test/resources/log4j.xml
diff --git a/getting-started/oddeven/.classpath b/basic/oddeven/.classpath
similarity index 100%
rename from getting-started/oddeven/.classpath
rename to basic/oddeven/.classpath
diff --git a/getting-started/helloworld/.gitignore b/basic/oddeven/.gitignore
similarity index 100%
rename from getting-started/helloworld/.gitignore
rename to basic/oddeven/.gitignore
diff --git a/getting-started/oddeven/.project b/basic/oddeven/.project
similarity index 100%
rename from getting-started/oddeven/.project
rename to basic/oddeven/.project
diff --git a/getting-started/oddeven/.settings/com.springsource.sts.config.flow.prefs b/basic/oddeven/.settings/com.springsource.sts.config.flow.prefs
similarity index 100%
rename from getting-started/oddeven/.settings/com.springsource.sts.config.flow.prefs
rename to basic/oddeven/.settings/com.springsource.sts.config.flow.prefs
diff --git a/getting-started/oddeven/pom.xml b/basic/oddeven/pom.xml
similarity index 100%
rename from getting-started/oddeven/pom.xml
rename to basic/oddeven/pom.xml
diff --git a/getting-started/oddeven/readme.txt b/basic/oddeven/readme.txt
similarity index 100%
rename from getting-started/oddeven/readme.txt
rename to basic/oddeven/readme.txt
diff --git a/getting-started/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
similarity index 100%
rename from getting-started/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
rename to basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
diff --git a/getting-started/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java
similarity index 100%
rename from getting-started/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java
rename to basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java
diff --git a/getting-started/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java
similarity index 100%
rename from getting-started/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java
rename to basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java
diff --git a/getting-started/oddeven/src/main/resources/META-INF/spring/integration/cronOddEvenDemo.xml b/basic/oddeven/src/main/resources/META-INF/spring/integration/cronOddEvenDemo.xml
similarity index 100%
rename from getting-started/oddeven/src/main/resources/META-INF/spring/integration/cronOddEvenDemo.xml
rename to basic/oddeven/src/main/resources/META-INF/spring/integration/cronOddEvenDemo.xml
diff --git a/getting-started/oddeven/src/main/resources/META-INF/spring/integration/intervalOddEvenDemo.xml b/basic/oddeven/src/main/resources/META-INF/spring/integration/intervalOddEvenDemo.xml
similarity index 100%
rename from getting-started/oddeven/src/main/resources/META-INF/spring/integration/intervalOddEvenDemo.xml
rename to basic/oddeven/src/main/resources/META-INF/spring/integration/intervalOddEvenDemo.xml
diff --git a/getting-started/oddeven/src/test/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java b/basic/oddeven/src/test/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
similarity index 100%
rename from getting-started/oddeven/src/test/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
rename to basic/oddeven/src/test/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
diff --git a/getting-started/oddeven/src/test/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemoTest.java b/basic/oddeven/src/test/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemoTest.java
similarity index 100%
rename from getting-started/oddeven/src/test/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemoTest.java
rename to basic/oddeven/src/test/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemoTest.java
diff --git a/getting-started/oddeven/src/test/resources/log4j.xml b/basic/oddeven/src/test/resources/log4j.xml
similarity index 100%
rename from getting-started/oddeven/src/test/resources/log4j.xml
rename to basic/oddeven/src/test/resources/log4j.xml
diff --git a/cookbooks/errorhandling/.classpath b/basic/quote/.classpath
similarity index 100%
rename from cookbooks/errorhandling/.classpath
rename to basic/quote/.classpath
diff --git a/getting-started/jmx/.gitignore b/basic/quote/.gitignore
similarity index 100%
rename from getting-started/jmx/.gitignore
rename to basic/quote/.gitignore
diff --git a/getting-started/quote/.project b/basic/quote/.project
similarity index 100%
rename from getting-started/quote/.project
rename to basic/quote/.project
diff --git a/getting-started/quote/pom.xml b/basic/quote/pom.xml
similarity index 100%
rename from getting-started/quote/pom.xml
rename to basic/quote/pom.xml
diff --git a/getting-started/quote/readme.txt b/basic/quote/readme.txt
similarity index 100%
rename from getting-started/quote/readme.txt
rename to basic/quote/readme.txt
diff --git a/getting-started/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java b/basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java
similarity index 100%
rename from getting-started/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java
rename to basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java
diff --git a/getting-started/quote/src/main/java/org/springframework/integration/samples/quote/QuoteService.java b/basic/quote/src/main/java/org/springframework/integration/samples/quote/QuoteService.java
similarity index 100%
rename from getting-started/quote/src/main/java/org/springframework/integration/samples/quote/QuoteService.java
rename to basic/quote/src/main/java/org/springframework/integration/samples/quote/QuoteService.java
diff --git a/getting-started/quote/src/main/java/org/springframework/integration/samples/quote/TickerStream.java b/basic/quote/src/main/java/org/springframework/integration/samples/quote/TickerStream.java
similarity index 100%
rename from getting-started/quote/src/main/java/org/springframework/integration/samples/quote/TickerStream.java
rename to basic/quote/src/main/java/org/springframework/integration/samples/quote/TickerStream.java
diff --git a/getting-started/quote/src/main/resources/META-INF/spring/integration/quoteDemo.xml b/basic/quote/src/main/resources/META-INF/spring/integration/quoteDemo.xml
similarity index 100%
rename from getting-started/quote/src/main/resources/META-INF/spring/integration/quoteDemo.xml
rename to basic/quote/src/main/resources/META-INF/spring/integration/quoteDemo.xml
diff --git a/getting-started/quote/src/test/java/org/springframework/integration/samples/quote/QuoteDemoTest.java b/basic/quote/src/test/java/org/springframework/integration/samples/quote/QuoteDemoTest.java
similarity index 100%
rename from getting-started/quote/src/test/java/org/springframework/integration/samples/quote/QuoteDemoTest.java
rename to basic/quote/src/test/java/org/springframework/integration/samples/quote/QuoteDemoTest.java
diff --git a/getting-started/quote/src/test/resources/log4j.xml b/basic/quote/src/test/resources/log4j.xml
similarity index 100%
rename from getting-started/quote/src/test/resources/log4j.xml
rename to basic/quote/src/test/resources/log4j.xml
diff --git a/case-studies/readme.txt b/basic/readme.txt
similarity index 100%
rename from case-studies/readme.txt
rename to basic/readme.txt
diff --git a/getting-started/ws-inbound-gateway/.classpath b/basic/ws-inbound-gateway/.classpath
similarity index 100%
rename from getting-started/ws-inbound-gateway/.classpath
rename to basic/ws-inbound-gateway/.classpath
diff --git a/getting-started/mail/.gitignore b/basic/ws-inbound-gateway/.gitignore
similarity index 100%
rename from getting-started/mail/.gitignore
rename to basic/ws-inbound-gateway/.gitignore
diff --git a/getting-started/ws-inbound-gateway/.project b/basic/ws-inbound-gateway/.project
similarity index 100%
rename from getting-started/ws-inbound-gateway/.project
rename to basic/ws-inbound-gateway/.project
diff --git a/getting-started/ws-inbound-gateway/.settings/.jsdtscope b/basic/ws-inbound-gateway/.settings/.jsdtscope
similarity index 100%
rename from getting-started/ws-inbound-gateway/.settings/.jsdtscope
rename to basic/ws-inbound-gateway/.settings/.jsdtscope
diff --git a/getting-started/ws-inbound-gateway/.settings/org.eclipse.jdt.core.prefs b/basic/ws-inbound-gateway/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from getting-started/ws-inbound-gateway/.settings/org.eclipse.jdt.core.prefs
rename to basic/ws-inbound-gateway/.settings/org.eclipse.jdt.core.prefs
diff --git a/getting-started/ws-inbound-gateway/.settings/org.eclipse.wst.common.component b/basic/ws-inbound-gateway/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from getting-started/ws-inbound-gateway/.settings/org.eclipse.wst.common.component
rename to basic/ws-inbound-gateway/.settings/org.eclipse.wst.common.component
diff --git a/getting-started/ws-inbound-gateway/.settings/org.eclipse.wst.common.project.facet.core.xml b/basic/ws-inbound-gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from getting-started/ws-inbound-gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to basic/ws-inbound-gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/cookbooks/multipart-http/.settings/org.eclipse.wst.jsdt.ui.superType.container b/basic/ws-inbound-gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
similarity index 100%
rename from cookbooks/multipart-http/.settings/org.eclipse.wst.jsdt.ui.superType.container
rename to basic/ws-inbound-gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/cookbooks/multipart-http/.settings/org.eclipse.wst.jsdt.ui.superType.name b/basic/ws-inbound-gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
similarity index 100%
rename from cookbooks/multipart-http/.settings/org.eclipse.wst.jsdt.ui.superType.name
rename to basic/ws-inbound-gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/getting-started/ws-inbound-gateway/.settings/org.maven.ide.eclipse.prefs b/basic/ws-inbound-gateway/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from getting-started/ws-inbound-gateway/.settings/org.maven.ide.eclipse.prefs
rename to basic/ws-inbound-gateway/.settings/org.maven.ide.eclipse.prefs
diff --git a/getting-started/ws-inbound-gateway/.settings/org.springframework.ide.eclipse.beans.core.prefs b/basic/ws-inbound-gateway/.settings/org.springframework.ide.eclipse.beans.core.prefs
similarity index 100%
rename from getting-started/ws-inbound-gateway/.settings/org.springframework.ide.eclipse.beans.core.prefs
rename to basic/ws-inbound-gateway/.settings/org.springframework.ide.eclipse.beans.core.prefs
diff --git a/getting-started/helloworld/.springBeans b/basic/ws-inbound-gateway/.springBeans
similarity index 100%
rename from getting-started/helloworld/.springBeans
rename to basic/ws-inbound-gateway/.springBeans
diff --git a/getting-started/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml
similarity index 100%
rename from getting-started/ws-inbound-gateway/pom.xml
rename to basic/ws-inbound-gateway/pom.xml
diff --git a/getting-started/ws-inbound-gateway/readme.txt b/basic/ws-inbound-gateway/readme.txt
similarity index 100%
rename from getting-started/ws-inbound-gateway/readme.txt
rename to basic/ws-inbound-gateway/readme.txt
diff --git a/getting-started/ws-inbound-gateway/src/main/java/org/springframework/integration/samples/ws/SimpleEchoResponder.java b/basic/ws-inbound-gateway/src/main/java/org/springframework/integration/samples/ws/SimpleEchoResponder.java
similarity index 100%
rename from getting-started/ws-inbound-gateway/src/main/java/org/springframework/integration/samples/ws/SimpleEchoResponder.java
rename to basic/ws-inbound-gateway/src/main/java/org/springframework/integration/samples/ws/SimpleEchoResponder.java
diff --git a/getting-started/ws-inbound-gateway/src/main/resources/META-INF/spring/integration/inbound-gateway-config.xml b/basic/ws-inbound-gateway/src/main/resources/META-INF/spring/integration/inbound-gateway-config.xml
similarity index 100%
rename from getting-started/ws-inbound-gateway/src/main/resources/META-INF/spring/integration/inbound-gateway-config.xml
rename to basic/ws-inbound-gateway/src/main/resources/META-INF/spring/integration/inbound-gateway-config.xml
diff --git a/getting-started/ws-inbound-gateway/src/main/webapp/WEB-INF/spring-ws-config.xml b/basic/ws-inbound-gateway/src/main/webapp/WEB-INF/spring-ws-config.xml
similarity index 100%
rename from getting-started/ws-inbound-gateway/src/main/webapp/WEB-INF/spring-ws-config.xml
rename to basic/ws-inbound-gateway/src/main/webapp/WEB-INF/spring-ws-config.xml
diff --git a/getting-started/ws-inbound-gateway/src/main/webapp/WEB-INF/web.xml b/basic/ws-inbound-gateway/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from getting-started/ws-inbound-gateway/src/main/webapp/WEB-INF/web.xml
rename to basic/ws-inbound-gateway/src/main/webapp/WEB-INF/web.xml
diff --git a/getting-started/ws-inbound-gateway/src/main/webapp/index.html b/basic/ws-inbound-gateway/src/main/webapp/index.html
similarity index 100%
rename from getting-started/ws-inbound-gateway/src/main/webapp/index.html
rename to basic/ws-inbound-gateway/src/main/webapp/index.html
diff --git a/getting-started/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java
similarity index 100%
rename from getting-started/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java
rename to basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java
diff --git a/getting-started/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java
similarity index 100%
rename from getting-started/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java
rename to basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java
diff --git a/getting-started/ws-inbound-gateway/src/test/resources/log4j.xml b/basic/ws-inbound-gateway/src/test/resources/log4j.xml
similarity index 100%
rename from getting-started/ws-inbound-gateway/src/test/resources/log4j.xml
rename to basic/ws-inbound-gateway/src/test/resources/log4j.xml
diff --git a/getting-started/ws-outbound-gateway/.classpath b/basic/ws-outbound-gateway/.classpath
similarity index 100%
rename from getting-started/ws-outbound-gateway/.classpath
rename to basic/ws-outbound-gateway/.classpath
diff --git a/getting-started/oddeven/.gitignore b/basic/ws-outbound-gateway/.gitignore
similarity index 100%
rename from getting-started/oddeven/.gitignore
rename to basic/ws-outbound-gateway/.gitignore
diff --git a/getting-started/ws-outbound-gateway/.project b/basic/ws-outbound-gateway/.project
similarity index 100%
rename from getting-started/ws-outbound-gateway/.project
rename to basic/ws-outbound-gateway/.project
diff --git a/getting-started/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml
similarity index 100%
rename from getting-started/ws-outbound-gateway/pom.xml
rename to basic/ws-outbound-gateway/pom.xml
diff --git a/getting-started/ws-outbound-gateway/readme.txt b/basic/ws-outbound-gateway/readme.txt
similarity index 100%
rename from getting-started/ws-outbound-gateway/readme.txt
rename to basic/ws-outbound-gateway/readme.txt
diff --git a/getting-started/ws-outbound-gateway/src.test/resources/log4j.xml b/basic/ws-outbound-gateway/src.test/resources/log4j.xml
similarity index 100%
rename from getting-started/ws-outbound-gateway/src.test/resources/log4j.xml
rename to basic/ws-outbound-gateway/src.test/resources/log4j.xml
diff --git a/getting-started/ws-outbound-gateway/src/main/reources/META-INF/spring/integration/temperatureConversion.xml b/basic/ws-outbound-gateway/src/main/reources/META-INF/spring/integration/temperatureConversion.xml
similarity index 100%
rename from getting-started/ws-outbound-gateway/src/main/reources/META-INF/spring/integration/temperatureConversion.xml
rename to basic/ws-outbound-gateway/src/main/reources/META-INF/spring/integration/temperatureConversion.xml
diff --git a/getting-started/ws-outbound-gateway/src/test/java/rg/springframework/integration/samples/ws/WebServiceDemoTest.java b/basic/ws-outbound-gateway/src/test/java/rg/springframework/integration/samples/ws/WebServiceDemoTest.java
similarity index 100%
rename from getting-started/ws-outbound-gateway/src/test/java/rg/springframework/integration/samples/ws/WebServiceDemoTest.java
rename to basic/ws-outbound-gateway/src/test/java/rg/springframework/integration/samples/ws/WebServiceDemoTest.java
diff --git a/getting-started/xml/.classpath b/basic/xml/.classpath
similarity index 100%
rename from getting-started/xml/.classpath
rename to basic/xml/.classpath
diff --git a/getting-started/quote/.gitignore b/basic/xml/.gitignore
similarity index 100%
rename from getting-started/quote/.gitignore
rename to basic/xml/.gitignore
diff --git a/getting-started/xml/.project b/basic/xml/.project
similarity index 100%
rename from getting-started/xml/.project
rename to basic/xml/.project
diff --git a/getting-started/xml/.settings/com.springsource.sts.config.flow.prefs b/basic/xml/.settings/com.springsource.sts.config.flow.prefs
similarity index 100%
rename from getting-started/xml/.settings/com.springsource.sts.config.flow.prefs
rename to basic/xml/.settings/com.springsource.sts.config.flow.prefs
diff --git a/getting-started/xml/.settings/org.eclipse.jdt.core.prefs b/basic/xml/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from getting-started/xml/.settings/org.eclipse.jdt.core.prefs
rename to basic/xml/.settings/org.eclipse.jdt.core.prefs
diff --git a/getting-started/xml/.settings/org.maven.ide.eclipse.prefs b/basic/xml/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from getting-started/xml/.settings/org.maven.ide.eclipse.prefs
rename to basic/xml/.settings/org.maven.ide.eclipse.prefs
diff --git a/getting-started/xml/pom.xml b/basic/xml/pom.xml
similarity index 100%
rename from getting-started/xml/pom.xml
rename to basic/xml/pom.xml
diff --git a/getting-started/xml/readme.txt b/basic/xml/readme.txt
similarity index 100%
rename from getting-started/xml/readme.txt
rename to basic/xml/readme.txt
diff --git a/getting-started/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java b/basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java
similarity index 100%
rename from getting-started/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java
rename to basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java
diff --git a/getting-started/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java b/basic/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java
similarity index 100%
rename from getting-started/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java
rename to basic/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java
diff --git a/getting-started/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java b/basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java
similarity index 100%
rename from getting-started/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java
rename to basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java
diff --git a/getting-started/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java b/basic/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java
similarity index 100%
rename from getting-started/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java
rename to basic/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java
diff --git a/getting-started/xml/src/main/resources/META-INF/spring/integration/bigBooksSupplierTransformer.xsl b/basic/xml/src/main/resources/META-INF/spring/integration/bigBooksSupplierTransformer.xsl
similarity index 100%
rename from getting-started/xml/src/main/resources/META-INF/spring/integration/bigBooksSupplierTransformer.xsl
rename to basic/xml/src/main/resources/META-INF/spring/integration/bigBooksSupplierTransformer.xsl
diff --git a/getting-started/xml/src/main/resources/META-INF/spring/integration/order.xml b/basic/xml/src/main/resources/META-INF/spring/integration/order.xml
similarity index 100%
rename from getting-started/xml/src/main/resources/META-INF/spring/integration/order.xml
rename to basic/xml/src/main/resources/META-INF/spring/integration/order.xml
diff --git a/getting-started/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml b/basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml
similarity index 100%
rename from getting-started/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml
rename to basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml
diff --git a/getting-started/xml/src/test/java/org/springframework/integration/samples/xml/BookOrderProcessingTest.java b/basic/xml/src/test/java/org/springframework/integration/samples/xml/BookOrderProcessingTest.java
similarity index 100%
rename from getting-started/xml/src/test/java/org/springframework/integration/samples/xml/BookOrderProcessingTest.java
rename to basic/xml/src/test/java/org/springframework/integration/samples/xml/BookOrderProcessingTest.java
diff --git a/getting-started/xml/src/test/resources/log4j.xml b/basic/xml/src/test/resources/log4j.xml
similarity index 100%
rename from getting-started/xml/src/test/resources/log4j.xml
rename to basic/xml/src/test/resources/log4j.xml
diff --git a/getting-started/readme.txt b/getting-started/readme.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/cookbooks/async-gateway/.classpath b/intermediate/async-gateway/.classpath
similarity index 100%
rename from cookbooks/async-gateway/.classpath
rename to intermediate/async-gateway/.classpath
diff --git a/getting-started/ws-inbound-gateway/.gitignore b/intermediate/async-gateway/.gitignore
similarity index 100%
rename from getting-started/ws-inbound-gateway/.gitignore
rename to intermediate/async-gateway/.gitignore
diff --git a/cookbooks/async-gateway/.project b/intermediate/async-gateway/.project
similarity index 100%
rename from cookbooks/async-gateway/.project
rename to intermediate/async-gateway/.project
diff --git a/cookbooks/async-gateway/.settings/com.springsource.sts.config.flow.prefs b/intermediate/async-gateway/.settings/com.springsource.sts.config.flow.prefs
similarity index 100%
rename from cookbooks/async-gateway/.settings/com.springsource.sts.config.flow.prefs
rename to intermediate/async-gateway/.settings/com.springsource.sts.config.flow.prefs
diff --git a/cookbooks/async-gateway/.settings/org.maven.ide.eclipse.prefs b/intermediate/async-gateway/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from cookbooks/async-gateway/.settings/org.maven.ide.eclipse.prefs
rename to intermediate/async-gateway/.settings/org.maven.ide.eclipse.prefs
diff --git a/cookbooks/async-gateway/.settings/org.springframework.ide.eclipse.core.prefs b/intermediate/async-gateway/.settings/org.springframework.ide.eclipse.core.prefs
similarity index 100%
rename from cookbooks/async-gateway/.settings/org.springframework.ide.eclipse.core.prefs
rename to intermediate/async-gateway/.settings/org.springframework.ide.eclipse.core.prefs
diff --git a/getting-started/jmx/.springBeans b/intermediate/async-gateway/.springBeans
similarity index 100%
rename from getting-started/jmx/.springBeans
rename to intermediate/async-gateway/.springBeans
diff --git a/cookbooks/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml
similarity index 100%
rename from cookbooks/async-gateway/pom.xml
rename to intermediate/async-gateway/pom.xml
diff --git a/cookbooks/async-gateway/readme.txt b/intermediate/async-gateway/readme.txt
similarity index 100%
rename from cookbooks/async-gateway/readme.txt
rename to intermediate/async-gateway/readme.txt
diff --git a/cookbooks/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathService.java b/intermediate/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathService.java
similarity index 100%
rename from cookbooks/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathService.java
rename to intermediate/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathService.java
diff --git a/cookbooks/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathServiceGateway.java b/intermediate/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathServiceGateway.java
similarity index 100%
rename from cookbooks/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathServiceGateway.java
rename to intermediate/async-gateway/src/main/java/org/springframework/integration/samples/async/gateway/MathServiceGateway.java
diff --git a/cookbooks/async-gateway/src/main/resources/META-INF/spring/integration/math-service-config.xml b/intermediate/async-gateway/src/main/resources/META-INF/spring/integration/math-service-config.xml
similarity index 100%
rename from cookbooks/async-gateway/src/main/resources/META-INF/spring/integration/math-service-config.xml
rename to intermediate/async-gateway/src/main/resources/META-INF/spring/integration/math-service-config.xml
diff --git a/cookbooks/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/AsyncGatewayTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/AsyncGatewayTest.java
similarity index 100%
rename from cookbooks/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/AsyncGatewayTest.java
rename to intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/AsyncGatewayTest.java
diff --git a/cookbooks/async-gateway/src/test/resources/log4j.xml b/intermediate/async-gateway/src/test/resources/log4j.xml
similarity index 100%
rename from cookbooks/async-gateway/src/test/resources/log4j.xml
rename to intermediate/async-gateway/src/test/resources/log4j.xml
diff --git a/getting-started/quote/.classpath b/intermediate/errorhandling/.classpath
similarity index 100%
rename from getting-started/quote/.classpath
rename to intermediate/errorhandling/.classpath
diff --git a/getting-started/ws-outbound-gateway/.gitignore b/intermediate/errorhandling/.gitignore
similarity index 100%
rename from getting-started/ws-outbound-gateway/.gitignore
rename to intermediate/errorhandling/.gitignore
diff --git a/cookbooks/errorhandling/.project b/intermediate/errorhandling/.project
similarity index 100%
rename from cookbooks/errorhandling/.project
rename to intermediate/errorhandling/.project
diff --git a/cookbooks/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml
similarity index 100%
rename from cookbooks/errorhandling/pom.xml
rename to intermediate/errorhandling/pom.xml
diff --git a/cookbooks/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java b/intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java
similarity index 100%
rename from cookbooks/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java
rename to intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java
diff --git a/cookbooks/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/Invitation.java b/intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/Invitation.java
similarity index 100%
rename from cookbooks/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/Invitation.java
rename to intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/Invitation.java
diff --git a/cookbooks/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java b/intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java
similarity index 100%
rename from cookbooks/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java
rename to intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java
diff --git a/cookbooks/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java b/intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java
similarity index 100%
rename from cookbooks/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java
rename to intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java
diff --git a/cookbooks/errorhandling/src/main/resources/META-INF/spring/integration/errorHandlingDemo.xml b/intermediate/errorhandling/src/main/resources/META-INF/spring/integration/errorHandlingDemo.xml
similarity index 100%
rename from cookbooks/errorhandling/src/main/resources/META-INF/spring/integration/errorHandlingDemo.xml
rename to intermediate/errorhandling/src/main/resources/META-INF/spring/integration/errorHandlingDemo.xml
diff --git a/cookbooks/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java b/intermediate/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java
similarity index 100%
rename from cookbooks/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java
rename to intermediate/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java
diff --git a/getting-started/jmx/src/test/resources/log4j.xml b/intermediate/errorhandling/src/test/resources/log4j.xml
similarity index 100%
rename from getting-started/jmx/src/test/resources/log4j.xml
rename to intermediate/errorhandling/src/test/resources/log4j.xml
diff --git a/getting-started/mail/.classpath b/intermediate/file-processing/.classpath
similarity index 100%
rename from getting-started/mail/.classpath
rename to intermediate/file-processing/.classpath
diff --git a/cookbooks/file-processing/.gitignore b/intermediate/file-processing/.gitignore
similarity index 100%
rename from cookbooks/file-processing/.gitignore
rename to intermediate/file-processing/.gitignore
diff --git a/cookbooks/file-processing/.project b/intermediate/file-processing/.project
similarity index 100%
rename from cookbooks/file-processing/.project
rename to intermediate/file-processing/.project
diff --git a/cookbooks/file-processing/.settings/com.springsource.sts.config.flow.prefs b/intermediate/file-processing/.settings/com.springsource.sts.config.flow.prefs
similarity index 100%
rename from cookbooks/file-processing/.settings/com.springsource.sts.config.flow.prefs
rename to intermediate/file-processing/.settings/com.springsource.sts.config.flow.prefs
diff --git a/cookbooks/file-processing/.settings/org.eclipse.jdt.core.prefs b/intermediate/file-processing/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cookbooks/file-processing/.settings/org.eclipse.jdt.core.prefs
rename to intermediate/file-processing/.settings/org.eclipse.jdt.core.prefs
diff --git a/cookbooks/file-processing/.settings/org.maven.ide.eclipse.prefs b/intermediate/file-processing/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from cookbooks/file-processing/.settings/org.maven.ide.eclipse.prefs
rename to intermediate/file-processing/.settings/org.maven.ide.eclipse.prefs
diff --git a/getting-started/ws-inbound-gateway/.springBeans b/intermediate/file-processing/.springBeans
similarity index 100%
rename from getting-started/ws-inbound-gateway/.springBeans
rename to intermediate/file-processing/.springBeans
diff --git a/cookbooks/file-processing/pom.xml b/intermediate/file-processing/pom.xml
similarity index 100%
rename from cookbooks/file-processing/pom.xml
rename to intermediate/file-processing/pom.xml
diff --git a/cookbooks/file-processing/readme.txt b/intermediate/file-processing/readme.txt
similarity index 100%
rename from cookbooks/file-processing/readme.txt
rename to intermediate/file-processing/readme.txt
diff --git a/cookbooks/file-processing/src/main/java/org/springframework/integration/samples/fileprocessing/FileProcessor.java b/intermediate/file-processing/src/main/java/org/springframework/integration/samples/fileprocessing/FileProcessor.java
similarity index 100%
rename from cookbooks/file-processing/src/main/java/org/springframework/integration/samples/fileprocessing/FileProcessor.java
rename to intermediate/file-processing/src/main/java/org/springframework/integration/samples/fileprocessing/FileProcessor.java
diff --git a/cookbooks/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml
similarity index 100%
rename from cookbooks/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml
rename to intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml
diff --git a/cookbooks/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml
similarity index 100%
rename from cookbooks/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml
rename to intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml
diff --git a/cookbooks/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java
similarity index 100%
rename from cookbooks/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java
rename to intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java
diff --git a/cookbooks/file-processing/src/test/resources/log4j.xml b/intermediate/file-processing/src/test/resources/log4j.xml
similarity index 100%
rename from cookbooks/file-processing/src/test/resources/log4j.xml
rename to intermediate/file-processing/src/test/resources/log4j.xml
diff --git a/cookbooks/multipart-http/.classpath b/intermediate/multipart-http/.classpath
similarity index 100%
rename from cookbooks/multipart-http/.classpath
rename to intermediate/multipart-http/.classpath
diff --git a/getting-started/xml/.gitignore b/intermediate/multipart-http/.gitignore
similarity index 100%
rename from getting-started/xml/.gitignore
rename to intermediate/multipart-http/.gitignore
diff --git a/cookbooks/multipart-http/.project b/intermediate/multipart-http/.project
similarity index 100%
rename from cookbooks/multipart-http/.project
rename to intermediate/multipart-http/.project
diff --git a/cookbooks/multipart-http/.settings/.jsdtscope b/intermediate/multipart-http/.settings/.jsdtscope
similarity index 100%
rename from cookbooks/multipart-http/.settings/.jsdtscope
rename to intermediate/multipart-http/.settings/.jsdtscope
diff --git a/cookbooks/multipart-http/.settings/com.springsource.sts.config.flow.prefs b/intermediate/multipart-http/.settings/com.springsource.sts.config.flow.prefs
similarity index 100%
rename from cookbooks/multipart-http/.settings/com.springsource.sts.config.flow.prefs
rename to intermediate/multipart-http/.settings/com.springsource.sts.config.flow.prefs
diff --git a/cookbooks/multipart-http/.settings/org.eclipse.jdt.core.prefs b/intermediate/multipart-http/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cookbooks/multipart-http/.settings/org.eclipse.jdt.core.prefs
rename to intermediate/multipart-http/.settings/org.eclipse.jdt.core.prefs
diff --git a/cookbooks/multipart-http/.settings/org.eclipse.wst.common.component b/intermediate/multipart-http/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from cookbooks/multipart-http/.settings/org.eclipse.wst.common.component
rename to intermediate/multipart-http/.settings/org.eclipse.wst.common.component
diff --git a/cookbooks/multipart-http/.settings/org.eclipse.wst.common.project.facet.core.xml b/intermediate/multipart-http/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from cookbooks/multipart-http/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to intermediate/multipart-http/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/getting-started/ws-inbound-gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container b/intermediate/multipart-http/.settings/org.eclipse.wst.jsdt.ui.superType.container
similarity index 100%
rename from getting-started/ws-inbound-gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
rename to intermediate/multipart-http/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/getting-started/ws-inbound-gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name b/intermediate/multipart-http/.settings/org.eclipse.wst.jsdt.ui.superType.name
similarity index 100%
rename from getting-started/ws-inbound-gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
rename to intermediate/multipart-http/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/cookbooks/multipart-http/.settings/org.maven.ide.eclipse.prefs b/intermediate/multipart-http/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from cookbooks/multipart-http/.settings/org.maven.ide.eclipse.prefs
rename to intermediate/multipart-http/.settings/org.maven.ide.eclipse.prefs
diff --git a/cookbooks/multipart-http/.settings/org.springframework.ide.eclipse.core.prefs b/intermediate/multipart-http/.settings/org.springframework.ide.eclipse.core.prefs
similarity index 100%
rename from cookbooks/multipart-http/.settings/org.springframework.ide.eclipse.core.prefs
rename to intermediate/multipart-http/.settings/org.springframework.ide.eclipse.core.prefs
diff --git a/cookbooks/multipart-http/.springBeans b/intermediate/multipart-http/.springBeans
similarity index 100%
rename from cookbooks/multipart-http/.springBeans
rename to intermediate/multipart-http/.springBeans
diff --git a/cookbooks/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml
similarity index 100%
rename from cookbooks/multipart-http/pom.xml
rename to intermediate/multipart-http/pom.xml
diff --git a/cookbooks/multipart-http/readme.txt b/intermediate/multipart-http/readme.txt
similarity index 100%
rename from cookbooks/multipart-http/readme.txt
rename to intermediate/multipart-http/readme.txt
diff --git a/cookbooks/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiever.java b/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiever.java
similarity index 100%
rename from cookbooks/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiever.java
rename to intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiever.java
diff --git a/cookbooks/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartRequestGateway.java b/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartRequestGateway.java
similarity index 100%
rename from cookbooks/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartRequestGateway.java
rename to intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartRequestGateway.java
diff --git a/cookbooks/multipart-http/src/main/java/org/springframework/integration/samples/multipart/spring09_logo.png b/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/spring09_logo.png
similarity index 100%
rename from cookbooks/multipart-http/src/main/java/org/springframework/integration/samples/multipart/spring09_logo.png
rename to intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/spring09_logo.png
diff --git a/cookbooks/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml b/intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
similarity index 100%
rename from cookbooks/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
rename to intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
diff --git a/cookbooks/multipart-http/src/main/resources/log4j.xml b/intermediate/multipart-http/src/main/resources/log4j.xml
similarity index 100%
rename from cookbooks/multipart-http/src/main/resources/log4j.xml
rename to intermediate/multipart-http/src/main/resources/log4j.xml
diff --git a/cookbooks/multipart-http/src/main/webapp/META-INF/MANIFEST.MF b/intermediate/multipart-http/src/main/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from cookbooks/multipart-http/src/main/webapp/META-INF/MANIFEST.MF
rename to intermediate/multipart-http/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/cookbooks/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml b/intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml
similarity index 100%
rename from cookbooks/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml
rename to intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml
diff --git a/cookbooks/multipart-http/src/main/webapp/WEB-INF/web.xml b/intermediate/multipart-http/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from cookbooks/multipart-http/src/main/webapp/WEB-INF/web.xml
rename to intermediate/multipart-http/src/main/webapp/WEB-INF/web.xml
diff --git a/cookbooks/multipart-http/src/main/webapp/index.html b/intermediate/multipart-http/src/main/webapp/index.html
similarity index 100%
rename from cookbooks/multipart-http/src/main/webapp/index.html
rename to intermediate/multipart-http/src/main/webapp/index.html
diff --git a/cookbooks/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java
similarity index 100%
rename from cookbooks/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java
rename to intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java
diff --git a/cookbooks/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java
similarity index 100%
rename from cookbooks/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java
rename to intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java
diff --git a/cookbooks/readme.txt b/intermediate/readme.txt
similarity index 100%
rename from cookbooks/readme.txt
rename to intermediate/readme.txt