diff --git a/nvim/.config/nvim/lua/modules/asyncdo.lua b/nvim/.config/nvim/after/plugin/asyncdo.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/asyncdo.lua
rename to nvim/.config/nvim/after/plugin/asyncdo.lua
diff --git a/nvim/.config/nvim/lua/modules/better-whitespace.lua b/nvim/.config/nvim/after/plugin/better-whitespace.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/better-whitespace.lua
rename to nvim/.config/nvim/after/plugin/better-whitespace.lua
diff --git a/nvim/.config/nvim/lua/modules/completion.lua b/nvim/.config/nvim/after/plugin/completion.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/completion.lua
rename to nvim/.config/nvim/after/plugin/completion.lua
diff --git a/nvim/.config/nvim/lua/modules/easyalign.lua b/nvim/.config/nvim/after/plugin/easyalign.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/easyalign.lua
rename to nvim/.config/nvim/after/plugin/easyalign.lua
diff --git a/nvim/.config/nvim/lua/modules/floaterm.lua b/nvim/.config/nvim/after/plugin/floaterm.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/floaterm.lua
rename to nvim/.config/nvim/after/plugin/floaterm.lua
diff --git a/nvim/.config/nvim/lua/modules/fzf-preview.lua b/nvim/.config/nvim/after/plugin/fzf-preview.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/fzf-preview.lua
rename to nvim/.config/nvim/after/plugin/fzf-preview.lua
diff --git a/nvim/.config/nvim/lua/modules/statusline.lua b/nvim/.config/nvim/after/plugin/galaxyline.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/statusline.lua
rename to nvim/.config/nvim/after/plugin/galaxyline.lua
diff --git a/nvim/.config/nvim/lua/modules/signify.lua b/nvim/.config/nvim/after/plugin/signify.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/signify.lua
rename to nvim/.config/nvim/after/plugin/signify.lua
diff --git a/nvim/.config/nvim/lua/modules/sneak.lua b/nvim/.config/nvim/after/plugin/sneak.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/sneak.lua
rename to nvim/.config/nvim/after/plugin/sneak.lua
diff --git a/nvim/.config/nvim/lua/modules/togglelist.lua b/nvim/.config/nvim/after/plugin/togglelist.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/togglelist.lua
rename to nvim/.config/nvim/after/plugin/togglelist.lua
diff --git a/nvim/.config/nvim/lua/modules/which_key.lua b/nvim/.config/nvim/after/plugin/which_key.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/which_key.lua
rename to nvim/.config/nvim/after/plugin/which_key.lua
diff --git a/nvim/.config/nvim/lua/modules/workspace.lua b/nvim/.config/nvim/after/plugin/workspace.lua
similarity index 100%
rename from nvim/.config/nvim/lua/modules/workspace.lua
rename to nvim/.config/nvim/after/plugin/workspace.lua
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index df84916..3876c3b 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -5,10 +5,7 @@ vim.cmd 'packadd packer.nvim'
 local init = function ()
   use {'wbthomason/packer.nvim', opt = true}
   -- Vertical Motion
-  use {
-    'justinmk/vim-sneak',
-    config = "require('modules.sneak')"
-  }
+  use 'justinmk/vim-sneak'
   -- Search
   use {
     'junegunn/fzf',
@@ -19,25 +16,13 @@ local init = function ()
   use 'lambdalisue/reword.vim'
   use 'bronson/vim-visual-star-search'
   -- Remove extraneous whitespace when edit mode is exited
-  use {
-    'ntpeters/vim-better-whitespace',
-    config = "require('modules.better-whitespace')"
-  }
+  use 'ntpeters/vim-better-whitespace'
   -- Manage Project sessions
-  use {
-    'thaerkh/vim-workspace',
-    config = "require('modules.workspace')"
-  }
+  use 'thaerkh/vim-workspace'
   -- For autocompletion
-  use {
-    'hrsh7th/nvim-compe',
-    config = "require('modules.completion')"
-  }
+  use 'hrsh7th/nvim-compe'
   -- Git support
-  use {
-    'mhinz/vim-signify',
-    config =  "require('modules.signify')"
-  }
+  use 'mhinz/vim-signify'
   use 'tpope/vim-fugitive'
   use 'rhysd/git-messenger.vim'
   use 'whiteinge/diffconflicts'
@@ -50,21 +35,12 @@ local init = function ()
     cmd = 'Neoformat'
   }
   -- Run things async
-  use {
-    'hauleth/asyncdo.vim',
-    config = "require('modules.asyncdo')"
-  }
+  use 'hauleth/asyncdo.vim'
   -- Quickfix
   use 'yssl/QFEnter'
   use 'ronakg/quickr-cscope.vim'
-  use {
-    'milkypostman/vim-togglelist',
-    config = "require('modules.togglelist')"
-  }
-  use {
-    'chengzeyi/fzf-preview.vim',
-    config = "require('modules.fzf-preview')"
-  }
+  use 'milkypostman/vim-togglelist'
+  use 'chengzeyi/fzf-preview.vim'
   -- Text Object plugins
   use {
     'wellle/targets.vim',
@@ -89,22 +65,13 @@ local init = function ()
   -- Directory viewer
   use 'justinmk/vim-dirvish'
   -- Show leader key bindings
-  use {
-    'liuchengxu/vim-which-key',
-    config = "require('modules.which_key')"
-  }
+  use 'liuchengxu/vim-which-key'
   -- Toggle terminal
-  use {
-    'voldikss/vim-floaterm',
-    config = "require('modules.floaterm')"
-  }
+  use 'voldikss/vim-floaterm'
   -- Take care of sudo
   use 'lambdalisue/suda.vim'
   -- Alignment
-  use {
-    'junegunn/vim-easy-align',
-    config = "require('modules.easyalign')"
-  }
+  use 'junegunn/vim-easy-align'
   use 'Rasukarusan/nvim-block-paste'
   use 'nvim-lua/plenary.nvim'
   use {
@@ -145,7 +112,6 @@ local init = function ()
   -- For statusline
   use {
     'glepnir/galaxyline.nvim',
-    config = "require('modules.statusline')",
     requires = { 'kyazdani42/nvim-web-devicons' }
   }
   -- Marks and registers