diff --git a/build/javadoc/everything/package-list b/build/javadoc/everything/package-list
index 4651edfca..b41cb7ac9 100644
--- a/build/javadoc/everything/package-list
+++ b/build/javadoc/everything/package-list
@@ -1,15 +1,18 @@
 antlr
 processing.app
-processing.app.antlr
-processing.app.debug
+processing.app.exec
 processing.app.linux
 processing.app.macosx
-processing.app.preproc
 processing.app.syntax
 processing.app.tools
 processing.app.windows
 processing.core
 processing.dxf
+processing.mode.android
+processing.mode.java
+processing.mode.java.preproc
+processing.mode.java.runner
+processing.mode.javascript
 processing.net
 processing.opengl
 processing.pdf
diff --git a/build/javadoc/make.sh b/build/javadoc/make.sh
index 3105d3f98..16d57db50 100755
--- a/build/javadoc/make.sh
+++ b/build/javadoc/make.sh
@@ -13,21 +13,24 @@ javadoc -public -notimestamp -d everything \
     ../../core/src/processing/core/*.java \
     ../../core/src/processing/xml/*.java \
     ../../app/src/antlr/*.java \
-    ../../app/generated/processing/app/antlr/*.java \
     ../../app/src/processing/app/*.java \
-    ../../app/src/processing/app/debug/*.java \
+    ../../app/src/processing/app/exec/*.java \
     ../../app/src/processing/app/linux/*.java \
     ../../app/src/processing/app/macosx/*.java \
-    ../../app/src/processing/app/preproc/*.java \
     ../../app/src/processing/app/syntax/*.java \
     ../../app/src/processing/app/tools/*.java \
     ../../app/src/processing/app/windows/*.java \
-    ../../dxf/src/processing/dxf/*.java \
-    ../../net/src/processing/net/*.java \
-    ../../opengl/src/processing/opengl/*.java \
-    ../../pdf/src/processing/pdf/*.java \
-    ../../serial/src/processing/serial/*.java \
-    ../../video/src/processing/video/*.java 
+    ../../app/src/processing/mode/android/*.java \
+    ../../app/src/processing/mode/java/*.java \
+    ../../app/src/processing/mode/java/preproc/*.java \
+    ../../app/src/processing/mode/java/runner/*.java \
+    ../../app/src/processing/mode/javascript/*.java \
+    ../../java/libraries/dxf/src/processing/dxf/*.java \
+    ../../java/libraries/net/src/processing/net/*.java \
+    ../../java/libraries/opengl/src/processing/opengl/*.java \
+    ../../java/libraries/pdf/src/processing/pdf/*.java \
+    ../../java/libraries/serial/src/processing/serial/*.java \
+    ../../java/libraries/video/src/processing/video/*.java 
 
 cp stylesheet.css core/
 cp stylesheet.css everything/