diff --git a/espblog/README.md b/DEPRECATED/espblog/README.md
similarity index 100%
rename from espblog/README.md
rename to DEPRECATED/espblog/README.md
diff --git a/espblog/pom.xml b/DEPRECATED/espblog/pom.xml
similarity index 100%
rename from espblog/pom.xml
rename to DEPRECATED/espblog/pom.xml
diff --git a/espblog/src/main/java/org/apache/sling/samples/espblog/internal/ThumbnailGenerator.java b/DEPRECATED/espblog/src/main/java/org/apache/sling/samples/espblog/internal/ThumbnailGenerator.java
similarity index 100%
rename from espblog/src/main/java/org/apache/sling/samples/espblog/internal/ThumbnailGenerator.java
rename to DEPRECATED/espblog/src/main/java/org/apache/sling/samples/espblog/internal/ThumbnailGenerator.java
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/admin.esp b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/admin.esp
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/admin.esp
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/admin.esp
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/constants.esp b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/constants.esp
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/constants.esp
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/constants.esp
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/edit.esp b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/edit.esp
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/edit.esp
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/edit.esp
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/espblog.css b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/espblog.css
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/espblog.css
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/espblog.css
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/header.esp b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/header.esp
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/header.esp
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/header.esp
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/html.esp b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/html.esp
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/html.esp
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/html.esp
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/list.esp b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/list.esp
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/list.esp
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/list.esp
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/menu.esp b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/menu.esp
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/menu.esp
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/menu.esp
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/sling-logo.png b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/sling-logo.png
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/sling-logo.png
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/sling-logo.png
Binary files differ
diff --git a/espblog/src/main/resources/initial-content/apps/espblog/xml.esp b/DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/xml.esp
similarity index 100%
rename from espblog/src/main/resources/initial-content/apps/espblog/xml.esp
rename to DEPRECATED/espblog/src/main/resources/initial-content/apps/espblog/xml.esp
diff --git a/javashell/README.md b/DEPRECATED/javashell/README.md
similarity index 100%
rename from javashell/README.md
rename to DEPRECATED/javashell/README.md
diff --git a/javashell/pom.xml b/DEPRECATED/javashell/pom.xml
similarity index 100%
rename from javashell/pom.xml
rename to DEPRECATED/javashell/pom.xml
diff --git a/javashell/src/main/resources/initial-content/apps/javashell/code-templates.jcr.xml b/DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/code-templates.jcr.xml
similarity index 100%
rename from javashell/src/main/resources/initial-content/apps/javashell/code-templates.jcr.xml
rename to DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/code-templates.jcr.xml
diff --git a/javashell/src/main/resources/initial-content/apps/javashell/edit.esp b/DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/edit.esp
similarity index 100%
rename from javashell/src/main/resources/initial-content/apps/javashell/edit.esp
rename to DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/edit.esp
diff --git a/javashell/src/main/resources/initial-content/apps/javashell/javashell.css b/DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/javashell.css
similarity index 100%
rename from javashell/src/main/resources/initial-content/apps/javashell/javashell.css
rename to DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/javashell.css
diff --git a/javashell/src/main/resources/initial-content/apps/javashell/javashell.esp b/DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/javashell.esp
similarity index 100%
rename from javashell/src/main/resources/initial-content/apps/javashell/javashell.esp
rename to DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/javashell.esp
diff --git a/javashell/src/main/resources/initial-content/apps/javashell/siblings.esp b/DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/siblings.esp
similarity index 100%
rename from javashell/src/main/resources/initial-content/apps/javashell/siblings.esp
rename to DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/siblings.esp
diff --git a/javashell/src/main/resources/initial-content/apps/javashell/sling-logo.png b/DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/sling-logo.png
similarity index 100%
rename from javashell/src/main/resources/initial-content/apps/javashell/sling-logo.png
rename to DEPRECATED/javashell/src/main/resources/initial-content/apps/javashell/sling-logo.png
Binary files differ
diff --git a/javashell/src/main/resources/initial-content/content/javashell.jcr.xml b/DEPRECATED/javashell/src/main/resources/initial-content/content/javashell.jcr.xml
similarity index 100%
rename from javashell/src/main/resources/initial-content/content/javashell.jcr.xml
rename to DEPRECATED/javashell/src/main/resources/initial-content/content/javashell.jcr.xml
diff --git a/path-based-rtp/LICENSE b/DEPRECATED/path-based-rtp/LICENSE
similarity index 100%
rename from path-based-rtp/LICENSE
rename to DEPRECATED/path-based-rtp/LICENSE
diff --git a/path-based-rtp/NOTICE b/DEPRECATED/path-based-rtp/NOTICE
similarity index 100%
rename from path-based-rtp/NOTICE
rename to DEPRECATED/path-based-rtp/NOTICE
diff --git a/path-based-rtp/README.md b/DEPRECATED/path-based-rtp/README.md
similarity index 100%
rename from path-based-rtp/README.md
rename to DEPRECATED/path-based-rtp/README.md
diff --git a/path-based-rtp/pom.xml b/DEPRECATED/path-based-rtp/pom.xml
similarity index 100%
rename from path-based-rtp/pom.xml
rename to DEPRECATED/path-based-rtp/pom.xml
diff --git a/path-based-rtp/src/main/java/org/apache/sling/samples/pathbasedrtp/Mapping.java b/DEPRECATED/path-based-rtp/src/main/java/org/apache/sling/samples/pathbasedrtp/Mapping.java
similarity index 100%
rename from path-based-rtp/src/main/java/org/apache/sling/samples/pathbasedrtp/Mapping.java
rename to DEPRECATED/path-based-rtp/src/main/java/org/apache/sling/samples/pathbasedrtp/Mapping.java
diff --git a/path-based-rtp/src/main/java/org/apache/sling/samples/pathbasedrtp/PathBasedResourceDecorator.java b/DEPRECATED/path-based-rtp/src/main/java/org/apache/sling/samples/pathbasedrtp/PathBasedResourceDecorator.java
similarity index 100%
rename from path-based-rtp/src/main/java/org/apache/sling/samples/pathbasedrtp/PathBasedResourceDecorator.java
rename to DEPRECATED/path-based-rtp/src/main/java/org/apache/sling/samples/pathbasedrtp/PathBasedResourceDecorator.java
diff --git a/path-based-rtp/src/main/resources/META-INF/LICENSE b/DEPRECATED/path-based-rtp/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from path-based-rtp/src/main/resources/META-INF/LICENSE
rename to DEPRECATED/path-based-rtp/src/main/resources/META-INF/LICENSE
diff --git a/path-based-rtp/src/main/resources/META-INF/NOTICE b/DEPRECATED/path-based-rtp/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from path-based-rtp/src/main/resources/META-INF/NOTICE
rename to DEPRECATED/path-based-rtp/src/main/resources/META-INF/NOTICE
diff --git a/path-based-rtp/src/main/resources/OSGI-INF/l10n/metatype.properties b/DEPRECATED/path-based-rtp/src/main/resources/OSGI-INF/l10n/metatype.properties
similarity index 100%
rename from path-based-rtp/src/main/resources/OSGI-INF/l10n/metatype.properties
rename to DEPRECATED/path-based-rtp/src/main/resources/OSGI-INF/l10n/metatype.properties
diff --git a/path-based-rtp/src/test/java/org/apache/sling/samples/pathbasedrtp/MappingTest.java b/DEPRECATED/path-based-rtp/src/test/java/org/apache/sling/samples/pathbasedrtp/MappingTest.java
similarity index 100%
rename from path-based-rtp/src/test/java/org/apache/sling/samples/pathbasedrtp/MappingTest.java
rename to DEPRECATED/path-based-rtp/src/test/java/org/apache/sling/samples/pathbasedrtp/MappingTest.java
diff --git a/pom.xml b/pom.xml
index be5a4b8..9e6d1b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,11 +59,8 @@
     <!-- List modules to be included in the build here ! -->
     <modules>
           <module>custom-login-form</module>
-          <module>espblog</module>
           <module>htlblog</module>
-          <module>javashell</module>
           <module>mail-archive</module>
-          <module>path-based-rtp</module>
           <module>post-servlet-extensions</module>
           <module>slingbucks</module>
           <module>slingshot</module>