@@ -18,7 +18,7 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.debug;
+package processing.mode.java;
 
 import java.awt.Graphics;
 import java.awt.Image;
@@ -31,9 +31,10 @@
 import processing.app.Editor;
 import processing.app.Language;
 import processing.app.Toolkit;
-import processing.mode.java.JavaToolbar;
+
 import processing.mode.java.pdex.XQConsoleToggle;
 
+
 /**
  * Custom toolbar for the editor window. Preserves original button numbers
  * ({@link JavaToolbar#RUN}, {@link JavaToolbar#STOP}, {@link JavaToolbar#NEW},
@@ -190,7 +191,7 @@ public static String getTitle(int id, boolean shift) {
   @Override
   public void handlePressed(MouseEvent e, int idx) {
     boolean shift = e.isShiftDown();
-    DebugEditor deditor = (DebugEditor) editor;
+    JavaEditor deditor = (JavaEditor) editor;
     int id = buttonId(idx); // convert index/position to button id
 
     switch (id) {
 
@@ -18,7 +18,7 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.debug;
+package processing.mode.java;
 
 import com.sun.jdi.*;
 import com.sun.jdi.event.*;
@@ -41,21 +41,28 @@
 
 import processing.app.Sketch;
 import processing.app.SketchCode;
-import processing.mode.java.JavaBuild;
+import processing.mode.java.debug.ArrayFieldNode;
+import processing.mode.java.debug.ClassLoadListener;
+import processing.mode.java.debug.FieldNode;
+import processing.mode.java.debug.LineBreakpoint;
+import processing.mode.java.debug.LineID;
+import processing.mode.java.debug.LocalVariableNode;
+import processing.mode.java.debug.VariableInspector;
+import processing.mode.java.debug.VariableNode;
 import processing.mode.java.pdex.VMEventListener;
 import processing.mode.java.pdex.VMEventReader;
 import processing.mode.java.runner.Runner;
 
 
 /**
- * Main controller class for debugging mode. Mainly works with DebugEditor as
+ * Main controller class for debugging mode. Mainly works with JavaEditor as
  * the corresponding "view". Uses DebugRunner to launch a VM.
  *
  * @author Martin Leopold <m@martinleopold.com>
  */
 public class Debugger implements VMEventListener {
 
-    protected DebugEditor editor; // editor window, acting as main view
+    protected JavaEditor editor; // editor window, acting as main view
     protected Runner runtime; // the runtime, contains debuggee VM
     protected boolean started = false; // debuggee vm has started, VMStartEvent received, main class loaded
     protected boolean paused = false; // currently paused at breakpoint or step
@@ -75,7 +82,7 @@ public class Debugger implements VMEventListener {
      *
      * @param editor The Editor that will act as primary view
      */
-    public Debugger(DebugEditor editor) {
+    public Debugger(JavaEditor editor) {
         this.editor = editor;
     }
 
@@ -97,7 +104,7 @@ public VirtualMachine vm() {
      *
      * @return the editor object
      */
-    public DebugEditor editor() {
+    public JavaEditor editor() {
         return editor;
     }
 
@@ -1057,7 +1064,7 @@ protected List<VariableNode> getFields(Value value, int depth, int maxDepth, boo
      * @param maxDepth max recursion depth. 0 will give only direct children
      * @return list of child fields of the given value
      */
-    protected List<VariableNode> getFields(Value value, int maxDepth, boolean includeInherited) {
+    public List<VariableNode> getFields(Value value, int maxDepth, boolean includeInherited) {
         return getFields(value, 0, maxDepth, includeInherited);
     }