diff --git a/packages/-ember-data/addon/-private/index.js b/packages/-ember-data/addon/-private/index.js
index d7b7c48b0e3..038230776a0 100644
--- a/packages/-ember-data/addon/-private/index.js
+++ b/packages/-ember-data/addon/-private/index.js
@@ -25,6 +25,3 @@ export {
   normalizeModelName,
   coerceId,
 } from '@ember-data/store/-private';
-
-// Should be a different Repo ?
-export { default as DebugAdapter } from './system/debug/debug-adapter';
diff --git a/packages/-ember-data/addon/index.js b/packages/-ember-data/addon/index.js
index 9ebc49be31d..f9497696eaa 100644
--- a/packages/-ember-data/addon/index.js
+++ b/packages/-ember-data/addon/index.js
@@ -10,10 +10,10 @@ if (VERSION.match(/^1\.([0-9]|1[0-2])\./)) {
 }
 
 import Store, { normalizeModelName } from '@ember-data/store';
+import DebugAdapter from '@ember-data/debug';
 
 import {
   Snapshot,
-  DebugAdapter,
   InternalModel,
   DS,
   Errors,
diff --git a/packages/-ember-data/app/debug-adapter.js b/packages/-ember-data/app/debug-adapter.js
deleted file mode 100644
index 32f71a8a496..00000000000
--- a/packages/-ember-data/app/debug-adapter.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as DebugAdapter } from 'ember-data/system/debug/debug-adapter';
diff --git a/packages/-ember-data/node-tests/fixtures/expected.js b/packages/-ember-data/node-tests/fixtures/expected.js
index 63d4b26ffab..0e5f343159f 100644
--- a/packages/-ember-data/node-tests/fixtures/expected.js
+++ b/packages/-ember-data/node-tests/fixtures/expected.js
@@ -249,16 +249,6 @@ module.exports = {
     'uncountable',
     'irregular',
     'inflect',
-    'columnNameToDesc',
-    'columnsForType',
-    'detect',
-    'getFilters',
-    'getRecordColor',
-    'getRecordColumnValues',
-    'getRecordFilterValues',
-    'getRecordKeywords',
-    'getRecords',
-    'observerRecord',
     'pushPayload [OPTIONAL]',
     'serializeIntoHash [OPTIONAL]',
     'normalize [OPTIONAL]',
diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
index 2dd20b33c8e..d773e0745d3 100644
--- a/packages/-ember-data/package.json
+++ b/packages/-ember-data/package.json
@@ -26,6 +26,7 @@
   "dependencies": {
     "@ember-data/-build-infra": "3.15.0-alpha.0",
     "@ember-data/adapter": "3.15.0-alpha.0",
+    "@ember-data/debug": "3.15.0-alpha.0",
     "@ember-data/model": "3.15.0-alpha.0",
     "@ember-data/serializer": "3.15.0-alpha.0",
     "@ember-data/store": "3.15.0-alpha.0",
diff --git a/packages/-ember-data/tests/integration/debug-adapter-test.js b/packages/-ember-data/tests/integration/debug-adapter-test.js
index dd97386f89e..03785e62a66 100644
--- a/packages/-ember-data/tests/integration/debug-adapter-test.js
+++ b/packages/-ember-data/tests/integration/debug-adapter-test.js
@@ -3,7 +3,7 @@ import { A } from '@ember/array';
 import { get } from '@ember/object';
 import Model from '@ember-data/model';
 import Adapter from '@ember-data/adapter';
-import { DebugAdapter } from 'ember-data/-private';
+import DebugAdapter from '@ember-data/debug';
 import { module, test } from 'qunit';
 import { settled } from '@ember/test-helpers';
 import { attr } from '@ember-data/model';
diff --git a/packages/-ember-data/addon/-private/system/debug/debug-adapter.js b/packages/debug/addon/index.js
similarity index 97%
rename from packages/-ember-data/addon/-private/system/debug/debug-adapter.js
rename to packages/debug/addon/index.js
index 5847ca5fd38..0be51a0a10a 100644
--- a/packages/-ember-data/addon/-private/system/debug/debug-adapter.js
+++ b/packages/debug/addon/index.js
@@ -14,7 +14,7 @@ import Model from '@ember-data/model';
   Implements `@ember/debug/data-adapter` with for EmberData
   integration with the ember-inspector.
 
-  @class DebugAdapter
+  @class InspectorDebugAdapter
   @extends DataAdapter
   @private
 */
@@ -25,7 +25,7 @@ export default DataAdapter.extend({
     Specifies how records can be filtered based on the state of the record
     Records returned will need to have a `filterValues`
     property with a key for every name in the returned array
-    @public
+    @private
     @method getFilters
     @return {Array} List of objects defining filters
      The object should have a `name` and `desc` property
@@ -40,7 +40,7 @@ export default DataAdapter.extend({
 
   /**
     Detect whether a class is a Model
-    @public
+    @private
     @method detect
     @param {Model} typeClass
     @return {Boolean} Whether the typeClass is a Model class or not
@@ -51,7 +51,7 @@ export default DataAdapter.extend({
 
   /**
     Creates a human readable string used for column headers
-    @public
+    @private
     @method columnNameToDesc
     @param {String} name The attribute name
     @return {String} Human readable string based on the attribute name
@@ -66,7 +66,7 @@ export default DataAdapter.extend({
 
   /**
     Get the columns for a given model type
-    @public
+    @private
     @method columnsForType
     @param {Model} typeClass
     @return {Array} An array of columns of the following format:
@@ -94,7 +94,7 @@ export default DataAdapter.extend({
 
   /**
     Fetches all loaded records for a given type
-    @public
+    @private
     @method getRecords
     @param {Model} modelClass of the record
     @param {String} modelName of the record
@@ -120,7 +120,7 @@ export default DataAdapter.extend({
   /**
     Gets the values for each column
     This is the attribute values for a given record
-    @public
+    @private
     @method getRecordColumnValues
     @param {Model} record to get values from
     @return {Object} Keys should match column names defined by the model type
@@ -140,7 +140,7 @@ export default DataAdapter.extend({
 
   /**
     Returns keywords to match when searching records
-    @public
+    @private
     @method getRecordKeywords
     @param {Model} record
     @return {Array} Relevant keywords for search based on the record's attribute values
@@ -156,7 +156,7 @@ export default DataAdapter.extend({
   /**
     Returns the values of filters defined by `getFilters`
     These reflect the state of the record
-    @public
+    @private
     @method getRecordFilterValues
     @param {Model} record
     @return {Object} The record state filter values
@@ -171,7 +171,7 @@ export default DataAdapter.extend({
 
   /**
     Returns a color that represents the record's state
-    @public
+    @private
     @method getRecordColor
     @param {Model} record
     @return {String} The record color
@@ -190,7 +190,7 @@ export default DataAdapter.extend({
   /**
     Observes all relevant properties and re-sends the wrapped record
     when a change occurs
-    @public
+    @private
     @method observerRecord
     @param {Model} record
     @param {Function} recordUpdated Callback used to notify changes
diff --git a/packages/debug/addon/index.ts b/packages/debug/addon/index.ts
deleted file mode 100644
index f561e63139d..00000000000
--- a/packages/debug/addon/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-/**
-  @module @ember-data/record-data
-*/
diff --git a/packages/debug/app/data-adapter.js b/packages/debug/app/data-adapter.js
new file mode 100644
index 00000000000..bd4bf31f7af
--- /dev/null
+++ b/packages/debug/app/data-adapter.js
@@ -0,0 +1 @@
+export { default } from '@ember-data/debug';