diff --git a/java/src/processing/mode/experimental/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
similarity index 100%
rename from java/src/processing/mode/experimental/ASTGenerator.java
rename to java/src/processing/mode/java/pdex/ASTGenerator.java
diff --git a/java/src/processing/mode/experimental/ASTNodeWrapper.java b/java/src/processing/mode/java/pdex/ASTNodeWrapper.java
similarity index 100%
rename from java/src/processing/mode/experimental/ASTNodeWrapper.java
rename to java/src/processing/mode/java/pdex/ASTNodeWrapper.java
diff --git a/java/src/processing/mode/experimental/ArrayFieldNode.java b/java/src/processing/mode/java/pdex/ArrayFieldNode.java
similarity index 100%
rename from java/src/processing/mode/experimental/ArrayFieldNode.java
rename to java/src/processing/mode/java/pdex/ArrayFieldNode.java
diff --git a/java/src/processing/mode/experimental/AutoSaveUtil.java b/java/src/processing/mode/java/pdex/AutoSaveUtil.java
similarity index 100%
rename from java/src/processing/mode/experimental/AutoSaveUtil.java
rename to java/src/processing/mode/java/pdex/AutoSaveUtil.java
diff --git a/java/src/processing/mode/experimental/ClassLoadListener.java b/java/src/processing/mode/java/pdex/ClassLoadListener.java
similarity index 100%
rename from java/src/processing/mode/experimental/ClassLoadListener.java
rename to java/src/processing/mode/java/pdex/ClassLoadListener.java
diff --git a/java/src/processing/mode/experimental/CompilationChecker.java b/java/src/processing/mode/java/pdex/CompilationChecker.java
similarity index 100%
rename from java/src/processing/mode/experimental/CompilationChecker.java
rename to java/src/processing/mode/java/pdex/CompilationChecker.java
diff --git a/java/src/processing/mode/experimental/Compiler.java b/java/src/processing/mode/java/pdex/Compiler.java
similarity index 100%
rename from java/src/processing/mode/experimental/Compiler.java
rename to java/src/processing/mode/java/pdex/Compiler.java
diff --git a/java/src/processing/mode/experimental/CompletionCandidate.java b/java/src/processing/mode/java/pdex/CompletionCandidate.java
similarity index 100%
rename from java/src/processing/mode/experimental/CompletionCandidate.java
rename to java/src/processing/mode/java/pdex/CompletionCandidate.java
diff --git a/java/src/processing/mode/experimental/CompletionPanel.java b/java/src/processing/mode/java/pdex/CompletionPanel.java
similarity index 100%
rename from java/src/processing/mode/experimental/CompletionPanel.java
rename to java/src/processing/mode/java/pdex/CompletionPanel.java
diff --git a/java/src/processing/mode/experimental/DebugBuild.java b/java/src/processing/mode/java/pdex/DebugBuild.java
similarity index 100%
rename from java/src/processing/mode/experimental/DebugBuild.java
rename to java/src/processing/mode/java/pdex/DebugBuild.java
diff --git a/java/src/processing/mode/experimental/DebugEditor.java b/java/src/processing/mode/java/pdex/DebugEditor.java
similarity index 100%
rename from java/src/processing/mode/experimental/DebugEditor.java
rename to java/src/processing/mode/java/pdex/DebugEditor.java
diff --git a/java/src/processing/mode/experimental/DebugRunner.java b/java/src/processing/mode/java/pdex/DebugRunner.java
similarity index 100%
rename from java/src/processing/mode/experimental/DebugRunner.java
rename to java/src/processing/mode/java/pdex/DebugRunner.java
diff --git a/java/src/processing/mode/experimental/DebugToolbar.java b/java/src/processing/mode/java/pdex/DebugToolbar.java
similarity index 100%
rename from java/src/processing/mode/experimental/DebugToolbar.java
rename to java/src/processing/mode/java/pdex/DebugToolbar.java
diff --git a/java/src/processing/mode/experimental/Debugger.java b/java/src/processing/mode/java/pdex/Debugger.java
similarity index 100%
rename from java/src/processing/mode/experimental/Debugger.java
rename to java/src/processing/mode/java/pdex/Debugger.java
diff --git a/java/src/processing/mode/experimental/ErrorBar.java b/java/src/processing/mode/java/pdex/ErrorBar.java
similarity index 100%
rename from java/src/processing/mode/experimental/ErrorBar.java
rename to java/src/processing/mode/java/pdex/ErrorBar.java
diff --git a/java/src/processing/mode/experimental/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
similarity index 100%
rename from java/src/processing/mode/experimental/ErrorCheckerService.java
rename to java/src/processing/mode/java/pdex/ErrorCheckerService.java
diff --git a/java/src/processing/mode/experimental/ErrorMarker.java b/java/src/processing/mode/java/pdex/ErrorMarker.java
similarity index 100%
rename from java/src/processing/mode/experimental/ErrorMarker.java
rename to java/src/processing/mode/java/pdex/ErrorMarker.java
diff --git a/java/src/processing/mode/experimental/ErrorMessageSimplifier.java b/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java
similarity index 100%
rename from java/src/processing/mode/experimental/ErrorMessageSimplifier.java
rename to java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java
diff --git a/java/src/processing/mode/experimental/ErrorWindow.java b/java/src/processing/mode/java/pdex/ErrorWindow.java
similarity index 100%
rename from java/src/processing/mode/experimental/ErrorWindow.java
rename to java/src/processing/mode/java/pdex/ErrorWindow.java
diff --git a/java/src/processing/mode/experimental/ExperimentalMode.java b/java/src/processing/mode/java/pdex/ExperimentalMode.java
similarity index 100%
rename from java/src/processing/mode/experimental/ExperimentalMode.java
rename to java/src/processing/mode/java/pdex/ExperimentalMode.java
diff --git a/java/src/processing/mode/experimental/FieldNode.java b/java/src/processing/mode/java/pdex/FieldNode.java
similarity index 100%
rename from java/src/processing/mode/experimental/FieldNode.java
rename to java/src/processing/mode/java/pdex/FieldNode.java
diff --git a/java/src/processing/mode/experimental/ImportStatement.java b/java/src/processing/mode/java/pdex/ImportStatement.java
similarity index 100%
rename from java/src/processing/mode/experimental/ImportStatement.java
rename to java/src/processing/mode/java/pdex/ImportStatement.java
diff --git a/java/src/processing/mode/experimental/JavadocHelper.java b/java/src/processing/mode/java/pdex/JavadocHelper.java
similarity index 100%
rename from java/src/processing/mode/experimental/JavadocHelper.java
rename to java/src/processing/mode/java/pdex/JavadocHelper.java
diff --git a/java/src/processing/mode/experimental/LineBreakpoint.java b/java/src/processing/mode/java/pdex/LineBreakpoint.java
similarity index 100%
rename from java/src/processing/mode/experimental/LineBreakpoint.java
rename to java/src/processing/mode/java/pdex/LineBreakpoint.java
diff --git a/java/src/processing/mode/experimental/LineHighlight.java b/java/src/processing/mode/java/pdex/LineHighlight.java
similarity index 100%
rename from java/src/processing/mode/experimental/LineHighlight.java
rename to java/src/processing/mode/java/pdex/LineHighlight.java
diff --git a/java/src/processing/mode/experimental/LineID.java b/java/src/processing/mode/java/pdex/LineID.java
similarity index 100%
rename from java/src/processing/mode/experimental/LineID.java
rename to java/src/processing/mode/java/pdex/LineID.java
diff --git a/java/src/processing/mode/experimental/LineListener.java b/java/src/processing/mode/java/pdex/LineListener.java
similarity index 100%
rename from java/src/processing/mode/experimental/LineListener.java
rename to java/src/processing/mode/java/pdex/LineListener.java
diff --git a/java/src/processing/mode/experimental/LocalVariableNode.java b/java/src/processing/mode/java/pdex/LocalVariableNode.java
similarity index 100%
rename from java/src/processing/mode/experimental/LocalVariableNode.java
rename to java/src/processing/mode/java/pdex/LocalVariableNode.java
diff --git a/java/src/processing/mode/experimental/OffsetMatcher.java b/java/src/processing/mode/java/pdex/OffsetMatcher.java
similarity index 100%
rename from java/src/processing/mode/experimental/OffsetMatcher.java
rename to java/src/processing/mode/java/pdex/OffsetMatcher.java
diff --git a/java/src/processing/mode/experimental/Problem.java b/java/src/processing/mode/java/pdex/Problem.java
similarity index 100%
rename from java/src/processing/mode/experimental/Problem.java
rename to java/src/processing/mode/java/pdex/Problem.java
diff --git a/java/src/processing/mode/experimental/SketchOutline.java b/java/src/processing/mode/java/pdex/SketchOutline.java
similarity index 100%
rename from java/src/processing/mode/experimental/SketchOutline.java
rename to java/src/processing/mode/java/pdex/SketchOutline.java
diff --git a/java/src/processing/mode/experimental/TabOutline.java b/java/src/processing/mode/java/pdex/TabOutline.java
similarity index 100%
rename from java/src/processing/mode/experimental/TabOutline.java
rename to java/src/processing/mode/java/pdex/TabOutline.java
diff --git a/java/src/processing/mode/experimental/TextArea.java b/java/src/processing/mode/java/pdex/TextArea.java
similarity index 100%
rename from java/src/processing/mode/experimental/TextArea.java
rename to java/src/processing/mode/java/pdex/TextArea.java
diff --git a/java/src/processing/mode/experimental/TextAreaPainter.java b/java/src/processing/mode/java/pdex/TextAreaPainter.java
similarity index 100%
rename from java/src/processing/mode/experimental/TextAreaPainter.java
rename to java/src/processing/mode/java/pdex/TextAreaPainter.java
diff --git a/java/src/processing/mode/experimental/Utils.java b/java/src/processing/mode/java/pdex/Utils.java
similarity index 100%
rename from java/src/processing/mode/experimental/Utils.java
rename to java/src/processing/mode/java/pdex/Utils.java
diff --git a/java/src/processing/mode/experimental/VMEventListener.java b/java/src/processing/mode/java/pdex/VMEventListener.java
similarity index 100%
rename from java/src/processing/mode/experimental/VMEventListener.java
rename to java/src/processing/mode/java/pdex/VMEventListener.java
diff --git a/java/src/processing/mode/experimental/VMEventReader.java b/java/src/processing/mode/java/pdex/VMEventReader.java
similarity index 100%
rename from java/src/processing/mode/experimental/VMEventReader.java
rename to java/src/processing/mode/java/pdex/VMEventReader.java
diff --git a/java/src/processing/mode/experimental/VariableInspector.form b/java/src/processing/mode/java/pdex/VariableInspector.form
similarity index 100%
rename from java/src/processing/mode/experimental/VariableInspector.form
rename to java/src/processing/mode/java/pdex/VariableInspector.form
diff --git a/java/src/processing/mode/experimental/VariableInspector.java b/java/src/processing/mode/java/pdex/VariableInspector.java
similarity index 100%
rename from java/src/processing/mode/experimental/VariableInspector.java
rename to java/src/processing/mode/java/pdex/VariableInspector.java
diff --git a/java/src/processing/mode/experimental/VariableNode.java b/java/src/processing/mode/java/pdex/VariableNode.java
similarity index 100%
rename from java/src/processing/mode/experimental/VariableNode.java
rename to java/src/processing/mode/java/pdex/VariableNode.java
diff --git a/java/src/processing/mode/experimental/XQConsoleToggle.java b/java/src/processing/mode/java/pdex/XQConsoleToggle.java
similarity index 100%
rename from java/src/processing/mode/experimental/XQConsoleToggle.java
rename to java/src/processing/mode/java/pdex/XQConsoleToggle.java
diff --git a/java/src/processing/mode/experimental/XQErrorTable.java b/java/src/processing/mode/java/pdex/XQErrorTable.java
similarity index 100%
rename from java/src/processing/mode/experimental/XQErrorTable.java
rename to java/src/processing/mode/java/pdex/XQErrorTable.java
diff --git a/java/src/processing/mode/experimental/XQPreprocessor.java b/java/src/processing/mode/java/pdex/XQPreprocessor.java
similarity index 100%
rename from java/src/processing/mode/experimental/XQPreprocessor.java
rename to java/src/processing/mode/java/pdex/XQPreprocessor.java