diff --git a/app/.classpath b/app/.classpath
index 32030b38e..a37f05e66 100644
--- a/app/.classpath
+++ b/app/.classpath
@@ -5,7 +5,6 @@
 	<classpathentry kind="lib" path="lib/antlr.jar"/>
 	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
 	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
index 9a3de6043..027601c57 100644
--- a/app/src/processing/app/AbstractMonitor.java
+++ b/app/src/processing/app/AbstractMonitor.java
@@ -1,7 +1,7 @@
 package processing.app;
 
 import processing.app.debug.MessageConsumer;
-import processing.core.PApplet;
+import processing.app.legacy.PApplet;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 282162552..574b8a4fa 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -46,11 +46,12 @@ import processing.app.helpers.PreferencesMap;
 import processing.app.helpers.filefilters.OnlyDirs;
 import processing.app.helpers.filefilters.OnlyFilesWithExtension;
 import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
+import processing.app.legacy.PApplet;
+import processing.app.legacy.PConstants;
 import processing.app.packages.Library;
 import processing.app.packages.LibraryList;
 import processing.app.tools.MenuScroller;
 import processing.app.tools.ZipDeflater;
-import processing.core.*;
 import static processing.app.I18n._;
 
 
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 35cfc4553..0a9280063 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -23,13 +23,15 @@
 package processing.app;
 
 import cc.arduino.packages.UploaderAndMonitorFactory;
+
 import com.jcraft.jsch.JSchException;
+
 import processing.app.debug.*;
 import processing.app.forms.PasswordAuthorizationDialog;
 import processing.app.helpers.PreferencesMapException;
+import processing.app.legacy.PApplet;
 import processing.app.syntax.*;
 import processing.app.tools.*;
-import processing.core.*;
 import static processing.app.I18n._;
 
 import java.awt.*;
diff --git a/app/src/processing/app/Platform.java b/app/src/processing/app/Platform.java
index 59ce7f881..bf0f8ddd5 100644
--- a/app/src/processing/app/Platform.java
+++ b/app/src/processing/app/Platform.java
@@ -35,7 +35,7 @@ import com.sun.jna.Native;
 import processing.app.debug.TargetBoard;
 import processing.app.debug.TargetPackage;
 import processing.app.debug.TargetPlatform;
-import processing.core.PConstants;
+import processing.app.legacy.PConstants;
 
 
 /**
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
index 46008c962..5b07f6933 100644
--- a/app/src/processing/app/Preferences.java
+++ b/app/src/processing/app/Preferences.java
@@ -52,7 +52,7 @@ import javax.swing.KeyStroke;
 import processing.app.helpers.FileUtils;
 import processing.app.helpers.PreferencesHelper;
 import processing.app.helpers.PreferencesMap;
-import processing.core.PApplet;
+import processing.app.legacy.PApplet;
 
 
 /**
diff --git a/app/src/processing/app/PreferencesData.java b/app/src/processing/app/PreferencesData.java
index 2b4af0118..52e3ad87d 100644
--- a/app/src/processing/app/PreferencesData.java
+++ b/app/src/processing/app/PreferencesData.java
@@ -12,8 +12,8 @@ import java.util.Arrays;
 import java.util.MissingResourceException;
 
 import processing.app.helpers.PreferencesMap;
-import processing.core.PApplet;
-import processing.core.PConstants;
+import processing.app.legacy.PApplet;
+import processing.app.legacy.PConstants;
 
 
 public class PreferencesData {
diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java
index 0be575ed2..67e90d5bb 100644
--- a/app/src/processing/app/SerialMonitor.java
+++ b/app/src/processing/app/SerialMonitor.java
@@ -19,7 +19,7 @@
 package processing.app;
 
 import cc.arduino.packages.BoardPort;
-import processing.core.PApplet;
+import processing.app.legacy.PApplet;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;
diff --git a/app/src/processing/app/UpdateCheck.java b/app/src/processing/app/UpdateCheck.java
index 21db25b5c..0e94366e9 100644
--- a/app/src/processing/app/UpdateCheck.java
+++ b/app/src/processing/app/UpdateCheck.java
@@ -31,7 +31,7 @@ import java.util.Random;
 
 import javax.swing.JOptionPane;
 
-import processing.core.PApplet;
+import processing.app.legacy.PApplet;
 import static processing.app.I18n._;
 
 
diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java
index 232b5ac7c..1f7540e9c 100644
--- a/app/src/processing/app/debug/Compiler.java
+++ b/app/src/processing/app/debug/Compiler.java
@@ -49,7 +49,7 @@ import processing.app.helpers.filefilters.OnlyDirs;
 import processing.app.packages.Library;
 import processing.app.packages.LibraryList;
 import processing.app.preproc.PdePreprocessor;
-import processing.core.PApplet;
+import processing.app.legacy.PApplet;
 
 public class Compiler implements MessageConsumer {
 
diff --git a/app/src/processing/app/helpers/PreferencesMap.java b/app/src/processing/app/helpers/PreferencesMap.java
index d374fd850..a48617a62 100644
--- a/app/src/processing/app/helpers/PreferencesMap.java
+++ b/app/src/processing/app/helpers/PreferencesMap.java
@@ -27,14 +27,12 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
 import processing.app.Base;
-import processing.core.PApplet;
+import processing.app.legacy.PApplet;
 
 @SuppressWarnings("serial")
 public class PreferencesMap extends LinkedHashMap<String, String> {
diff --git a/app/src/processing/app/linux/Platform.java b/app/src/processing/app/linux/Platform.java
index 7f4afefd5..3c4fa59dd 100644
--- a/app/src/processing/app/linux/Platform.java
+++ b/app/src/processing/app/linux/Platform.java
@@ -27,7 +27,7 @@ import org.apache.commons.exec.Executor;
 import processing.app.Preferences;
 import processing.app.debug.TargetPackage;
 import processing.app.tools.ExternalProcessExecutor;
-import processing.core.PConstants;
+import processing.app.legacy.PConstants;
 
 import java.io.*;
 import java.util.Map;
diff --git a/app/src/processing/app/macosx/Platform.java b/app/src/processing/app/macosx/Platform.java
index 7bbe74984..1d1a2305a 100644
--- a/app/src/processing/app/macosx/Platform.java
+++ b/app/src/processing/app/macosx/Platform.java
@@ -28,8 +28,8 @@ import org.apache.commons.exec.Executor;
 import processing.app.Base;
 import processing.app.debug.TargetPackage;
 import processing.app.tools.ExternalProcessExecutor;
-import processing.core.PApplet;
-import processing.core.PConstants;
+import processing.app.legacy.PApplet;
+import processing.app.legacy.PConstants;
 
 import javax.swing.*;
 import java.awt.*;
@@ -129,7 +129,7 @@ public class Platform extends processing.app.Platform {
       } else {
       // Assume this is a file instead, and just open it.
       // Extension of http://dev.processing.org/bugs/show_bug.cgi?id=1010
-      processing.core.PApplet.open(url);
+      PApplet.open(url);
       }
     } else {
       try {
@@ -162,7 +162,7 @@ public class Platform extends processing.app.Platform {
 
   public void openFolder(File file) throws Exception {
     //openURL(file.getAbsolutePath());  // handles char replacement, etc
-    processing.core.PApplet.open(file.getAbsolutePath());
+    PApplet.open(file.getAbsolutePath());
   }
 
 
diff --git a/app/src/processing/app/preproc/PdePreprocessor.java b/app/src/processing/app/preproc/PdePreprocessor.java
index e468cfd28..576f7468b 100644
--- a/app/src/processing/app/preproc/PdePreprocessor.java
+++ b/app/src/processing/app/preproc/PdePreprocessor.java
@@ -31,11 +31,10 @@ package processing.app.preproc;
 
 import static processing.app.I18n._;
 import processing.app.*;
-import processing.core.*;
+import processing.app.legacy.PApplet;
 
 import java.io.*;
 import java.util.*;
-
 import java.util.regex.*;
 
 
diff --git a/app/src/processing/app/syntax/PdeKeywords.java b/app/src/processing/app/syntax/PdeKeywords.java
index d8e48f8e8..ccf52531c 100644
--- a/app/src/processing/app/syntax/PdeKeywords.java
+++ b/app/src/processing/app/syntax/PdeKeywords.java
@@ -25,6 +25,7 @@
 package processing.app.syntax;
 
 import processing.app.*;
+import processing.app.legacy.PApplet;
 import processing.app.packages.Library;
 
 import java.io.*;
@@ -84,7 +85,7 @@ public class PdeKeywords extends CTokenMarker {
       // in case there's any garbage on the line
       //if (line.trim().length() == 0) continue;
 
-      String pieces[] = processing.core.PApplet.split(line, '\t');
+      String pieces[] = PApplet.split(line, '\t');
       if (pieces.length >= 2) {
         //int tab = line.indexOf('\t');
         // any line with no tab is ignored
diff --git a/app/src/processing/app/tools/AutoFormat.java b/app/src/processing/app/tools/AutoFormat.java
index 8cad91385..c2c109c06 100644
--- a/app/src/processing/app/tools/AutoFormat.java
+++ b/app/src/processing/app/tools/AutoFormat.java
@@ -25,7 +25,7 @@
 package processing.app.tools;
 
 import processing.app.*;
-import processing.core.PApplet;
+import processing.app.legacy.PApplet;
 import static processing.app.I18n._;
 
 import java.io.*;
diff --git a/app/src/processing/app/tools/DiscourseFormat.java b/app/src/processing/app/tools/DiscourseFormat.java
index ab5ef22fc..a4a381c5a 100644
--- a/app/src/processing/app/tools/DiscourseFormat.java
+++ b/app/src/processing/app/tools/DiscourseFormat.java
@@ -29,7 +29,7 @@ import javax.swing.text.Segment;
 
 import processing.app.*;
 import processing.app.syntax.*;
-import processing.core.PApplet;
+import processing.app.legacy.PApplet;
 
 /**
  * Format for Discourse Tool
diff --git a/app/src/processing/app/windows/Platform.java b/app/src/processing/app/windows/Platform.java
index e340da417..6d4653d94 100644
--- a/app/src/processing/app/windows/Platform.java
+++ b/app/src/processing/app/windows/Platform.java
@@ -24,15 +24,17 @@ package processing.app.windows;
 
 import com.sun.jna.Library;
 import com.sun.jna.Native;
+
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.Executor;
+
 import processing.app.Base;
 import processing.app.Preferences;
 import processing.app.debug.TargetPackage;
+import processing.app.legacy.PApplet;
+import processing.app.legacy.PConstants;
 import processing.app.tools.ExternalProcessExecutor;
 import processing.app.windows.Registry.REGISTRY_ROOT_KEY;
-import processing.core.PApplet;
-import processing.core.PConstants;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;