diff --git a/.eslintrc.json b/.eslintrc.json
index ee6316a..ac2e745 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -21,7 +21,8 @@
         "args": "none",
         "ignoreRestSiblings": true
       }
-    ]
+    ],
+    "import/order": [2, { "newlines-between": "always" }]
   },
   "overrides": [
     {
diff --git a/src/deploy/hash-files.js b/src/deploy/hash-files.js
index a54e448..778edbb 100644
--- a/src/deploy/hash-files.js
+++ b/src/deploy/hash-files.js
@@ -1,6 +1,8 @@
 const { promisify } = require('util')
+
 const walker = require('folder-walker')
 const pump = promisify(require('pump'))
+
 const { hasherCtor, manifestCollectorCtor, fileFilterCtor, fileNormalizerCtor } = require('./hasher-segments')
 
 module.exports = hashFiles
diff --git a/src/deploy/hash-files.test.js b/src/deploy/hash-files.test.js
index 92f3e54..62394a5 100644
--- a/src/deploy/hash-files.test.js
+++ b/src/deploy/hash-files.test.js
@@ -1,7 +1,9 @@
+const path = require('path')
+
 const test = require('ava')
+
 const hashFiles = require('./hash-files')
 const { defaultFilter } = require('./util')
-const path = require('path')
 
 test('hashes files in a folder', async t => {
   const { files, filesShaMap } = await hashFiles(__dirname, path.resolve(__dirname, '../../fixtures/netlify.toml'), {
diff --git a/src/deploy/hash-fns.js b/src/deploy/hash-fns.js
index ecfe70e..54f1a6c 100644
--- a/src/deploy/hash-fns.js
+++ b/src/deploy/hash-fns.js
@@ -1,8 +1,9 @@
 const { promisify } = require('util')
+const path = require('path')
+
 const pump = promisify(require('pump'))
 const fromArray = require('from2-array')
 const zipIt = require('@netlify/zip-it-and-ship-it')
-const path = require('path')
 
 const { hasherCtor, manifestCollectorCtor } = require('./hasher-segments')
 
diff --git a/src/deploy/hash-fns.test.js b/src/deploy/hash-fns.test.js
index c9b3e7c..3c5addd 100644
--- a/src/deploy/hash-fns.test.js
+++ b/src/deploy/hash-fns.test.js
@@ -1,7 +1,8 @@
 const test = require('ava')
+const tempy = require('tempy')
+
 const hashFns = require('./hash-fns')
 const { defaultFilter } = require('./util')
-const tempy = require('tempy')
 
 test('hashes files in a folder', async t => {
   const { functions, fnShaMap } = await hashFns(__dirname, { filter: defaultFilter, tmpDir: tempy.directory() })
diff --git a/src/deploy/hasher-segments.js b/src/deploy/hasher-segments.js
index a3d4fb7..f151bd3 100644
--- a/src/deploy/hasher-segments.js
+++ b/src/deploy/hasher-segments.js
@@ -1,10 +1,11 @@
 const objFilterCtor = require('through2-filter').objCtor
 const objWriter = require('flush-write-stream').obj
-const { normalizePath } = require('./util')
 const transform = require('parallel-transform')
 const hasha = require('hasha')
 const map = require('through2-map').obj
 
+const { normalizePath } = require('./util')
+
 // a parallel transform stream segment ctor that hashes fileObj's created by folder-walker
 exports.hasherCtor = ({ concurrentHash, hashAlgorithm = 'sha1' }) => {
   const hashaOpts = { algorithm: hashAlgorithm }
diff --git a/src/deploy/index.js b/src/deploy/index.js
index 22bf4e7..1313d4d 100644
--- a/src/deploy/index.js
+++ b/src/deploy/index.js
@@ -1,12 +1,13 @@
-const uploadFiles = require('./upload-files')
-const hashFiles = require('./hash-files')
-const hashFns = require('./hash-fns')
+const { promisify } = require('util')
+
 const cleanDeep = require('clean-deep')
 const tempy = require('tempy')
-const { promisify } = require('util')
 const rimraf = promisify(require('rimraf'))
-const { waitForDiff } = require('./util')
 
+const hashFns = require('./hash-fns')
+const hashFiles = require('./hash-files')
+const uploadFiles = require('./upload-files')
+const { waitForDiff } = require('./util')
 const { waitForDeploy, getUploadList, defaultFilter } = require('./util')
 
 module.exports = async (api, siteId, dir, opts) => {
diff --git a/src/deploy/upload-files.js b/src/deploy/upload-files.js
index 9b7d3e9..f9fcbfd 100644
--- a/src/deploy/upload-files.js
+++ b/src/deploy/upload-files.js
@@ -1,5 +1,6 @@
-const pMap = require('p-map')
 const fs = require('fs')
+
+const pMap = require('p-map')
 const backoff = require('backoff')
 const debug = require('debug')('netlify:deploy')
 
diff --git a/src/deploy/util.js b/src/deploy/util.js
index 150fe3c..e64bf23 100644
--- a/src/deploy/util.js
+++ b/src/deploy/util.js
@@ -1,4 +1,5 @@
 const path = require('path')
+
 const pWaitFor = require('p-wait-for')
 const flatten = require('lodash.flatten')
 
diff --git a/src/deploy/util.test.js b/src/deploy/util.test.js
index 9cf1249..715452a 100644
--- a/src/deploy/util.test.js
+++ b/src/deploy/util.test.js
@@ -1,4 +1,5 @@
 const test = require('ava')
+
 const { normalizePath } = require('./util')
 
 test('normalizes relative file paths', t => {
diff --git a/src/index.js b/src/index.js
index 6a18c6e..093eadc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,11 +1,12 @@
 const set = require('lodash.set')
 const get = require('lodash.get')
 const dfn = require('@netlify/open-api')
-const { methods, generateMethod } = require('./open-api')
 const pWaitFor = require('p-wait-for')
-const deploy = require('./deploy')
 const debug = require('debug')('netlify')
 
+const { methods, generateMethod } = require('./open-api')
+const deploy = require('./deploy')
+
 class NetlifyAPI {
   constructor(accessToken, opts) {
     // variadic arguments
diff --git a/src/index.test.js b/src/index.test.js
index e86afae..a9fae76 100644
--- a/src/index.test.js
+++ b/src/index.test.js
@@ -1,12 +1,15 @@
-const test = require('ava')
 const http = require('http')
 const { promisify } = require('util')
-const NetlifyAPI = require('./index')
+
+const test = require('ava')
 const body = promisify(require('body'))
 const fromString = require('from2-string')
 const { TextHTTPError } = require('micro-api-client')
+
 const { existy, unixNow } = require('./open-api/util')
 
+const NetlifyAPI = require('./index')
+
 const createServer = handler => {
   const s = http.createServer(handler)
   s._close = s.close
diff --git a/src/open-api/index.js b/src/open-api/index.js
index 859a5e2..bd6e184 100644
--- a/src/open-api/index.js
+++ b/src/open-api/index.js
@@ -1,15 +1,17 @@
+const http = require('http')
+
 const get = require('lodash.get')
 const set = require('lodash.set')
 const queryString = require('qs')
-const http = require('http')
 const fetch = require('node-fetch').default || require('node-fetch') // Webpack will sometimes export default exports in different places
 const Headers = require('node-fetch').Headers
 const camelCase = require('lodash.camelcase')
 const { JSONHTTPError, TextHTTPError } = require('micro-api-client')
 const debug = require('debug')('netlify:open-api')
-const { existy, sleep, unixNow } = require('./util')
 const isStream = require('is-stream')
 
+const { existy, sleep, unixNow } = require('./util')
+
 exports.methods = require('./shape-swagger')
 
 // open-api 2.0
diff --git a/src/open-api/shape-swagger.js b/src/open-api/shape-swagger.js
index 4628087..5548687 100644
--- a/src/open-api/shape-swagger.js
+++ b/src/open-api/shape-swagger.js
@@ -1,4 +1,5 @@
 const dfn = require('@netlify/open-api')
+
 const { sortParams, mergeParams } = require('./util')
 const methods = []