diff --git a/packages/non-core/coffeescript-test-helper/.gitignore b/packages/coffeescript-test-helper/.gitignore
similarity index 100%
rename from packages/non-core/coffeescript-test-helper/.gitignore
rename to packages/coffeescript-test-helper/.gitignore
diff --git a/packages/non-core/coffeescript-test-helper/README.md b/packages/coffeescript-test-helper/README.md
similarity index 100%
rename from packages/non-core/coffeescript-test-helper/README.md
rename to packages/coffeescript-test-helper/README.md
diff --git a/packages/non-core/coffeescript-test-helper/exporting.coffee b/packages/coffeescript-test-helper/exporting.coffee
similarity index 100%
rename from packages/non-core/coffeescript-test-helper/exporting.coffee
rename to packages/coffeescript-test-helper/exporting.coffee
diff --git a/packages/non-core/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
similarity index 100%
rename from packages/non-core/coffeescript-test-helper/package.js
rename to packages/coffeescript-test-helper/package.js
diff --git a/packages/non-core/coffeescript/.gitignore b/packages/coffeescript/.gitignore
similarity index 100%
rename from packages/non-core/coffeescript/.gitignore
rename to packages/coffeescript/.gitignore
diff --git a/packages/non-core/coffeescript/README.md b/packages/coffeescript/README.md
similarity index 100%
rename from packages/non-core/coffeescript/README.md
rename to packages/coffeescript/README.md
diff --git a/packages/non-core/coffeescript/compile-coffeescript.js b/packages/coffeescript/compile-coffeescript.js
similarity index 100%
rename from packages/non-core/coffeescript/compile-coffeescript.js
rename to packages/coffeescript/compile-coffeescript.js
diff --git a/packages/non-core/coffeescript/package.js b/packages/coffeescript/package.js
similarity index 100%
rename from packages/non-core/coffeescript/package.js
rename to packages/coffeescript/package.js
diff --git a/packages/non-core/coffeescript/tests/bare_test_setup.coffee b/packages/coffeescript/tests/bare_test_setup.coffee
similarity index 100%
rename from packages/non-core/coffeescript/tests/bare_test_setup.coffee
rename to packages/coffeescript/tests/bare_test_setup.coffee
diff --git a/packages/non-core/coffeescript/tests/bare_tests.js b/packages/coffeescript/tests/bare_tests.js
similarity index 100%
rename from packages/non-core/coffeescript/tests/bare_tests.js
rename to packages/coffeescript/tests/bare_tests.js
diff --git a/packages/non-core/coffeescript/tests/coffeescript_module.coffee b/packages/coffeescript/tests/coffeescript_module.coffee
similarity index 100%
rename from packages/non-core/coffeescript/tests/coffeescript_module.coffee
rename to packages/coffeescript/tests/coffeescript_module.coffee
diff --git a/packages/non-core/coffeescript/tests/coffeescript_strict_tests.coffee b/packages/coffeescript/tests/coffeescript_strict_tests.coffee
similarity index 100%
rename from packages/non-core/coffeescript/tests/coffeescript_strict_tests.coffee
rename to packages/coffeescript/tests/coffeescript_strict_tests.coffee
diff --git a/packages/non-core/coffeescript/tests/coffeescript_test_setup.js b/packages/coffeescript/tests/coffeescript_test_setup.js
similarity index 100%
rename from packages/non-core/coffeescript/tests/coffeescript_test_setup.js
rename to packages/coffeescript/tests/coffeescript_test_setup.js
diff --git a/packages/non-core/coffeescript/tests/coffeescript_tests.coffee b/packages/coffeescript/tests/coffeescript_tests.coffee
similarity index 100%
rename from packages/non-core/coffeescript/tests/coffeescript_tests.coffee
rename to packages/coffeescript/tests/coffeescript_tests.coffee
diff --git a/packages/non-core/coffeescript/tests/coffeescript_tests.js b/packages/coffeescript/tests/coffeescript_tests.js
similarity index 100%
rename from packages/non-core/coffeescript/tests/coffeescript_tests.js
rename to packages/coffeescript/tests/coffeescript_tests.js
diff --git a/packages/non-core/coffeescript/tests/es2015_module.js b/packages/coffeescript/tests/es2015_module.js
similarity index 100%
rename from packages/non-core/coffeescript/tests/es2015_module.js
rename to packages/coffeescript/tests/es2015_module.js
diff --git a/packages/non-core/coffeescript/tests/litcoffeescript_tests.coffee.md b/packages/coffeescript/tests/litcoffeescript_tests.coffee.md
similarity index 100%
rename from packages/non-core/coffeescript/tests/litcoffeescript_tests.coffee.md
rename to packages/coffeescript/tests/litcoffeescript_tests.coffee.md
diff --git a/packages/non-core/coffeescript/tests/litcoffeescript_tests.litcoffee b/packages/coffeescript/tests/litcoffeescript_tests.litcoffee
similarity index 100%
rename from packages/non-core/coffeescript/tests/litcoffeescript_tests.litcoffee
rename to packages/coffeescript/tests/litcoffeescript_tests.litcoffee