diff --git a/src/api/endpoint/api/dist-tags.js b/src/api/endpoint/api/dist-tags.js
index 31f5fe7aa..91d8f4182 100644
--- a/src/api/endpoint/api/dist-tags.js
+++ b/src/api/endpoint/api/dist-tags.js
@@ -1,4 +1,4 @@
-const {media, allow} = require('../../web/middleware');
+const {media, allow} = require('../../middleware');
 const mime = require('mime');
 const _ = require('lodash');
 
diff --git a/src/api/endpoint/api/package.js b/src/api/endpoint/api/package.js
index 257eb1c42..4ddb6f57c 100644
--- a/src/api/endpoint/api/package.js
+++ b/src/api/endpoint/api/package.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const createError = require('http-errors');
 
-const {allow} = require('../../web/middleware');
+const {allow} = require('../../middleware');
 const Utils = require('../../../lib/utils');
 
 export default function(route, auth, storage, config) {
diff --git a/src/api/endpoint/api/publish.js b/src/api/endpoint/api/publish.js
index 813ca688e..6fce7337e 100644
--- a/src/api/endpoint/api/publish.js
+++ b/src/api/endpoint/api/publish.js
@@ -2,7 +2,7 @@ const _ = require('lodash');
 const Path = require('path');
 const createError = require('http-errors');
 
-const {media, expect_json, allow} = require('../../web/middleware');
+const {media, expect_json, allow} = require('../../middleware');
 const Notify = require('../../../lib/notify');
 const Utils = require('../../../lib/utils');
 const mime = require('mime');
diff --git a/src/api/endpoint/index.js b/src/api/endpoint/index.js
index 84050fd99..bcbb97d69 100644
--- a/src/api/endpoint/index.js
+++ b/src/api/endpoint/index.js
@@ -13,7 +13,7 @@ import publish from './api/publish';
 import search from './api/search';
 import pkg from './api/package';
 
-const {match, validate_name, validatePackage, encodeScopePackage, anti_loop} = require('../web/middleware');
+const {match, validate_name, validatePackage, encodeScopePackage, anti_loop} = require('../middleware');
 
 export default function(config: Config, auth: IAuth, storage: IStorage) {
   /* eslint new-cap:off */
diff --git a/src/api/index.js b/src/api/index.js
index 28128daac..3fd078259 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -11,7 +11,7 @@ import apiEndpoint from './endpoint';
 
 const Logger = require('../lib/logger');
 const Config = require('../lib/config');
-const Middleware = require('./web/middleware');
+const Middleware = require('./middleware');
 const Cats = require('../lib/status-cats');
 
 export default function(configHash) {
diff --git a/src/api/web/middleware.js b/src/api/middleware.js
similarity index 98%
rename from src/api/web/middleware.js
rename to src/api/middleware.js
index ddf6b3e4a..41771ccad 100644
--- a/src/api/web/middleware.js
+++ b/src/api/middleware.js
@@ -4,9 +4,9 @@ import {
   validate_name as utilValidateName,
   validate_package as utilValidatePackage,
   isObject,
-  ErrorCode} from '../../lib/utils';
+  ErrorCode} from '../lib/utils';
 
-const Logger = require('../../lib/logger');
+const Logger = require('../lib/logger');
 
 export function match(regexp) {
   return function(req, res, next, value) {
diff --git a/src/api/web/api.js b/src/api/web/api.js
index 6176faa89..9d6034e18 100644
--- a/src/api/web/api.js
+++ b/src/api/web/api.js
@@ -5,7 +5,7 @@ import addPackageWebApi from './endpoint/package';
 import addSearchWebApi from './endpoint/search';
 
 import Search from '../../lib/search';
-import {match, validate_name, validatePackage, securityIframe} from './middleware';
+import {match, validate_name, validatePackage, securityIframe} from '../middleware';
 
 const route = Router(); /* eslint new-cap: 0 */
 
diff --git a/src/api/web/endpoint/package.js b/src/api/web/endpoint/package.js
index 7ff814f1b..6b55b9619 100644
--- a/src/api/web/endpoint/package.js
+++ b/src/api/web/endpoint/package.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import {addScope, addGravatarSupport, deleteProperties, sortByName} from '../../../lib/utils';
-import {allow} from '../middleware';
+import {allow} from '../../middleware';
 import async from 'async';
 import marked from 'marked';
 
diff --git a/src/api/web/index.js b/src/api/web/index.js
index 76da937e8..fba271e64 100644
--- a/src/api/web/index.js
+++ b/src/api/web/index.js
@@ -4,7 +4,7 @@ import fs from 'fs';
 import Search from '../../lib/search';
 import * as Utils from '../../lib/utils';
 
-const {securityIframe} = require('./middleware');
+const {securityIframe} = require('../middleware');
 /* eslint new-cap:off */
 const router = express.Router();
 const env = require('../../config/env');