diff --git a/src/providers/sh/commands/bin/alias.js b/src/providers/sh/commands/alias.js
similarity index 95%
rename from src/providers/sh/commands/bin/alias.js
rename to src/providers/sh/commands/alias.js
index 6814496..42771ba 100644
--- a/src/providers/sh/commands/bin/alias.js
+++ b/src/providers/sh/commands/alias.js
@@ -10,18 +10,18 @@ require('epipebomb')()
 const supportsColor = require('supports-color')
 
 // Utilities
-const strlen = require('../lib/strlen')
-const NowAlias = require('../lib/alias')
-const NowDomains = require('../lib/domains')
-const { handleError, error } = require('../lib/error')
-const toHost = require('../lib/to-host')
-const { reAlias } = require('../lib/re-alias')
-const exit = require('../lib/utils/exit')
-const info = require('../lib/utils/output/info')
-const logo = require('../lib/utils/output/logo')
-const promptBool = require('../lib/utils/input/prompt-bool')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const strlen = require('../util/strlen')
+const NowAlias = require('../util/alias')
+const NowDomains = require('../util/domains')
+const { handleError, error } = require('../util/error')
+const toHost = require('../util/to-host')
+const { reAlias } = require('../util/re-alias')
+const exit = require('../util/etc/exit')
+const info = require('../util/etc/output/info')
+const logo = require('../util/etc/output/logo')
+const promptBool = require('../util/etc/input/prompt-bool')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const grayWidth = 10
 const underlineWidth = 11
diff --git a/src/providers/sh/commands/bin/billing.js b/src/providers/sh/commands/billing.js
similarity index 95%
rename from src/providers/sh/commands/bin/billing.js
rename to src/providers/sh/commands/billing.js
index 206418a..c422c9e 100644
--- a/src/providers/sh/commands/bin/billing.js
+++ b/src/providers/sh/commands/billing.js
@@ -6,17 +6,17 @@ const minimist = require('minimist')
 const ms = require('ms')
 
 // Utilities
-const { handleError, error } = require('../lib/error')
-const NowCreditCards = require('../lib/credit-cards')
-const indent = require('../lib/indent')
-const listInput = require('../lib/utils/input/list')
-const success = require('../lib/utils/output/success')
-const promptBool = require('../lib/utils/input/prompt-bool')
-const info = require('../lib/utils/output/info')
-const logo = require('../lib/utils/output/logo')
+const { handleError, error } = require('../util/error')
+const NowCreditCards = require('../util/credit-cards')
+const indent = require('../util/indent')
+const listInput = require('../util/etc/input/list')
+const success = require('../util/etc/output/success')
+const promptBool = require('../util/etc/input/prompt-bool')
+const info = require('../util/etc/output/info')
+const logo = require('../util/etc/output/logo')
 const addBilling = require('./billing/add')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/billing/add.js b/src/providers/sh/commands/billing/add.js
similarity index 93%
rename from src/providers/sh/commands/bin/billing/add.js
rename to src/providers/sh/commands/billing/add.js
index b24fa49..e5b0f0c 100644
--- a/src/providers/sh/commands/bin/billing/add.js
+++ b/src/providers/sh/commands/billing/add.js
@@ -6,14 +6,14 @@ const chalk = require('chalk')
 const ccValidator = require('credit-card')
 
 // Utilities
-const textInput = require('../../lib/utils/input/text')
-const countries = require('../../lib/utils/billing/country-list')
-const cardBrands = require('../../lib/utils/billing/card-brands')
-const geocode = require('../../lib/utils/billing/geocode')
-const success = require('../../lib/utils/output/success')
-const wait = require('../../lib/utils/output/wait')
-const { tick } = require('../../lib/utils/output/chars')
-const rightPad = require('../../lib/utils/output/right-pad')
+const textInput = require('../../util/etc/input/text')
+const countries = require('../../util/etc/billing/country-list')
+const cardBrands = require('../../util/etc/billing/card-brands')
+const geocode = require('../../util/etc/billing/geocode')
+const success = require('../../util/etc/output/success')
+const wait = require('../../util/etc/output/wait')
+const { tick } = require('../../util/etc/output/chars')
+const rightPad = require('../../util/etc/output/right-pad')
 
 function expDateMiddleware(data) {
   return data
diff --git a/src/providers/sh/commands/bin/certs.js b/src/providers/sh/commands/certs.js
similarity index 97%
rename from src/providers/sh/commands/bin/certs.js
rename to src/providers/sh/commands/certs.js
index bdd7d12..f0fb938 100644
--- a/src/providers/sh/commands/bin/certs.js
+++ b/src/providers/sh/commands/certs.js
@@ -14,12 +14,12 @@ require('epipebomb')()
 const supportsColor = require('supports-color')
 
 // Utilities
-const { handleError, error } = require('../lib/error')
-const NowCerts = require('../lib/certs')
-const exit = require('../lib/utils/exit')
-const logo = require('../lib/utils/output/logo')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const { handleError, error } = require('../util/error')
+const NowCerts = require('../util/certs')
+const exit = require('../util/etc/exit')
+const logo = require('../util/etc/output/logo')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/deploy.js b/src/providers/sh/commands/deploy.js
similarity index 96%
rename from src/providers/sh/commands/bin/deploy.js
rename to src/providers/sh/commands/deploy.js
index 323be8b..06a06e8 100644
--- a/src/providers/sh/commands/bin/deploy.js
+++ b/src/providers/sh/commands/deploy.js
@@ -16,21 +16,21 @@ const { write: copy } = require('clipboardy')
 const inquirer = require('inquirer')
 
 // Ours
-const Logger = require('../lib/build-logger')
-const Now = require('../lib')
-const toHumanPath = require('../../../../util/humanize-path')
-const { handleError, error } = require('../lib/error')
-const { fromGit, isRepoPath, gitPathParts } = require('../lib/git')
-const readMetaData = require('../lib/read-metadata')
-const checkPath = require('../lib/check-path')
-const logo = require('../../../../util/output/logo')
-const cmd = require('../../../../util/output/cmd')
-const info = require('../../../../util/output/info')
-const wait = require('../../../../util/output/wait')
-const NowPlans = require('../lib/plans')
-const promptBool = require('../../../../util/input/prompt-bool')
-const promptOptions = require('../lib/prompt-options')
-const note = require('../../../../util/output/note')
+const Logger = require('../util/build-logger')
+const Now = require('../util')
+const toHumanPath = require('../../../util/humanize-path')
+const { handleError, error } = require('../util/error')
+const { fromGit, isRepoPath, gitPathParts } = require('../util/git')
+const readMetaData = require('../util/read-metadata')
+const checkPath = require('../util/check-path')
+const logo = require('../../../util/output/logo')
+const cmd = require('../../../util/output/cmd')
+const info = require('../../../util/output/info')
+const wait = require('../../../util/output/wait')
+const NowPlans = require('../util/plans')
+const promptBool = require('../../../util/input/prompt-bool')
+const promptOptions = require('../util/prompt-options')
+const note = require('../../../util/output/note')
 
 const mriOpts = {
   string: ['config', 'token', 'name', 'alias', 'session-affinity'],
@@ -204,7 +204,7 @@ const envFields = async list => {
   }
 
   // eslint-disable-next-line import/no-unassigned-import
-  require('../../../../util/input/patch-inquirer')
+  require('../../../util/input/patch-inquirer')
 
   console.log(
     info('Please enter the values for the following environment variables:')
diff --git a/src/providers/sh/commands/bin/dns.js b/src/providers/sh/commands/dns.js
similarity index 95%
rename from src/providers/sh/commands/bin/dns.js
rename to src/providers/sh/commands/dns.js
index 5bee13b..1d27a60 100644
--- a/src/providers/sh/commands/bin/dns.js
+++ b/src/providers/sh/commands/dns.js
@@ -7,14 +7,14 @@ const ms = require('ms')
 const table = require('text-table')
 
 // Utilities
-const DomainRecords = require('../lib/domain-records')
-const indent = require('../lib/indent')
-const strlen = require('../lib/strlen')
-const { handleError, error } = require('../lib/error')
-const exit = require('../lib/utils/exit')
-const logo = require('../lib/utils/output/logo')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const DomainRecords = require('../util/domain-records')
+const indent = require('../util/indent')
+const strlen = require('../util/strlen')
+const { handleError, error } = require('../util/error')
+const exit = require('../util/etc/exit')
+const logo = require('../util/etc/output/logo')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/domains.js b/src/providers/sh/commands/domains.js
similarity index 96%
rename from src/providers/sh/commands/bin/domains.js
rename to src/providers/sh/commands/domains.js
index 2a3bb6d..b6edbeb 100644
--- a/src/providers/sh/commands/bin/domains.js
+++ b/src/providers/sh/commands/domains.js
@@ -8,16 +8,16 @@ const psl = require('psl')
 const table = require('text-table')
 
 // Utilities
-const NowDomains = require('../lib/domains')
-const exit = require('../lib/utils/exit')
-const logo = require('../lib/utils/output/logo')
-const promptBool = require('../lib/utils/input/prompt-bool')
-const strlen = require('../lib/strlen')
-const toHost = require('../lib/to-host')
-const { handleError, error } = require('../lib/error')
+const NowDomains = require('../util/domains')
+const exit = require('../util/etc/exit')
+const logo = require('../util/etc/output/logo')
+const promptBool = require('../util/etc/input/prompt-bool')
+const strlen = require('../util/strlen')
+const toHost = require('../util/to-host')
+const { handleError, error } = require('../util/error')
 const buy = require('./domains/buy')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/domains/buy.js b/src/providers/sh/commands/domains/buy.js
similarity index 80%
rename from src/providers/sh/commands/bin/domains/buy.js
rename to src/providers/sh/commands/domains/buy.js
index 46ef7d6..a858674 100644
--- a/src/providers/sh/commands/bin/domains/buy.js
+++ b/src/providers/sh/commands/domains/buy.js
@@ -2,17 +2,17 @@
 const { italic, bold } = require('chalk')
 
 // Utilities
-const error = require('../../lib/utils/output/error')
-const wait = require('../../lib/utils/output/wait')
-const cmd = require('../../lib/utils/output/cmd')
-const param = require('../../lib/utils/output/param')
-const info = require('../../lib/utils/output/info')
-const success = require('../../lib/utils/output/success')
-const stamp = require('../../lib/utils/output/stamp')
-const promptBool = require('../../lib/utils/input/prompt-bool')
-const eraseLines = require('../../lib/utils/output/erase-lines')
-const treatBuyError = require('../../lib/utils/domains/treat-buy-error')
-const NowCreditCards = require('../../lib/credit-cards')
+const error = require('../../util/etc/output/error')
+const wait = require('../../util/etc/output/wait')
+const cmd = require('../../util/etc/output/cmd')
+const param = require('../../util/etc/output/param')
+const info = require('../../util/etc/output/info')
+const success = require('../../util/etc/output/success')
+const stamp = require('../../util/etc/output/stamp')
+const promptBool = require('../../util/etc/input/prompt-bool')
+const eraseLines = require('../../util/etc/output/erase-lines')
+const treatBuyError = require('../../util/etc/domains/treat-buy-error')
+const NowCreditCards = require('../../util/credit-cards')
 const addBilling = require('../billing/add')
 
 module.exports = async function({ domains, args, currentTeam, user, coupon }) {
diff --git a/src/providers/sh/commands/lib/ua.js b/src/providers/sh/commands/lib/ua.js
deleted file mode 100755
index 65084d4..0000000
--- a/src/providers/sh/commands/lib/ua.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Native
-const os = require('os')
-
-// Ours
-const {version} = require('../../../../util/pkg')
-
-module.exports = `now ${version} node-${process.version} ${os.platform()} (${os.arch()})`
diff --git a/src/providers/sh/commands/bin/list.js b/src/providers/sh/commands/list.js
similarity index 95%
rename from src/providers/sh/commands/bin/list.js
rename to src/providers/sh/commands/list.js
index bcc7f00..035a4d6 100644
--- a/src/providers/sh/commands/bin/list.js
+++ b/src/providers/sh/commands/list.js
@@ -9,12 +9,12 @@ require('epipebomb')()
 const supportsColor = require('supports-color')
 
 // Utilities
-const Now = require('../lib')
-const { handleError, error } = require('../lib/error')
-const logo = require('../lib/utils/output/logo')
-const sort = require('../lib/sort-deployments')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const Now = require('../util')
+const { handleError, error } = require('../util/error')
+const logo = require('../util/etc/output/logo')
+const sort = require('../util/sort-deployments')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/login.js b/src/providers/sh/commands/login.js
similarity index 88%
rename from src/providers/sh/commands/bin/login.js
rename to src/providers/sh/commands/login.js
index 5d07621..a80d19f 100644
--- a/src/providers/sh/commands/bin/login.js
+++ b/src/providers/sh/commands/login.js
@@ -10,26 +10,26 @@ const ms = require('ms')
 const { validate: validateEmail } = require('email-validator')
 
 // ours
-const { version } = require('../../util/pkg')
-const ua = require('../../util/ua')
-const error = require('../../../../util/output/error')
-const aborted = require('../../../../util/output/aborted')
-const wait = require('../../../../util/output/wait')
-const highlight = require('../../../../util/output/highlight')
-const info = require('../../../../util/output/info')
-const ok = require('../../../../util/output/ok')
-const cmd = require('../../../../util/output/cmd')
-const ready = require('../../../../util/output/ready')
-const param = require('../../../../util/output/param')
-const eraseLines = require('../../../../util/output/erase-lines')
-const sleep = require('../../../../util/sleep')
-const getUser = require('../../util/get-user')
+const { version } = require('../../../util/pkg')
+const ua = require('../util/ua')
+const error = require('../../../util/output/error')
+const aborted = require('../../../util/output/aborted')
+const wait = require('../../../util/output/wait')
+const highlight = require('../../../util/output/highlight')
+const info = require('../../../util/output/info')
+const ok = require('../../../util/output/ok')
+const cmd = require('../../../util/output/cmd')
+const ready = require('../../../util/output/ready')
+const param = require('../../../util/output/param')
+const eraseLines = require('../../../util/output/erase-lines')
+const sleep = require('../../../util/sleep')
+const getUser = require('../util/get-user')
 const {
   writeToAuthConfigFile,
   writeToConfigFile
-} = require('../../../../util/config-files')
-const getNowDir = require('../../../../get-now-dir')
-const hp = require('../../../../util/humanize-path')
+} = require('../../../util/config-files')
+const getNowDir = require('../../../get-now-dir')
+const hp = require('../../../util/humanize-path')
 
 // POSTs to /now/registration – either creates an account or performs a login
 // returns {token, securityCode}
diff --git a/src/providers/sh/commands/bin/logout.js b/src/providers/sh/commands/logout.js
similarity index 95%
rename from src/providers/sh/commands/bin/logout.js
rename to src/providers/sh/commands/logout.js
index 5e6ffae..c6f44e3 100644
--- a/src/providers/sh/commands/bin/logout.js
+++ b/src/providers/sh/commands/logout.js
@@ -7,14 +7,14 @@ const fetch = require('node-fetch')
 const ora = require('ora')
 
 // Utilities
-const logo = require('../lib/utils/output/logo')
-const { handleError } = require('../lib/error')
+const logo = require('../util/etc/output/logo')
+const { handleError } = require('../util/error')
 const {
   readConfigFile,
   writeToConfigFile,
   readAuthConfigFile,
   writeToAuthConfigFile
-} = require('../../../../util/config-files')
+} = require('../../../util/config-files')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/logs.js b/src/providers/sh/commands/logs.js
similarity index 95%
rename from src/providers/sh/commands/bin/logs.js
rename to src/providers/sh/commands/logs.js
index daa281f..add61a2 100644
--- a/src/providers/sh/commands/bin/logs.js
+++ b/src/providers/sh/commands/logs.js
@@ -10,13 +10,13 @@ const dateformat = require('dateformat')
 const io = require('socket.io-client')
 
 // Utilities
-const Now = require('../lib')
-const { handleError, error } = require('../lib/error')
-const logo = require('../lib/utils/output/logo')
-const { compare, deserialize } = require('../lib/logs')
-const { maybeURL, normalizeURL, parseInstanceURL } = require('../lib/utils/url')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const Now = require('../util')
+const { handleError, error } = require('../util/error')
+const logo = require('../util/etc/output/logo')
+const { compare, deserialize } = require('../util/logs')
+const { maybeURL, normalizeURL, parseInstanceURL } = require('../util/etc/url')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/remove.js b/src/providers/sh/commands/remove.js
similarity index 94%
rename from src/providers/sh/commands/bin/remove.js
rename to src/providers/sh/commands/remove.js
index ab2efc6..5d36214 100644
--- a/src/providers/sh/commands/bin/remove.js
+++ b/src/providers/sh/commands/remove.js
@@ -7,12 +7,12 @@ const ms = require('ms')
 const table = require('text-table')
 
 // Utilities
-const Now = require('../lib')
-const { handleError, error } = require('../lib/error')
-const logo = require('../lib/utils/output/logo')
-const { normalizeURL } = require('../lib/utils/url')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const Now = require('../util')
+const { handleError, error } = require('../util/error')
+const logo = require('../util/etc/output/logo')
+const { normalizeURL } = require('../util/etc/url')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/scale.js b/src/providers/sh/commands/scale.js
similarity index 95%
rename from src/providers/sh/commands/bin/scale.js
rename to src/providers/sh/commands/scale.js
index 3d7f890..33caad0 100644
--- a/src/providers/sh/commands/bin/scale.js
+++ b/src/providers/sh/commands/scale.js
@@ -10,15 +10,15 @@ require('epipebomb')()
 const supportsColor = require('supports-color')
 
 // Utilities
-const { handleError, error } = require('../lib/error')
-const NowScale = require('../lib/scale')
-const exit = require('../lib/utils/exit')
-const logo = require('../lib/utils/output/logo')
-const info = require('../lib/scale-info')
-const sort = require('../lib/sort-deployments')
-const success = require('../lib/utils/output/success')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const { handleError, error } = require('../util/error')
+const NowScale = require('../util/scale')
+const exit = require('../util/etc/exit')
+const logo = require('../util/etc/output/logo')
+const info = require('../util/scale-info')
+const sort = require('../util/sort-deployments')
+const success = require('../util/etc/output/success')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/secrets.js b/src/providers/sh/commands/secrets.js
similarity index 95%
rename from src/providers/sh/commands/bin/secrets.js
rename to src/providers/sh/commands/secrets.js
index b375b5d..7221454 100644
--- a/src/providers/sh/commands/bin/secrets.js
+++ b/src/providers/sh/commands/secrets.js
@@ -7,13 +7,13 @@ const minimist = require('minimist')
 const ms = require('ms')
 
 // Utilities
-const strlen = require('../lib/strlen')
-const { handleError, error } = require('../lib/error')
-const NowSecrets = require('../lib/secrets')
-const exit = require('../lib/utils/exit')
-const logo = require('../lib/utils/output/logo')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const strlen = require('../util/strlen')
+const { handleError, error } = require('../util/error')
+const NowSecrets = require('../util/secrets')
+const exit = require('../util/etc/exit')
+const logo = require('../util/etc/output/logo')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/teams.js b/src/providers/sh/commands/teams.js
similarity index 91%
rename from src/providers/sh/commands/bin/teams.js
rename to src/providers/sh/commands/teams.js
index 3a22c17..cfdbfeb 100644
--- a/src/providers/sh/commands/bin/teams.js
+++ b/src/providers/sh/commands/teams.js
@@ -5,17 +5,17 @@ const chalk = require('chalk')
 const minimist = require('minimist')
 
 // Utilities
-const error = require('../lib/utils/output/error')
-const NowTeams = require('../lib/teams')
-const logo = require('../lib/utils/output/logo')
-const exit = require('../lib/utils/exit')
-const { handleError } = require('../lib/error')
+const error = require('../util/etc/output/error')
+const NowTeams = require('../util/teams')
+const logo = require('../util/etc/output/logo')
+const exit = require('../util/etc/exit')
+const { handleError } = require('../util/error')
 const list = require('./teams/list')
 const add = require('./teams/add')
 const change = require('./teams/switch')
 const invite = require('./teams/invite')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/commands/bin/teams/add.js b/src/providers/sh/commands/teams/add.js
similarity index 80%
rename from src/providers/sh/commands/bin/teams/add.js
rename to src/providers/sh/commands/teams/add.js
index 6404219..6db6c01 100644
--- a/src/providers/sh/commands/bin/teams/add.js
+++ b/src/providers/sh/commands/teams/add.js
@@ -2,20 +2,20 @@
 const chalk = require('chalk')
 
 // Utilities
-const stamp = require('../../lib/utils/output/stamp')
-const info = require('../../lib/utils/output/info')
-const error = require('../../lib/utils/output/error')
-const wait = require('../../lib/utils/output/wait')
-const rightPad = require('../../lib/utils/output/right-pad')
-const eraseLines = require('../../lib/utils/output/erase-lines')
-const { tick } = require('../../lib/utils/output/chars')
-const success = require('../../lib/utils/output/success')
-const cmd = require('../../lib/utils/output/cmd')
-const note = require('../../lib/utils/output/note')
-const uid = require('../../lib/utils/output/uid')
-const textInput = require('../../lib/utils/input/text')
-const exit = require('../../lib/utils/exit')
-const cfg = require('../../lib/cfg')
+const stamp = require('../../util/etc/output/stamp')
+const info = require('../../util/etc/output/info')
+const error = require('../../util/etc/output/error')
+const wait = require('../../util/etc/output/wait')
+const rightPad = require('../../util/etc/output/right-pad')
+const eraseLines = require('../../util/etc/output/erase-lines')
+const { tick } = require('../../util/etc/output/chars')
+const success = require('../../util/etc/output/success')
+const cmd = require('../../util/etc/output/cmd')
+const note = require('../../util/etc/output/note')
+const uid = require('../../util/etc/output/uid')
+const textInput = require('../../util/etc/input/text')
+const exit = require('../../util/etc/exit')
+const cfg = require('../../util/cfg')
 const invite = require('./invite')
 
 function validateSlugKeypress(data, value) {
diff --git a/src/providers/sh/commands/bin/teams/invite.js b/src/providers/sh/commands/teams/invite.js
similarity index 82%
rename from src/providers/sh/commands/bin/teams/invite.js
rename to src/providers/sh/commands/teams/invite.js
index 06e8882..054dd04 100644
--- a/src/providers/sh/commands/bin/teams/invite.js
+++ b/src/providers/sh/commands/teams/invite.js
@@ -2,20 +2,20 @@
 const chalk = require('chalk')
 
 // Utilities
-const regexes = require('../../lib/utils/input/regexes')
-const wait = require('../../lib/utils/output/wait')
-const cfg = require('../../lib/cfg')
-const fatalError = require('../../lib/utils/fatal-error')
-const cmd = require('../../lib/utils/output/cmd')
-const info = require('../../lib/utils/output/info')
-const stamp = require('../../lib/utils/output/stamp')
-const param = require('../../lib/utils/output/param')
-const { tick } = require('../../lib/utils/output/chars')
-const rightPad = require('../../lib/utils/output/right-pad')
-const textInput = require('../../lib/utils/input/text')
-const eraseLines = require('../../lib/utils/output/erase-lines')
-const success = require('../../lib/utils/output/success')
-const error = require('../../lib/utils/output/error')
+const regexes = require('../../util/etc/input/regexes')
+const wait = require('../../util/etc/output/wait')
+const cfg = require('../../util/cfg')
+const fatalError = require('../../util/etc/fatal-error')
+const cmd = require('../../util/etc/output/cmd')
+const info = require('../../util/etc/output/info')
+const stamp = require('../../util/etc/output/stamp')
+const param = require('../../util/etc/output/param')
+const { tick } = require('../../util/etc/output/chars')
+const rightPad = require('../../util/etc/output/right-pad')
+const textInput = require('../../util/etc/input/text')
+const eraseLines = require('../../util/etc/output/erase-lines')
+const success = require('../../util/etc/output/success')
+const error = require('../../util/etc/output/error')
 
 function validateEmail(data) {
   return regexes.email.test(data.trim()) || data.length === 0
diff --git a/src/providers/sh/commands/bin/teams/list.js b/src/providers/sh/commands/teams/list.js
similarity index 80%
rename from src/providers/sh/commands/bin/teams/list.js
rename to src/providers/sh/commands/teams/list.js
index a295e6c..65aead1 100644
--- a/src/providers/sh/commands/bin/teams/list.js
+++ b/src/providers/sh/commands/teams/list.js
@@ -2,12 +2,12 @@
 const chalk = require('chalk')
 
 // Utilities
-const wait = require('../../lib/utils/output/wait')
-const cfg = require('../../lib/cfg')
-const info = require('../../lib/utils/output/info')
-const error = require('../../lib/utils/output/error')
-const { tick: tickChar } = require('../../lib/utils/output/chars')
-const table = require('../../lib/utils/output/table')
+const wait = require('../../util/etc/output/wait')
+const cfg = require('../../util/cfg')
+const info = require('../../util/etc/output/info')
+const error = require('../../util/etc/output/error')
+const { tick: tickChar } = require('../../util/etc/output/chars')
+const table = require('../../util/etc/output/table')
 
 module.exports = async function({ teams, token }) {
   const stopSpinner = wait('Fetching teams')
diff --git a/src/providers/sh/commands/bin/teams/switch.js b/src/providers/sh/commands/teams/switch.js
similarity index 87%
rename from src/providers/sh/commands/bin/teams/switch.js
rename to src/providers/sh/commands/teams/switch.js
index ddffe60..6ed44e8 100644
--- a/src/providers/sh/commands/bin/teams/switch.js
+++ b/src/providers/sh/commands/teams/switch.js
@@ -2,14 +2,14 @@
 const chalk = require('chalk')
 
 // Utilities
-const wait = require('../../lib/utils/output/wait')
-const listInput = require('../../lib/utils/input/list')
-const cfg = require('../../lib/cfg')
-const exit = require('../../lib/utils/exit')
-const success = require('../../lib/utils/output/success')
-const info = require('../../lib/utils/output/info')
-const error = require('../../lib/utils/output/error')
-const param = require('../../lib/utils/output/param')
+const wait = require('../../util/etc/output/wait')
+const listInput = require('../../util/etc/input/list')
+const cfg = require('../../util/cfg')
+const exit = require('../../util/etc/exit')
+const success = require('../../util/etc/output/success')
+const info = require('../../util/etc/output/info')
+const error = require('../../util/etc/output/error')
+const param = require('../../util/etc/output/param')
 
 async function updateCurrentTeam({ cfg, newTeam } = {}) {
   delete newTeam.created
diff --git a/src/providers/sh/commands/bin/upgrade.js b/src/providers/sh/commands/upgrade.js
similarity index 91%
rename from src/providers/sh/commands/bin/upgrade.js
rename to src/providers/sh/commands/upgrade.js
index 2aa4c74..8bc7615 100644
--- a/src/providers/sh/commands/bin/upgrade.js
+++ b/src/providers/sh/commands/upgrade.js
@@ -6,17 +6,17 @@ const minimist = require('minimist')
 const ms = require('ms')
 
 // Utilities
-const NowPlans = require('../lib/plans')
-const indent = require('../lib/indent')
-const listInput = require('../lib/utils/input/list')
-const code = require('../lib/utils/output/code')
-const error = require('../lib/utils/output/error')
-const success = require('../lib/utils/output/success')
-const cmd = require('../lib/utils/output/cmd')
-const logo = require('../lib/utils/output/logo')
-const { handleError } = require('../lib/error')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const NowPlans = require('../util/plans')
+const indent = require('../util/indent')
+const listInput = require('../util/etc/input/list')
+const code = require('../util/etc/output/code')
+const error = require('../util/etc/output/error')
+const success = require('../util/etc/output/success')
+const cmd = require('../util/etc/output/cmd')
+const logo = require('../util/etc/output/logo')
+const { handleError } = require('../util/error')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const { bold } = chalk
 
diff --git a/src/providers/sh/commands/bin/whoami.js b/src/providers/sh/commands/whoami.js
similarity index 87%
rename from src/providers/sh/commands/bin/whoami.js
rename to src/providers/sh/commands/whoami.js
index bb22da0..d6b96eb 100644
--- a/src/providers/sh/commands/bin/whoami.js
+++ b/src/providers/sh/commands/whoami.js
@@ -5,10 +5,10 @@ const minimist = require('minimist')
 const chalk = require('chalk')
 
 // Utilities
-const logo = require('../lib/utils/output/logo')
-const { handleError } = require('../lib/error')
-const getWelcome = require('../../../../get-welcome')
-const providers = require('../../../')
+const logo = require('../util/etc/output/logo')
+const { handleError } = require('../util/error')
+const getWelcome = require('../../../get-welcome')
+const providers = require('../../')
 
 const help = () => {
   console.log(`
diff --git a/src/providers/sh/index.js b/src/providers/sh/index.js
index 0695221..c62aa3d 100644
--- a/src/providers/sh/index.js
+++ b/src/providers/sh/index.js
@@ -57,7 +57,7 @@ for (const subcommand of mainCommands) {
   for (const handler of handlers) {
     Object.defineProperty(details, handler, {
       get() {
-        return require(`./commands/bin/${subcommand}`)
+        return require(`./commands/${subcommand}`)
       }
     })
   }
diff --git a/src/providers/sh/commands/lib/agent.js b/src/providers/sh/util/agent.js
similarity index 100%
rename from src/providers/sh/commands/lib/agent.js
rename to src/providers/sh/util/agent.js
diff --git a/src/providers/sh/commands/lib/alias.js b/src/providers/sh/util/alias.js
similarity index 97%
rename from src/providers/sh/commands/lib/alias.js
rename to src/providers/sh/util/alias.js
index ccbf6b6..8b3b8ce 100755
--- a/src/providers/sh/commands/lib/alias.js
+++ b/src/providers/sh/util/alias.js
@@ -7,22 +7,22 @@ const chalk = require('chalk')
 const { write: copy } = require('clipboardy')
 
 // Ours
-const promptBool = require('../lib/utils/input/prompt-bool')
-const info = require('../lib/utils/output/info')
-const param = require('../lib/utils/output/param')
-const wait = require('../lib/utils/output/wait')
-const success = require('../lib/utils/output/success')
-const uid = require('../lib/utils/output/uid')
-const eraseLines = require('../lib/utils/output/erase-lines')
-const stamp = require('../lib/utils/output/stamp')
-const error = require('../lib/utils/output/error')
-const treatBuyError = require('../lib/utils/domains/treat-buy-error')
+const promptBool = require('./etc/input/prompt-bool')
+const info = require('./etc/output/info')
+const param = require('./etc/output/param')
+const wait = require('./etc/output/wait')
+const success = require('./etc/output/success')
+const uid = require('./etc/output/uid')
+const eraseLines = require('./etc/output/erase-lines')
+const stamp = require('./etc/output/stamp')
+const error = require('./etc/output/error')
+const treatBuyError = require('./etc/domains/treat-buy-error')
 const scaleInfo = require('./scale-info')
 const { DOMAIN_VERIFICATION_ERROR } = require('./errors')
 const isZeitWorld = require('./is-zeit-world')
 const resolve4 = require('./dns')
 const toHost = require('./to-host')
-const exit = require('./utils/exit')
+const exit = require('./etc/exit')
 const Now = require('./')
 
 const argv = minimist(process.argv.slice(2), {
diff --git a/src/providers/sh/commands/lib/build-logger.js b/src/providers/sh/util/build-logger.js
similarity index 100%
rename from src/providers/sh/commands/lib/build-logger.js
rename to src/providers/sh/util/build-logger.js
diff --git a/src/providers/sh/commands/lib/certs.js b/src/providers/sh/util/certs.js
similarity index 98%
rename from src/providers/sh/commands/lib/certs.js
rename to src/providers/sh/util/certs.js
index 5d6916e..d2ad681 100755
--- a/src/providers/sh/commands/lib/certs.js
+++ b/src/providers/sh/util/certs.js
@@ -1,5 +1,5 @@
 // Ours
-const Now = require('../lib')
+const Now = require('.')
 
 module.exports = class Certs extends Now {
   ls() {
diff --git a/src/providers/sh/commands/lib/cfg.js b/src/providers/sh/util/cfg.js
similarity index 100%
rename from src/providers/sh/commands/lib/cfg.js
rename to src/providers/sh/util/cfg.js
diff --git a/src/providers/sh/commands/lib/check-path.js b/src/providers/sh/util/check-path.js
similarity index 100%
rename from src/providers/sh/commands/lib/check-path.js
rename to src/providers/sh/util/check-path.js
diff --git a/src/providers/sh/commands/lib/credit-cards.js b/src/providers/sh/util/credit-cards.js
similarity index 98%
rename from src/providers/sh/commands/lib/credit-cards.js
rename to src/providers/sh/util/credit-cards.js
index 7feff52..be120f4 100755
--- a/src/providers/sh/commands/lib/credit-cards.js
+++ b/src/providers/sh/util/credit-cards.js
@@ -1,6 +1,6 @@
 const stripe = require('stripe')('pk_live_alyEi3lN0kSwbdevK0nrGwTw')
 
-const Now = require('../lib')
+const Now = require('.')
 
 module.exports = class CreditCards extends Now {
   async ls() {
diff --git a/src/providers/sh/commands/lib/dns.js b/src/providers/sh/util/dns.js
similarity index 100%
rename from src/providers/sh/commands/lib/dns.js
rename to src/providers/sh/util/dns.js
diff --git a/src/providers/sh/commands/lib/domain-records.js b/src/providers/sh/util/domain-records.js
similarity index 99%
rename from src/providers/sh/commands/lib/domain-records.js
rename to src/providers/sh/util/domain-records.js
index a6a86c2..1f64f2a 100755
--- a/src/providers/sh/commands/lib/domain-records.js
+++ b/src/providers/sh/util/domain-records.js
@@ -1,5 +1,5 @@
 // Ours
-const Now = require('../lib')
+const Now = require('.')
 
 module.exports = class DomainRecords extends Now {
   async getRecord(id) {
diff --git a/src/providers/sh/commands/lib/domains.js b/src/providers/sh/util/domains.js
similarity index 98%
rename from src/providers/sh/commands/lib/domains.js
rename to src/providers/sh/util/domains.js
index 4aff710..af8df48 100755
--- a/src/providers/sh/commands/lib/domains.js
+++ b/src/providers/sh/util/domains.js
@@ -5,10 +5,10 @@ const { encode: encodeQuery } = require('querystring')
 const chalk = require('chalk')
 
 // Ours
-const Now = require('../lib')
+const Now = require('.')
 const isZeitWorld = require('./is-zeit-world')
 const { DNS_VERIFICATION_ERROR } = require('./errors')
-const cmd = require('./utils/output/param')
+const cmd = require('./etc/output/param')
 
 const domainRegex = /^((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}$/
 
diff --git a/src/providers/sh/commands/lib/error.js b/src/providers/sh/util/error.js
similarity index 94%
rename from src/providers/sh/commands/lib/error.js
rename to src/providers/sh/util/error.js
index 1802096..00902bf 100755
--- a/src/providers/sh/commands/lib/error.js
+++ b/src/providers/sh/util/error.js
@@ -3,8 +3,8 @@ const ms = require('ms')
 const chalk = require('chalk')
 
 // Utilities
-const error = require('../../../../util/output/error')
-const info = require('../../../../util/output/info')
+const error = require('../../../util/output/error')
+const info = require('../../../util/output/info')
 
 function handleError(err, { debug = false } = {}) {
   // Coerce Strings to Error instances
diff --git a/src/providers/sh/commands/lib/errors.js b/src/providers/sh/util/errors.js
similarity index 100%
rename from src/providers/sh/commands/lib/errors.js
rename to src/providers/sh/util/errors.js
diff --git a/src/providers/sh/commands/lib/utils/billing/card-brands.json b/src/providers/sh/util/etc/billing/card-brands.json
similarity index 100%
rename from src/providers/sh/commands/lib/utils/billing/card-brands.json
rename to src/providers/sh/util/etc/billing/card-brands.json
diff --git a/src/providers/sh/commands/lib/utils/billing/country-list.json b/src/providers/sh/util/etc/billing/country-list.json
similarity index 100%
rename from src/providers/sh/commands/lib/utils/billing/country-list.json
rename to src/providers/sh/util/etc/billing/country-list.json
diff --git a/src/providers/sh/commands/lib/utils/billing/geocode.js b/src/providers/sh/util/etc/billing/geocode.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/billing/geocode.js
rename to src/providers/sh/util/etc/billing/geocode.js
diff --git a/src/providers/sh/commands/lib/utils/check-path.js b/src/providers/sh/util/etc/check-path.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/check-path.js
rename to src/providers/sh/util/etc/check-path.js
diff --git a/src/providers/sh/commands/lib/utils/domains/treat-buy-error.js b/src/providers/sh/util/etc/domains/treat-buy-error.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/domains/treat-buy-error.js
rename to src/providers/sh/util/etc/domains/treat-buy-error.js
diff --git a/src/providers/sh/commands/lib/utils/exit.js b/src/providers/sh/util/etc/exit.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/exit.js
rename to src/providers/sh/util/etc/exit.js
diff --git a/src/providers/sh/commands/lib/utils/fatal-error.js b/src/providers/sh/util/etc/fatal-error.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/fatal-error.js
rename to src/providers/sh/util/etc/fatal-error.js
diff --git a/src/providers/sh/commands/lib/utils/input/list.js b/src/providers/sh/util/etc/input/list.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/input/list.js
rename to src/providers/sh/util/etc/input/list.js
diff --git a/src/providers/sh/commands/lib/utils/input/patch-inquirer.js b/src/providers/sh/util/etc/input/patch-inquirer.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/input/patch-inquirer.js
rename to src/providers/sh/util/etc/input/patch-inquirer.js
diff --git a/src/providers/sh/commands/lib/utils/input/prompt-bool.js b/src/providers/sh/util/etc/input/prompt-bool.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/input/prompt-bool.js
rename to src/providers/sh/util/etc/input/prompt-bool.js
diff --git a/src/providers/sh/commands/lib/prompt-options.js b/src/providers/sh/util/etc/input/prompt-options.js
old mode 100644
new mode 100755
similarity index 100%
rename from src/providers/sh/commands/lib/prompt-options.js
rename to src/providers/sh/util/etc/input/prompt-options.js
diff --git a/src/providers/sh/commands/lib/utils/input/regexes.js b/src/providers/sh/util/etc/input/regexes.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/input/regexes.js
rename to src/providers/sh/util/etc/input/regexes.js
diff --git a/src/providers/sh/commands/lib/utils/input/text.js b/src/providers/sh/util/etc/input/text.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/input/text.js
rename to src/providers/sh/util/etc/input/text.js
diff --git a/src/providers/sh/commands/lib/utils/output/chars.js b/src/providers/sh/util/etc/output/chars.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/chars.js
rename to src/providers/sh/util/etc/output/chars.js
diff --git a/src/providers/sh/commands/lib/utils/output/cmd.js b/src/providers/sh/util/etc/output/cmd.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/cmd.js
rename to src/providers/sh/util/etc/output/cmd.js
diff --git a/src/providers/sh/commands/lib/utils/output/code.js b/src/providers/sh/util/etc/output/code.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/code.js
rename to src/providers/sh/util/etc/output/code.js
diff --git a/src/providers/sh/commands/lib/utils/output/erase-lines.js b/src/providers/sh/util/etc/output/erase-lines.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/erase-lines.js
rename to src/providers/sh/util/etc/output/erase-lines.js
diff --git a/src/providers/sh/commands/lib/utils/output/error.js b/src/providers/sh/util/etc/output/error.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/error.js
rename to src/providers/sh/util/etc/output/error.js
diff --git a/src/providers/sh/commands/lib/utils/output/info.js b/src/providers/sh/util/etc/output/info.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/info.js
rename to src/providers/sh/util/etc/output/info.js
diff --git a/src/providers/sh/commands/lib/utils/output/logo.js b/src/providers/sh/util/etc/output/logo.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/logo.js
rename to src/providers/sh/util/etc/output/logo.js
diff --git a/src/providers/sh/commands/lib/utils/output/note.js b/src/providers/sh/util/etc/output/note.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/note.js
rename to src/providers/sh/util/etc/output/note.js
diff --git a/src/providers/sh/commands/lib/utils/output/param.js b/src/providers/sh/util/etc/output/param.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/param.js
rename to src/providers/sh/util/etc/output/param.js
diff --git a/src/providers/sh/commands/lib/utils/output/right-pad.js b/src/providers/sh/util/etc/output/right-pad.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/right-pad.js
rename to src/providers/sh/util/etc/output/right-pad.js
diff --git a/src/providers/sh/commands/lib/utils/output/stamp.js b/src/providers/sh/util/etc/output/stamp.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/stamp.js
rename to src/providers/sh/util/etc/output/stamp.js
diff --git a/src/providers/sh/commands/lib/utils/output/success.js b/src/providers/sh/util/etc/output/success.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/success.js
rename to src/providers/sh/util/etc/output/success.js
diff --git a/src/providers/sh/commands/lib/utils/output/table.js b/src/providers/sh/util/etc/output/table.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/table.js
rename to src/providers/sh/util/etc/output/table.js
diff --git a/src/providers/sh/commands/lib/utils/output/uid.js b/src/providers/sh/util/etc/output/uid.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/uid.js
rename to src/providers/sh/util/etc/output/uid.js
diff --git a/src/providers/sh/commands/lib/utils/output/wait.js b/src/providers/sh/util/etc/output/wait.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/output/wait.js
rename to src/providers/sh/util/etc/output/wait.js
diff --git a/src/providers/sh/commands/lib/utils/to-human-path.js b/src/providers/sh/util/etc/to-human-path.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/to-human-path.js
rename to src/providers/sh/util/etc/to-human-path.js
diff --git a/src/providers/sh/commands/lib/utils/url.js b/src/providers/sh/util/etc/url.js
similarity index 100%
rename from src/providers/sh/commands/lib/utils/url.js
rename to src/providers/sh/util/etc/url.js
diff --git a/src/providers/sh/commands/lib/get-files.js b/src/providers/sh/util/get-files.js
similarity index 100%
rename from src/providers/sh/commands/lib/get-files.js
rename to src/providers/sh/util/get-files.js
diff --git a/src/providers/sh/commands/lib/git.js b/src/providers/sh/util/git.js
similarity index 100%
rename from src/providers/sh/commands/lib/git.js
rename to src/providers/sh/util/git.js
diff --git a/src/providers/sh/commands/lib/hash.js b/src/providers/sh/util/hash.js
similarity index 100%
rename from src/providers/sh/commands/lib/hash.js
rename to src/providers/sh/util/hash.js
diff --git a/src/providers/sh/commands/lib/ignored.js b/src/providers/sh/util/ignored.js
similarity index 100%
rename from src/providers/sh/commands/lib/ignored.js
rename to src/providers/sh/util/ignored.js
diff --git a/src/providers/sh/commands/lib/indent.js b/src/providers/sh/util/indent.js
similarity index 100%
rename from src/providers/sh/commands/lib/indent.js
rename to src/providers/sh/util/indent.js
diff --git a/src/providers/sh/commands/lib/index.js b/src/providers/sh/util/index.js
similarity index 99%
rename from src/providers/sh/commands/lib/index.js
rename to src/providers/sh/util/index.js
index b3a70ee..c337426 100755
--- a/src/providers/sh/commands/lib/index.js
+++ b/src/providers/sh/util/index.js
@@ -22,7 +22,7 @@ const {
   npm: getNpmFiles,
   docker: getDockerFiles
 } = require('./get-files')
-const ua = require('../../util/ua')
+const ua = require('./ua')
 const hash = require('./hash')
 const Agent = require('./agent')
 const toHost = require('./to-host')
diff --git a/src/providers/sh/commands/lib/is-zeit-world.js b/src/providers/sh/util/is-zeit-world.js
similarity index 100%
rename from src/providers/sh/commands/lib/is-zeit-world.js
rename to src/providers/sh/util/is-zeit-world.js
diff --git a/src/providers/sh/commands/lib/logs.js b/src/providers/sh/util/logs.js
similarity index 100%
rename from src/providers/sh/commands/lib/logs.js
rename to src/providers/sh/util/logs.js
diff --git a/src/providers/sh/util/pkg.js b/src/providers/sh/util/pkg.js
deleted file mode 100644
index 261bb4c..0000000
--- a/src/providers/sh/util/pkg.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const path = require('path')
-const pkg = require('../../../../package.json')
-
-try {
-  const distDir = path.dirname(process.execPath)
-  pkg._npmPkg = require(path.join(distDir, '../../package.json'))
-} catch (err) {
-  pkg._npmPkg = null
-}
-
-module.exports = pkg
diff --git a/src/providers/sh/commands/lib/plans.js b/src/providers/sh/util/plans.js
similarity index 97%
rename from src/providers/sh/commands/lib/plans.js
rename to src/providers/sh/util/plans.js
index 6351312..6aedab5 100755
--- a/src/providers/sh/commands/lib/plans.js
+++ b/src/providers/sh/util/plans.js
@@ -1,6 +1,6 @@
 const ms = require('ms')
 
-const Now = require('../lib')
+const Now = require('.')
 
 async function parsePlan(json) {
   const { subscription } = json
diff --git a/src/providers/sh/commands/lib/utils/input/prompt-options.js b/src/providers/sh/util/prompt-options.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/providers/sh/commands/lib/utils/input/prompt-options.js
rename to src/providers/sh/util/prompt-options.js
diff --git a/src/providers/sh/commands/lib/re-alias.js b/src/providers/sh/util/re-alias.js
similarity index 100%
rename from src/providers/sh/commands/lib/re-alias.js
rename to src/providers/sh/util/re-alias.js
diff --git a/src/providers/sh/commands/lib/read-metadata.js b/src/providers/sh/util/read-metadata.js
similarity index 100%
rename from src/providers/sh/commands/lib/read-metadata.js
rename to src/providers/sh/util/read-metadata.js
diff --git a/src/providers/sh/commands/lib/scale-info.js b/src/providers/sh/util/scale-info.js
similarity index 100%
rename from src/providers/sh/commands/lib/scale-info.js
rename to src/providers/sh/util/scale-info.js
diff --git a/src/providers/sh/commands/lib/scale.js b/src/providers/sh/util/scale.js
similarity index 96%
rename from src/providers/sh/commands/lib/scale.js
rename to src/providers/sh/util/scale.js
index ba577f0..714e13e 100755
--- a/src/providers/sh/commands/lib/scale.js
+++ b/src/providers/sh/util/scale.js
@@ -1,5 +1,5 @@
 // Ours
-const Now = require('../lib')
+const Now = require('.')
 
 module.exports = class Scale extends Now {
   getInstances(id) {
diff --git a/src/providers/sh/commands/lib/secrets.js b/src/providers/sh/util/secrets.js
similarity index 98%
rename from src/providers/sh/commands/lib/secrets.js
rename to src/providers/sh/util/secrets.js
index 898a60c..0ed6a91 100755
--- a/src/providers/sh/commands/lib/secrets.js
+++ b/src/providers/sh/util/secrets.js
@@ -1,5 +1,5 @@
 // Ours
-const Now = require('../lib')
+const Now = require('.')
 
 const isUserError = res => ((res.status / 100) | 0) === 4
 
diff --git a/src/providers/sh/commands/lib/sort-deployments.js b/src/providers/sh/util/sort-deployments.js
similarity index 100%
rename from src/providers/sh/commands/lib/sort-deployments.js
rename to src/providers/sh/util/sort-deployments.js
diff --git a/src/providers/sh/commands/lib/strlen.js b/src/providers/sh/util/strlen.js
similarity index 100%
rename from src/providers/sh/commands/lib/strlen.js
rename to src/providers/sh/util/strlen.js
diff --git a/src/providers/sh/commands/lib/teams.js b/src/providers/sh/util/teams.js
similarity index 99%
rename from src/providers/sh/commands/lib/teams.js
rename to src/providers/sh/util/teams.js
index 794938a..d63933f 100755
--- a/src/providers/sh/commands/lib/teams.js
+++ b/src/providers/sh/util/teams.js
@@ -1,4 +1,4 @@
-const Now = require('../lib')
+const Now = require('.')
 
 module.exports = class Teams extends Now {
   async create({ slug }) {
diff --git a/src/providers/sh/commands/lib/test.js b/src/providers/sh/util/test.js
similarity index 100%
rename from src/providers/sh/commands/lib/test.js
rename to src/providers/sh/util/test.js
diff --git a/src/providers/sh/commands/lib/to-host.js b/src/providers/sh/util/to-host.js
similarity index 100%
rename from src/providers/sh/commands/lib/to-host.js
rename to src/providers/sh/util/to-host.js
diff --git a/src/providers/sh/util/ua.js b/src/providers/sh/util/ua.js
old mode 100644
new mode 100755
index be3995c..264b19c
--- a/src/providers/sh/util/ua.js
+++ b/src/providers/sh/util/ua.js
@@ -1,7 +1,7 @@
-// node
+// Native
 const os = require('os')
 
-// ours
-const { version } = require('./pkg')
+// Ours
+const {version} = require('../../../util/pkg')
 
 module.exports = `now ${version} node-${process.version} ${os.platform()} (${os.arch()})`
diff --git a/src/providers/sh/commands/lib/user.js b/src/providers/sh/util/user.js
similarity index 100%
rename from src/providers/sh/commands/lib/user.js
rename to src/providers/sh/util/user.js