diff --git a/packages/non-core/jquery-history/.gitignore b/packages/deprecated/jquery-history/.gitignore
similarity index 100%
rename from packages/non-core/jquery-history/.gitignore
rename to packages/deprecated/jquery-history/.gitignore
diff --git a/packages/non-core/jquery-history/history.adapter.jquery.js b/packages/deprecated/jquery-history/history.adapter.jquery.js
similarity index 100%
rename from packages/non-core/jquery-history/history.adapter.jquery.js
rename to packages/deprecated/jquery-history/history.adapter.jquery.js
diff --git a/packages/non-core/jquery-history/history.html4.js b/packages/deprecated/jquery-history/history.html4.js
similarity index 100%
rename from packages/non-core/jquery-history/history.html4.js
rename to packages/deprecated/jquery-history/history.html4.js
diff --git a/packages/non-core/jquery-history/history.js b/packages/deprecated/jquery-history/history.js
similarity index 100%
rename from packages/non-core/jquery-history/history.js
rename to packages/deprecated/jquery-history/history.js
diff --git a/packages/non-core/jquery-history/package.js b/packages/deprecated/jquery-history/package.js
similarity index 100%
rename from packages/non-core/jquery-history/package.js
rename to packages/deprecated/jquery-history/package.js
diff --git a/packages/non-core/jquery-layout/.gitignore b/packages/deprecated/jquery-layout/.gitignore
similarity index 100%
rename from packages/non-core/jquery-layout/.gitignore
rename to packages/deprecated/jquery-layout/.gitignore
diff --git a/packages/non-core/jquery-layout/jquery.layout.js b/packages/deprecated/jquery-layout/jquery.layout.js
similarity index 100%
rename from packages/non-core/jquery-layout/jquery.layout.js
rename to packages/deprecated/jquery-layout/jquery.layout.js
diff --git a/packages/non-core/jquery-layout/package.js b/packages/deprecated/jquery-layout/package.js
similarity index 100%
rename from packages/non-core/jquery-layout/package.js
rename to packages/deprecated/jquery-layout/package.js
diff --git a/packages/non-core/jquery-waypoints/.gitignore b/packages/deprecated/jquery-waypoints/.gitignore
similarity index 100%
rename from packages/non-core/jquery-waypoints/.gitignore
rename to packages/deprecated/jquery-waypoints/.gitignore
diff --git a/packages/non-core/jquery-waypoints/README.md b/packages/deprecated/jquery-waypoints/README.md
similarity index 100%
rename from packages/non-core/jquery-waypoints/README.md
rename to packages/deprecated/jquery-waypoints/README.md
diff --git a/packages/non-core/jquery-waypoints/package.js b/packages/deprecated/jquery-waypoints/package.js
similarity index 100%
rename from packages/non-core/jquery-waypoints/package.js
rename to packages/deprecated/jquery-waypoints/package.js
diff --git a/packages/non-core/jquery-waypoints/waypoints.coffee b/packages/deprecated/jquery-waypoints/waypoints.coffee
similarity index 100%
rename from packages/non-core/jquery-waypoints/waypoints.coffee
rename to packages/deprecated/jquery-waypoints/waypoints.coffee
diff --git a/packages/non-core/spiderable/.gitignore b/packages/deprecated/spiderable/.gitignore
similarity index 100%
rename from packages/non-core/spiderable/.gitignore
rename to packages/deprecated/spiderable/.gitignore
diff --git a/packages/non-core/spiderable/README.md b/packages/deprecated/spiderable/README.md
similarity index 100%
rename from packages/non-core/spiderable/README.md
rename to packages/deprecated/spiderable/README.md
diff --git a/packages/non-core/spiderable/package.js b/packages/deprecated/spiderable/package.js
similarity index 100%
rename from packages/non-core/spiderable/package.js
rename to packages/deprecated/spiderable/package.js
diff --git a/packages/non-core/spiderable/phantom_script.js b/packages/deprecated/spiderable/phantom_script.js
similarity index 100%
rename from packages/non-core/spiderable/phantom_script.js
rename to packages/deprecated/spiderable/phantom_script.js
diff --git a/packages/non-core/spiderable/spiderable.html b/packages/deprecated/spiderable/spiderable.html
similarity index 100%
rename from packages/non-core/spiderable/spiderable.html
rename to packages/deprecated/spiderable/spiderable.html
diff --git a/packages/non-core/spiderable/spiderable.js b/packages/deprecated/spiderable/spiderable.js
similarity index 100%
rename from packages/non-core/spiderable/spiderable.js
rename to packages/deprecated/spiderable/spiderable.js
diff --git a/packages/non-core/spiderable/spiderable_client.js b/packages/deprecated/spiderable/spiderable_client.js
similarity index 100%
rename from packages/non-core/spiderable/spiderable_client.js
rename to packages/deprecated/spiderable/spiderable_client.js
diff --git a/packages/non-core/spiderable/spiderable_client_tests.js b/packages/deprecated/spiderable/spiderable_client_tests.js
similarity index 100%
rename from packages/non-core/spiderable/spiderable_client_tests.js
rename to packages/deprecated/spiderable/spiderable_client_tests.js
diff --git a/packages/non-core/spiderable/spiderable_server.js b/packages/deprecated/spiderable/spiderable_server.js
similarity index 100%
rename from packages/non-core/spiderable/spiderable_server.js
rename to packages/deprecated/spiderable/spiderable_server.js
diff --git a/packages/non-core/spiderable/spiderable_server_tests.js b/packages/deprecated/spiderable/spiderable_server_tests.js
similarity index 100%
rename from packages/non-core/spiderable/spiderable_server_tests.js
rename to packages/deprecated/spiderable/spiderable_server_tests.js
diff --git a/tools/project-context.js b/tools/project-context.js
index 9d6025004a..971041f68e 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -651,7 +651,11 @@ _.extend(ProjectContext.prototype, {
         files.pathJoin(files.getCurrentToolsDir(), 'packages');
 
       searchDirs.push(
+        // Include packages like packages/ecmascript.
         packagesDir,
+        // Include packages like packages/non-core/coffeescript.
+        files.pathJoin(packagesDir, "non-core"),
+        // Include packages like packages/non-core/blaze/packages/blaze.
         files.pathJoin(packagesDir, "non-core", "*", "packages"),
       );
     }