diff --git a/lua/gitsigns.lua b/lua/gitsigns.lua
index 78a786221..79dcf852e 100644
--- a/lua/gitsigns.lua
+++ b/lua/gitsigns.lua
@@ -1,8 +1,8 @@
 local async = require('gitsigns.async')
 local log = require('gitsigns.debug.log')
+local Config = require('gitsigns.config')
 
-local gs_config = require('gitsigns.config')
-local config = gs_config.config
+local config = Config.config
 
 local api = vim.api
 local uv = vim.uv or vim.loop
@@ -204,7 +204,7 @@ end
 --- @param cfg table|nil Configuration for Gitsigns.
 ---     See |gitsigns-usage| for more details.
 function M.setup(cfg)
-  gs_config.build(cfg)
+  Config.build(cfg)
 
   if vim.fn.executable('git') == 0 then
     print('gitsigns: git not in path. Aborting setup')
diff --git a/lua/gitsigns/actions.lua b/lua/gitsigns/actions.lua
index a7dc4bbd5..e3065436c 100644
--- a/lua/gitsigns/actions.lua
+++ b/lua/gitsigns/actions.lua
@@ -1,16 +1,14 @@
 local async = require('gitsigns.async')
-local config = require('gitsigns.config').config
-local mk_repeatable = require('gitsigns.repeat').mk_repeatable
+local git = require('gitsigns.git')
+local Hunks = require('gitsigns.hunks')
+local manager = require('gitsigns.manager')
 local popup = require('gitsigns.popup')
 local util = require('gitsigns.util')
-local manager = require('gitsigns.manager')
-local git = require('gitsigns.git')
 local run_diff = require('gitsigns.diff')
 
-local gs_cache = require('gitsigns.cache')
-local cache = gs_cache.cache
-
-local Hunks = require('gitsigns.hunks')
+local config = require('gitsigns.config').config
+local mk_repeatable = require('gitsigns.repeat').mk_repeatable
+local cache = require('gitsigns.cache').cache
 
 local api = vim.api
 local current_buf = api.nvim_get_current_buf
@@ -416,7 +414,6 @@ end)
 ---     {async}
 M.stage_buffer = async.create(function()
   local bufnr = current_buf()
-
   local bcache = cache[bufnr]
   if not bcache then
     return
diff --git a/lua/gitsigns/attach.lua b/lua/gitsigns/attach.lua
index 7947d6a35..60b33687f 100644
--- a/lua/gitsigns/attach.lua
+++ b/lua/gitsigns/attach.lua
@@ -1,20 +1,15 @@
+local Status = require('gitsigns.status')
 local async = require('gitsigns.async')
 local git = require('gitsigns.git')
-
-local manager = require('gitsigns.manager')
-
+local Cache = require('gitsigns.cache')
 local log = require('gitsigns.debug.log')
-local dprintf = log.dprintf
-local dprint = log.dprint
-
-local gs_cache = require('gitsigns.cache')
-local cache = gs_cache.cache
-local Status = require('gitsigns.status')
-
-local config = require('gitsigns.config').config
-
+local manager = require('gitsigns.manager')
 local util = require('gitsigns.util')
 
+local cache = Cache.cache
+local config = require('gitsigns.config').config
+local dprint = log.dprint
+local dprintf = log.dprintf
 local throttle_by_id = require('gitsigns.debounce').throttle_by_id
 
 local api = vim.api
@@ -323,7 +318,7 @@ local attach_throttled = throttle_by_id(function(cbuf, ctx, aucmd)
     return
   end
 
-  cache[cbuf] = gs_cache.new({
+  cache[cbuf] = Cache.new({
     bufnr = cbuf,
     file = file,
     git_obj = git_obj,
@@ -395,7 +390,7 @@ function M.detach(bufnr, _keep_signs)
   -- Clear status variables
   Status:clear(bufnr)
 
-  gs_cache.destroy(bufnr)
+  Cache.destroy(bufnr)
 end
 
 --- Attach Gitsigns to the buffer.
diff --git a/lua/gitsigns/blame.lua b/lua/gitsigns/blame.lua
index c2f8b70a3..0fc425863 100644
--- a/lua/gitsigns/blame.lua
+++ b/lua/gitsigns/blame.lua
@@ -1,11 +1,9 @@
-local api = vim.api
-
+local async = require('gitsigns.async')
 local cache = require('gitsigns.cache').cache
+local log = require('gitsigns.debug.log')
 local util = require('gitsigns.util')
-local async = require('gitsigns.async')
 
-local log = require('gitsigns.debug.log')
-local dprint = log.dprint
+local api = vim.api
 
 local hash_colors = {} --- @type table<integer,string>
 
@@ -253,7 +251,7 @@ M.blame = function()
   local win = api.nvim_get_current_win()
   local bcache = cache[bufnr]
   if not bcache then
-    dprint('Not attached')
+    log.dprint('Not attached')
     return
   end
 
diff --git a/lua/gitsigns/cli.lua b/lua/gitsigns/cli.lua
index 8638493e6..9a52973ff 100644
--- a/lua/gitsigns/cli.lua
+++ b/lua/gitsigns/cli.lua
@@ -1,20 +1,16 @@
+local actions = require('gitsigns.actions')
+local argparse = require('gitsigns.cli.argparse')
 local async = require('gitsigns.async')
-
+local attach = require('gitsigns.attach')
+local Debug = require('gitsigns.debug')
 local log = require('gitsigns.debug.log')
-local dprintf = log.dprintf
 local message = require('gitsigns.message')
 
-local parse_args = require('gitsigns.cli.argparse').parse_args
-
-local actions = require('gitsigns.actions')
-local attach = require('gitsigns.attach')
-local gs_debug = require('gitsigns.debug')
-
 --- @type table<table<string,function>,boolean>
 local sources = {
   [actions] = true,
   [attach] = false,
-  [gs_debug] = false,
+  [Debug] = false,
 }
 
 -- try to parse each argument as a lua boolean, nil or number, if fails then
@@ -64,7 +60,7 @@ end
 
 M.run = async.create(1, function(params)
   local __FUNC__ = 'cli.run'
-  local pos_args_raw, named_args_raw = parse_args(params.args)
+  local pos_args_raw, named_args_raw = argparse.parse_args(params.args)
 
   local func = pos_args_raw[1]
 
@@ -79,7 +75,7 @@ M.run = async.create(1, function(params)
   local named_args = vim.tbl_map(parse_to_lua, named_args_raw)
   local args = vim.tbl_extend('error', pos_args, named_args)
 
-  dprintf(
+  log.dprintf(
     "Running action '%s' with arguments %s",
     func,
     vim.inspect(args, { newline = ' ', indent = '' })
diff --git a/lua/gitsigns/current_line_blame.lua b/lua/gitsigns/current_line_blame.lua
index 965d5705c..1f56454ce 100644
--- a/lua/gitsigns/current_line_blame.lua
+++ b/lua/gitsigns/current_line_blame.lua
@@ -1,15 +1,14 @@
 local async = require('gitsigns.async')
+local debounce = require('gitsigns.debounce')
+local util = require('gitsigns.util')
+
 local cache = require('gitsigns.cache').cache
 local config = require('gitsigns.config').config
 local schema = require('gitsigns.config').schema
-local util = require('gitsigns.util')
-
 local error_once = require('gitsigns.message').error_once
 
 local api = vim.api
 
-local debounce = require('gitsigns.debounce')
-
 local namespace = api.nvim_create_namespace('gitsigns_blame')
 
 local M = {}
diff --git a/lua/gitsigns/debounce.lua b/lua/gitsigns/debounce.lua
index f0d5c3ccc..3d2dc8cb8 100644
--- a/lua/gitsigns/debounce.lua
+++ b/lua/gitsigns/debounce.lua
@@ -1,4 +1,4 @@
-local uv = vim.loop
+local uv = vim.uv or vim.loop
 
 local M = {}
 
diff --git a/lua/gitsigns/diff_ext.lua b/lua/gitsigns/diff_ext.lua
index 794a0683e..9309ccf55 100644
--- a/lua/gitsigns/diff_ext.lua
+++ b/lua/gitsigns/diff_ext.lua
@@ -1,9 +1,9 @@
-local config = require('gitsigns.config').config
-local git_diff = require('gitsigns.git').diff
-
-local gs_hunks = require('gitsigns.hunks')
+local Hunks = require('gitsigns.hunks')
 local util = require('gitsigns.util')
+
 local scheduler = require('gitsigns.async').scheduler
+local config = require('gitsigns.config').config
+local git_diff = require('gitsigns.git').diff
 
 local M = {}
 -- Async function
@@ -61,7 +61,7 @@ function M.run_diff(text_cmp, text_buf)
 
   for _, line in ipairs(out) do
     if vim.startswith(line, '@@') then
-      results[#results + 1] = gs_hunks.parse_diff_line(line)
+      results[#results + 1] = Hunks.parse_diff_line(line)
     elseif #results > 0 then
       local r = results[#results]
       if line:sub(1, 1) == '-' then
diff --git a/lua/gitsigns/diff_int.lua b/lua/gitsigns/diff_int.lua
index 658cc0b84..bb8b5c221 100644
--- a/lua/gitsigns/diff_int.lua
+++ b/lua/gitsigns/diff_int.lua
@@ -1,6 +1,7 @@
+local async = require('gitsigns.async')
+
 local create_hunk = require('gitsigns.hunks').create_hunk
 local config = require('gitsigns.config').config
-local async = require('gitsigns.async')
 
 local M = {}
 
diff --git a/lua/gitsigns/diffthis.lua b/lua/gitsigns/diffthis.lua
index 0649ee36e..1c26d613b 100644
--- a/lua/gitsigns/diffthis.lua
+++ b/lua/gitsigns/diffthis.lua
@@ -1,15 +1,15 @@
-local api = vim.api
-
 local async = require('gitsigns.async')
-local cache = require('gitsigns.cache').cache
-local util = require('gitsigns.util')
 local manager = require('gitsigns.manager')
 local message = require('gitsigns.message')
+local util = require('gitsigns.util')
 local Status = require('gitsigns.status')
 
+local cache = require('gitsigns.cache').cache
 local dprint = require('gitsigns.debug.log').dprint
 local throttle_by_id = require('gitsigns.debounce').throttle_by_id
 
+local api = vim.api
+
 local M = {}
 
 --- @async
diff --git a/lua/gitsigns/git.lua b/lua/gitsigns/git.lua
index 387b02cd8..7c4abbddb 100644
--- a/lua/gitsigns/git.lua
+++ b/lua/gitsigns/git.lua
@@ -1,9 +1,9 @@
 local async = require('gitsigns.async')
-local scheduler = require('gitsigns.async').scheduler
-
 local log = require('gitsigns.debug.log')
 local util = require('gitsigns.util')
+
 local system = require('gitsigns.system').system
+local scheduler = require('gitsigns.async').scheduler
 
 local uv = vim.uv or vim.loop
 
diff --git a/lua/gitsigns/manager.lua b/lua/gitsigns/manager.lua
index e4a9f4b56..6a25f8b07 100644
--- a/lua/gitsigns/manager.lua
+++ b/lua/gitsigns/manager.lua
@@ -1,22 +1,15 @@
 local async = require('gitsigns.async')
-
-local gs_cache = require('gitsigns.cache')
-local cache = gs_cache.cache
-
+local log = require('gitsigns.debug.log')
+local util = require('gitsigns.util')
+local run_diff = require('gitsigns.diff')
+local Hunks = require('gitsigns.hunks')
 local Signs = require('gitsigns.signs')
 local Status = require('gitsigns.status')
 
 local debounce_trailing = require('gitsigns.debounce').debounce_trailing
 local throttle_by_id = require('gitsigns.debounce').throttle_by_id
 
-local log = require('gitsigns.debug.log')
-local dprint = log.dprint
-
-local util = require('gitsigns.util')
-local run_diff = require('gitsigns.diff')
-
-local gs_hunks = require('gitsigns.hunks')
-
+local cache = require('gitsigns.cache').cache
 local config = require('gitsigns.config').config
 
 local api = vim.api
@@ -49,12 +42,12 @@ local function apply_win_signs0(bufnr, signs, hunks, top, bot, clear, untracked)
     if clear and i == 1 then
       signs:add(
         bufnr,
-        gs_hunks.calc_signs(hunk, next, hunk.added.start, hunk.added.start, untracked)
+        Hunks.calc_signs(hunk, next, hunk.added.start, hunk.added.start, untracked)
       )
     end
 
     if top <= hunk.vend and bot >= hunk.added.start then
-      signs:add(bufnr, gs_hunks.calc_signs(hunk, next, top, bot, untracked))
+      signs:add(bufnr, Hunks.calc_signs(hunk, next, top, bot, untracked))
     end
     if hunk.added.start > bot then
       break
@@ -103,7 +96,7 @@ end
 function M.on_lines(buf, first, last_orig, last_new)
   local bcache = cache[buf]
   if not bcache then
-    dprint('Cache for buffer was nil. Detaching')
+    log.dprint('Cache for buffer was nil. Detaching')
     return true
   end
 
@@ -155,7 +148,7 @@ local function apply_word_diff(bufnr, row)
 
   local lnum = row + 1
 
-  local hunk = gs_hunks.find_hunk(lnum, bcache.hunks)
+  local hunk = Hunks.find_hunk(lnum, bcache.hunks)
   if not hunk then
     -- No hunk at line
     return
@@ -434,15 +427,15 @@ end
 function M.schedule(bufnr, check_compare_text)
   async.scheduler()
   if not api.nvim_buf_is_valid(bufnr) then
-    dprint('Buffer not valid, aborting')
+    log.dprint('Buffer not valid, aborting')
     return false
   end
   if not cache[bufnr] then
-    dprint('Has detached, aborting')
+    log.dprint('Has detached, aborting')
     return false
   end
   if check_compare_text and not cache[bufnr].compare_text then
-    dprint('compare_text was invalid, aborting')
+    log.dprint('compare_text was invalid, aborting')
     return false
   end
   return true
@@ -494,15 +487,15 @@ M.update = throttle_by_id(function(bufnr)
     if not M.schedule(bufnr) then
       return
     end
-    bcache.hunks_staged = gs_hunks.filter_common(hunks_head, bcache.hunks)
+    bcache.hunks_staged = Hunks.filter_common(hunks_head, bcache.hunks)
   end
 
   -- Note the decoration provider may have invalidated bcache.hunks at this
   -- point
   if
     bcache.force_next_update
-    or gs_hunks.compare_heads(bcache.hunks, old_hunks)
-    or gs_hunks.compare_heads(bcache.hunks_staged, old_hunks_staged)
+    or Hunks.compare_heads(bcache.hunks, old_hunks)
+    or Hunks.compare_heads(bcache.hunks_staged, old_hunks_staged)
   then
     -- Apply signs to the window. Other signs will be added by the decoration
     -- provider as they are drawn.
@@ -511,7 +504,7 @@ M.update = throttle_by_id(function(bufnr)
     update_show_deleted(bufnr)
     bcache.force_next_update = false
 
-    local summary = gs_hunks.get_summary(bcache.hunks)
+    local summary = Hunks.get_summary(bcache.hunks)
     summary.head = git_obj.repo.abbrev_head
     Status:update(bufnr, summary)
   end
diff --git a/lua/gitsigns/popup.lua b/lua/gitsigns/popup.lua
index ea47eb794..29b42bc85 100644
--- a/lua/gitsigns/popup.lua
+++ b/lua/gitsigns/popup.lua
@@ -1,7 +1,7 @@
-local M = {}
-
 local api = vim.api
 
+local M = {}
+
 --- @param bufnr integer
 --- @param lines string[]
 --- @return integer
diff --git a/lua/gitsigns/watcher.lua b/lua/gitsigns/watcher.lua
index ae469a4e1..a8b25c619 100644
--- a/lua/gitsigns/watcher.lua
+++ b/lua/gitsigns/watcher.lua
@@ -1,10 +1,10 @@
 local api = vim.api
 local uv = vim.loop
 
-local Status = require('gitsigns.status')
 local async = require('gitsigns.async')
 local log = require('gitsigns.debug.log')
 local util = require('gitsigns.util')
+local Status = require('gitsigns.status')
 
 local cache = require('gitsigns.cache').cache
 local config = require('gitsigns.config').config