diff --git a/core/server/models/base/bookshelf.js b/core/server/models/base/bookshelf.js
index 9556d5b550..822f3dad56 100644
--- a/core/server/models/base/bookshelf.js
+++ b/core/server/models/base/bookshelf.js
@@ -42,25 +42,25 @@ ghostBookshelf.plugin(plugins.collision);
 // Load hasPosts plugin for authors models
 ghostBookshelf.plugin(plugins.hasPosts);
 
-ghostBookshelf.plugin(require('./crud'));
+ghostBookshelf.plugin(require('./plugins/crud'));
 
-ghostBookshelf.plugin(require('./actions'));
+ghostBookshelf.plugin(require('./plugins/actions'));
 
-ghostBookshelf.plugin(require('./events'));
+ghostBookshelf.plugin(require('./plugins/events'));
 
-ghostBookshelf.plugin(require('./raw-knex'));
+ghostBookshelf.plugin(require('./plugins/raw-knex'));
 
-ghostBookshelf.plugin(require('./sanitize'));
+ghostBookshelf.plugin(require('./plugins/sanitize'));
 
-ghostBookshelf.plugin(require('./generate-slug'));
+ghostBookshelf.plugin(require('./plugins/generate-slug'));
 
-ghostBookshelf.plugin(require('./bulk-operations'));
+ghostBookshelf.plugin(require('./plugins/bulk-operations'));
 
-ghostBookshelf.plugin(require('./filtered-collection'));
+ghostBookshelf.plugin(require('./plugins/filtered-collection'));
 
-ghostBookshelf.plugin(require('./user-type'));
+ghostBookshelf.plugin(require('./plugins/user-type'));
 
-ghostBookshelf.plugin(require('./data-manipulation'));
+ghostBookshelf.plugin(require('./plugins/data-manipulation'));
 
 // Manages nested updates (relationships)
 ghostBookshelf.plugin('bookshelf-relations', {
diff --git a/core/server/models/base/actions.js b/core/server/models/base/plugins/actions.js
similarity index 100%
rename from core/server/models/base/actions.js
rename to core/server/models/base/plugins/actions.js
diff --git a/core/server/models/base/bulk-operations.js b/core/server/models/base/plugins/bulk-operations.js
similarity index 98%
rename from core/server/models/base/bulk-operations.js
rename to core/server/models/base/plugins/bulk-operations.js
index d49eb6d027..84936cc347 100644
--- a/core/server/models/base/bulk-operations.js
+++ b/core/server/models/base/plugins/bulk-operations.js
@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
-const db = require('../../data/db');
+const db = require('../../../data/db');
 const logging = require('@tryghost/logging');
 
 const CHUNK_SIZE = 100;
diff --git a/core/server/models/base/crud.js b/core/server/models/base/plugins/crud.js
similarity index 100%
rename from core/server/models/base/crud.js
rename to core/server/models/base/plugins/crud.js
diff --git a/core/server/models/base/data-manipulation.js b/core/server/models/base/plugins/data-manipulation.js
similarity index 98%
rename from core/server/models/base/data-manipulation.js
rename to core/server/models/base/plugins/data-manipulation.js
index 14f27e2ee7..d51f03a0b1 100644
--- a/core/server/models/base/data-manipulation.js
+++ b/core/server/models/base/plugins/data-manipulation.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const moment = require('moment');
 
-const schema = require('../../data/schema');
+const schema = require('../../../data/schema');
 
 /**
  * @param {import('bookshelf')} Bookshelf
diff --git a/core/server/models/base/events.js b/core/server/models/base/plugins/events.js
similarity index 99%
rename from core/server/models/base/events.js
rename to core/server/models/base/plugins/events.js
index 89b31f6b0e..b0f5654ff7 100644
--- a/core/server/models/base/events.js
+++ b/core/server/models/base/plugins/events.js
@@ -1,8 +1,8 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('models:base:model-events');
 
-const events = require('../../lib/common/events');
-const schema = require('../../data/schema');
+const events = require('../../../lib/common/events');
+const schema = require('../../../data/schema');
 
 module.exports = function (Bookshelf) {
     Bookshelf.Model = Bookshelf.Model.extend({
diff --git a/core/server/models/base/filtered-collection.js b/core/server/models/base/plugins/filtered-collection.js
similarity index 100%
rename from core/server/models/base/filtered-collection.js
rename to core/server/models/base/plugins/filtered-collection.js
diff --git a/core/server/models/base/generate-slug.js b/core/server/models/base/plugins/generate-slug.js
similarity index 98%
rename from core/server/models/base/generate-slug.js
rename to core/server/models/base/plugins/generate-slug.js
index 3d5d04ec11..311f4e8d1f 100644
--- a/core/server/models/base/generate-slug.js
+++ b/core/server/models/base/plugins/generate-slug.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const security = require('@tryghost/security');
 
-const urlUtils = require('../../../shared/url-utils');
+const urlUtils = require('../../../../shared/url-utils');
 
 /**
  * @type {Bookshelf} Bookshelf
diff --git a/core/server/models/base/raw-knex.js b/core/server/models/base/plugins/raw-knex.js
similarity index 99%
rename from core/server/models/base/raw-knex.js
rename to core/server/models/base/plugins/raw-knex.js
index 7f926d86c3..c3a8a0a6dc 100644
--- a/core/server/models/base/raw-knex.js
+++ b/core/server/models/base/plugins/raw-knex.js
@@ -3,7 +3,7 @@ const debug = require('@tryghost/debug')('models:base:raw-knex');
 const plugins = require('@tryghost/bookshelf-plugins');
 const Promise = require('bluebird');
 
-const schema = require('../../data/schema');
+const schema = require('../../../data/schema');
 
 /**
  * @param {import('bookshelf')} Bookshelf
diff --git a/core/server/models/base/sanitize.js b/core/server/models/base/plugins/sanitize.js
similarity index 99%
rename from core/server/models/base/sanitize.js
rename to core/server/models/base/plugins/sanitize.js
index 371ee47874..92c4253631 100644
--- a/core/server/models/base/sanitize.js
+++ b/core/server/models/base/plugins/sanitize.js
@@ -3,7 +3,7 @@ const errors = require('@tryghost/errors');
 const moment = require('moment');
 const tpl = require('@tryghost/tpl');
 
-const schema = require('../../data/schema');
+const schema = require('../../../data/schema');
 
 const messages = {
     missingContext: 'missing context',
diff --git a/core/server/models/base/user-type.js b/core/server/models/base/plugins/user-type.js
similarity index 100%
rename from core/server/models/base/user-type.js
rename to core/server/models/base/plugins/user-type.js