diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index 414b686fa..20e6265ed 100644
--- a/app/src/processing/app/Sketch.java
+++ b/app/src/processing/app/Sketch.java
@@ -642,12 +642,6 @@ public class Sketch {
       Base.copyDir(data.getDataFolder(), newDataFolder);
     }
 
-    // re-copy the code folder
-    if (data.getCodeFolder().exists()) {
-      File newCodeFolder = new File(newFolder, "code");
-      Base.copyDir(data.getCodeFolder(), newCodeFolder);
-    }
-
     // save the main tab with its new name
     File newFile = new File(newFolder, newName + ".ino");
     data.getCode(0).saveAs(newFile);
@@ -729,29 +723,17 @@ public class Sketch {
     String codeExtension = null;
     boolean replacement = false;
 
-    // if the file appears to be code related, drop it
-    // into the code folder, instead of the data folder
-    if (filename.toLowerCase().endsWith(".o") ||
-        filename.toLowerCase().endsWith(".a") ||
-        filename.toLowerCase().endsWith(".so")) {
-
-      //if (!codeFolder.exists()) codeFolder.mkdirs();
-      prepareCodeFolder();
-      destFile = new File(data.getCodeFolder(), filename);
-
-    } else {
-      for (String extension : SketchData.EXTENSIONS) {
-        String lower = filename.toLowerCase();
-        if (lower.endsWith("." + extension)) {
-          destFile = new File(data.getFolder(), filename);
-          codeExtension = extension;
-        }
-      }
-      if (codeExtension == null) {
-        prepareDataFolder();
-        destFile = new File(data.getDataFolder(), filename);
+    for (String extension : SketchData.EXTENSIONS) {
+      String lower = filename.toLowerCase();
+      if (lower.endsWith("." + extension)) {
+        destFile = new File(data.getFolder(), filename);
+        codeExtension = extension;
       }
     }
+    if (codeExtension == null) {
+      prepareDataFolder();
+      destFile = new File(data.getDataFolder(), filename);
+    }
 
     // check whether this file already exists
     if (destFile.exists()) {
@@ -1183,18 +1165,6 @@ public class Sketch {
   }
 
 
-  /**
-   * Create the code folder if it does not exist already. As a convenience,
-   * it also returns the code folder, since it's likely about to be used.
-   */
-  private File prepareCodeFolder() {
-    if (!data.getCodeFolder().exists()) {
-      data.getCodeFolder().mkdirs();
-    }
-    return data.getCodeFolder();
-  }
-
-
   public SketchCode[] getCodes() {
     return data.getCodes();
   }
diff --git a/arduino-core/src/processing/app/SketchData.java b/arduino-core/src/processing/app/SketchData.java
index 61a41d72a..3765bb157 100644
--- a/arduino-core/src/processing/app/SketchData.java
+++ b/arduino-core/src/processing/app/SketchData.java
@@ -31,11 +31,6 @@ public class SketchData {
    */
   private File dataFolder;
 
-  /**
-   * code folder location for this sketch (may not exist yet)
-   */
-  private File codeFolder;
-
   /**
    * Name of sketch, which is the name of main file (without .pde or .java
    * extension)
@@ -72,7 +67,6 @@ public class SketchData {
     name = mainFilename.substring(0, mainFilename.length() - suffixLength);
 
     folder = new File(file.getParent());
-    codeFolder = new File(folder, "code");
     dataFolder = new File(folder, "data");
     codes = listSketchFiles(true);
   }
@@ -217,8 +211,4 @@ public class SketchData {
   public File getDataFolder() {
     return dataFolder;
   }
-
-  public File getCodeFolder() {
-    return codeFolder;
-  }
 }