diff --git a/server/middleware/fetchFile.js b/server/middleware/fetchFile.js
index 97adf4f..6f35eac 100644
--- a/server/middleware/fetchFile.js
+++ b/server/middleware/fetchFile.js
@@ -1,8 +1,8 @@
 const fs = require('fs')
 const path = require('path')
 const semver = require('semver')
-const PackageCache = require('../PackageCache')
-const PackageInfo = require('../PackageInfo')
+const getPackage = require('./utils/getPackage')
+const getPackageInfo = require('./utils/getPackageInfo')
 const PackageURL = require('../PackageURL')
 
 const FindExtensions = [ '', '.js', '.json' ]
@@ -47,7 +47,7 @@ function findFile(base, useIndex, callback) {
  * trailing slash.
  */
 function fetchFile(req, res, next) {
-  PackageInfo.get(req.packageName, function (error, packageInfo) {
+  getPackageInfo(req.packageName, function (error, packageInfo) {
     if (error) {
       console.error(error)
       return res.status(500).type('text').send(`Cannot get info for package "${req.packageName}"`)
@@ -64,7 +64,7 @@ function fetchFile(req, res, next) {
       // A valid request for a package we haven't downloaded yet.
       req.packageConfig = versions[req.packageVersion]
 
-      PackageCache.get(req.packageConfig, function (error, outputDir) {
+      getPackage(req.packageConfig, function (error, outputDir) {
         if (error) {
           console.error(error)
           res.status(500).type('text').send(`Cannot fetch package ${req.packageSpec}`)
diff --git a/server/createCache.js b/server/middleware/utils/createCache.js
similarity index 92%
rename from server/createCache.js
rename to server/middleware/utils/createCache.js
index 805a8c2..e0106ae 100644
--- a/server/createCache.js
+++ b/server/middleware/utils/createCache.js
@@ -1,4 +1,4 @@
-const db = require('./RedisClient')
+const db = require('../../RedisClient')
 
 function createCache(keyPrefix) {
   function createKey(key) {
diff --git a/server/createMutex.js b/server/middleware/utils/createMutex.js
similarity index 100%
rename from server/createMutex.js
rename to server/middleware/utils/createMutex.js
diff --git a/server/PackageCache.js b/server/middleware/utils/getPackage.js
similarity index 98%
rename from server/PackageCache.js
rename to server/middleware/utils/getPackage.js
index cfb5a08..5be1e76 100644
--- a/server/PackageCache.js
+++ b/server/middleware/utils/getPackage.js
@@ -85,6 +85,4 @@ function getPackage(packageConfig, callback) {
   })
 }
 
-module.exports = {
-  get: getPackage
-}
+module.exports = getPackage
diff --git a/server/PackageInfo.js b/server/middleware/utils/getPackageInfo.js
similarity index 97%
rename from server/PackageInfo.js
rename to server/middleware/utils/getPackageInfo.js
index 17419d6..d87ee74 100644
--- a/server/PackageInfo.js
+++ b/server/middleware/utils/getPackageInfo.js
@@ -63,6 +63,4 @@ function getPackageInfo(packageName, callback) {
   })
 }
 
-module.exports = {
-  get: getPackageInfo
-}
+module.exports = getPackageInfo