diff --git a/lib/config/presets.js b/lib/config/presets.js
index 4a6239d93a71d71dbd8a020d8bd93590c8e5adf8..096fedcf66bcf2f2bc9cc6a2ea2568ce5f234e6d 100644
--- a/lib/config/presets.js
+++ b/lib/config/presets.js
@@ -1,7 +1,7 @@
 const configParser = require('./index');
 const massage = require('./massage');
 const migration = require('./migration');
-const npm = require('../registry/npm');
+const npm = require('../manager/npm/registry');
 
 module.exports = {
   resolveConfigPresets,
diff --git a/lib/registry/docker.js b/lib/manager/docker/registry.js
similarity index 100%
rename from lib/registry/docker.js
rename to lib/manager/docker/registry.js
diff --git a/lib/registry/npm.js b/lib/manager/npm/registry.js
similarity index 100%
rename from lib/registry/npm.js
rename to lib/manager/npm/registry.js
diff --git a/lib/workers/package-file/index.js b/lib/workers/package-file/index.js
index 28be475ecaf1b5b5e938a88a15254278f4081215..43dfe35c19af079b62a0378291ae834810d6f318 100644
--- a/lib/workers/package-file/index.js
+++ b/lib/workers/package-file/index.js
@@ -1,6 +1,6 @@
 const configParser = require('../../config');
 const depTypeWorker = require('../dep-type');
-const npmApi = require('../../registry/npm');
+const npmApi = require('../../manager/npm/registry');
 
 let logger = require('../../logger');
 
diff --git a/lib/workers/package/docker.js b/lib/workers/package/docker.js
index b6d7201e5ffc746321e28076199f55ac69fd1a2b..5eba21223a576af4e32a56a732357bbdd268070b 100644
--- a/lib/workers/package/docker.js
+++ b/lib/workers/package/docker.js
@@ -1,5 +1,5 @@
 const semver = require('semver');
-const dockerApi = require('../../registry/docker');
+const dockerApi = require('../../manager/docker/registry');
 const versions = require('./versions');
 const compareVersions = require('compare-versions');
 
diff --git a/lib/workers/package/npm.js b/lib/workers/package/npm.js
index df5236c510f70afbbdaa99db01c94f11e096d3c0..f25b14588d49fb896748605e97dd8a490cb7afeb 100644
--- a/lib/workers/package/npm.js
+++ b/lib/workers/package/npm.js
@@ -1,4 +1,4 @@
-const npmApi = require('../../registry/npm');
+const npmApi = require('../../manager/npm/registry');
 const versions = require('./versions');
 
 module.exports = {
diff --git a/test/config/presets.spec.js b/test/config/presets.spec.js
index 87ec4a5685b6d281841809447e86afced7d83549..fe1db1808866f5ca2fc955b7d484ecf50b87b3d6 100644
--- a/test/config/presets.spec.js
+++ b/test/config/presets.spec.js
@@ -1,4 +1,4 @@
-const npm = require('../../lib/registry/npm');
+const npm = require('../../lib/manager/npm/registry');
 const presets = require('../../lib/config/presets');
 const logger = require('../_fixtures/logger');
 const presetDefaults = require('../_fixtures/npm/renovate-config-default');
diff --git a/test/api/docker.spec.js b/test/manager/docker/registry.spec.js
similarity index 94%
rename from test/api/docker.spec.js
rename to test/manager/docker/registry.spec.js
index f5fa9584069d495bab9fe5a6d5efad321169edbc..0819730b24203136202d7d58cf11629d6333720b 100644
--- a/test/api/docker.spec.js
+++ b/test/manager/docker/registry.spec.js
@@ -1,6 +1,6 @@
-const docker = require('../../lib/registry/docker');
+const docker = require('../../../lib/manager/docker/registry');
 const got = require('got');
-const logger = require('../_fixtures/logger');
+const logger = require('../../_fixtures/logger');
 
 jest.mock('got');
 
diff --git a/test/api/__snapshots__/npm.spec.js.snap b/test/manager/npm/__snapshots__/registry.spec.js.snap
similarity index 100%
rename from test/api/__snapshots__/npm.spec.js.snap
rename to test/manager/npm/__snapshots__/registry.spec.js.snap
diff --git a/test/api/npm.spec.js b/test/manager/npm/registry.spec.js
similarity index 97%
rename from test/api/npm.spec.js
rename to test/manager/npm/registry.spec.js
index 630d29cefafb8bb029b9fd8126e6dc3880864a26..8a6229e99ea5736de6306c2598ce1ee3c3b29442 100644
--- a/test/api/npm.spec.js
+++ b/test/manager/npm/registry.spec.js
@@ -1,7 +1,7 @@
-const npm = require('../../lib/registry/npm');
+const npm = require('../../../lib/manager/npm/registry');
 const got = require('got');
 const registryAuthToken = require('registry-auth-token');
-const logger = require('../_fixtures/logger');
+const logger = require('../../_fixtures/logger');
 
 jest.mock('registry-auth-token');
 jest.mock('got');
diff --git a/test/workers/package/docker.spec.js b/test/workers/package/docker.spec.js
index 7225ca24cefce1e7bbb633fa3f500ebc255bd0c5..7b2da67ce06dd08bc73112ed051a55b6cd7d7ead 100644
--- a/test/workers/package/docker.spec.js
+++ b/test/workers/package/docker.spec.js
@@ -1,9 +1,9 @@
-const dockerApi = require('../../../lib/registry/docker');
+const dockerApi = require('../../../lib/manager/docker/registry');
 const docker = require('../../../lib/workers/package/docker');
 const defaultConfig = require('../../../lib/config/defaults').getConfig();
 const logger = require('../../_fixtures/logger');
 
-// jest.mock('../../../lib/registry/docker');
+// jest.mock('../../../lib/manager/docker/registry');
 dockerApi.getDigest = jest.fn();
 dockerApi.getTags = jest.fn();
 
diff --git a/test/workers/package/npm.spec.js b/test/workers/package/npm.spec.js
index 81cc1f817cf757bbd1455a757df2a2a930bc9e70..4ddc95b93c9ab7f574bd8ce168d9b4fb3b49d198 100644
--- a/test/workers/package/npm.spec.js
+++ b/test/workers/package/npm.spec.js
@@ -1,10 +1,10 @@
-const npmApi = require('../../../lib/registry/npm');
+const npmApi = require('../../../lib/manager/npm/registry');
 const versions = require('../../../lib/workers/package/versions');
 const npm = require('../../../lib/workers/package/npm');
 const defaultConfig = require('../../../lib/config/defaults').getConfig();
 const logger = require('../../_fixtures/logger');
 
-jest.mock('../../../lib/registry/npm');
+jest.mock('../../../lib/manager/npm/registry');
 npmApi.getDependency = jest.fn();
 
 describe('lib/workers/package/npm', () => {
diff --git a/test/workers/repository/apis.spec.js b/test/workers/repository/apis.spec.js
index 2d946b5feb5710139ca48fbb360675a38eef20dc..04c837baab93837ca606c53d0af03c62d5a3574d 100644
--- a/test/workers/repository/apis.spec.js
+++ b/test/workers/repository/apis.spec.js
@@ -5,13 +5,13 @@ const logger = require('../../_fixtures/logger');
 
 const githubApi = require('../../../lib/platform/github');
 const gitlabApi = require('../../../lib/platform/gitlab');
-const npmApi = require('../../../lib/registry/npm');
+const npmApi = require('../../../lib/manager/npm/registry');
 
 const defaultConfig = require('../../../lib/config/defaults').getConfig();
 
 jest.mock('../../../lib/platform/github');
 jest.mock('../../../lib/platform/gitlab');
-jest.mock('../../../lib/registry/npm');
+jest.mock('../../../lib/manager/npm/registry');
 
 describe('workers/repository/apis', () => {
   describe('getNpmrc', () => {