diff --git a/neovim/.config/nvim/lua/user/aus.lua b/neovim/.config/nvim/after/plugin/aus.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/aus.lua
rename to neovim/.config/nvim/after/plugin/aus.lua
diff --git a/neovim/.config/nvim/lua/user/cmds.lua b/neovim/.config/nvim/after/plugin/cmds.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/cmds.lua
rename to neovim/.config/nvim/after/plugin/cmds.lua
diff --git a/neovim/.config/nvim/lua/user/comment.lua b/neovim/.config/nvim/after/plugin/comment.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/comment.lua
rename to neovim/.config/nvim/after/plugin/comment.lua
diff --git a/neovim/.config/nvim/lua/user/comp.lua b/neovim/.config/nvim/after/plugin/comp.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/comp.lua
rename to neovim/.config/nvim/after/plugin/comp.lua
diff --git a/neovim/.config/nvim/lua/user/file-tree.lua b/neovim/.config/nvim/after/plugin/file-tree.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/file-tree.lua
rename to neovim/.config/nvim/after/plugin/file-tree.lua
diff --git a/neovim/.config/nvim/lua/user/gitsigns.lua b/neovim/.config/nvim/after/plugin/gitsigns.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/gitsigns.lua
rename to neovim/.config/nvim/after/plugin/gitsigns.lua
diff --git a/neovim/.config/nvim/lua/user/lsp.lua b/neovim/.config/nvim/after/plugin/lsp.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/lsp.lua
rename to neovim/.config/nvim/after/plugin/lsp.lua
diff --git a/neovim/.config/nvim/lua/user/lualine.lua b/neovim/.config/nvim/after/plugin/lualine.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/lualine.lua
rename to neovim/.config/nvim/after/plugin/lualine.lua
diff --git a/neovim/.config/nvim/lua/user/options.lua b/neovim/.config/nvim/after/plugin/options.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/options.lua
rename to neovim/.config/nvim/after/plugin/options.lua
diff --git a/neovim/.config/nvim/lua/user/remaps.lua b/neovim/.config/nvim/after/plugin/remaps.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/remaps.lua
rename to neovim/.config/nvim/after/plugin/remaps.lua
diff --git a/neovim/.config/nvim/lua/user/session.lua b/neovim/.config/nvim/after/plugin/session.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/session.lua
rename to neovim/.config/nvim/after/plugin/session.lua
diff --git a/neovim/.config/nvim/lua/user/snippets.lua b/neovim/.config/nvim/after/plugin/snippets.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/snippets.lua
rename to neovim/.config/nvim/after/plugin/snippets.lua
diff --git a/neovim/.config/nvim/lua/user/telescope.lua b/neovim/.config/nvim/after/plugin/telescope.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/telescope.lua
rename to neovim/.config/nvim/after/plugin/telescope.lua
diff --git a/neovim/.config/nvim/lua/user/theme.lua b/neovim/.config/nvim/after/plugin/theme.lua
similarity index 57%
rename from neovim/.config/nvim/lua/user/theme.lua
rename to neovim/.config/nvim/after/plugin/theme.lua
index 0982b3a..271d683 100644
--- a/neovim/.config/nvim/lua/user/theme.lua
+++ b/neovim/.config/nvim/after/plugin/theme.lua
@@ -6,6 +6,15 @@ vim.api.nvim_set_hl(0, "SpellBad", {
   fg = "red",
 })
 
+vim.api.nvim_set_hl(0, "IndentBlanklineChar", {
+  fg = "#373737",
+  bg = "none",
+})
+vim.api.nvim_set_hl(0, "IndentBlanklineContextChar", {
+  fg = "#808080",
+  bg = "none",
+})
+
 vim.cmd([[
 colorscheme gruvbox-material
 hi clear SignColumn
diff --git a/neovim/.config/nvim/lua/user/treesitter.lua b/neovim/.config/nvim/after/plugin/treesitter.lua
similarity index 100%
rename from neovim/.config/nvim/lua/user/treesitter.lua
rename to neovim/.config/nvim/after/plugin/treesitter.lua
diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua
index f7db2cc..fcb118b 100644
--- a/neovim/.config/nvim/init.lua
+++ b/neovim/.config/nvim/init.lua
@@ -180,28 +180,7 @@ require("packer").startup(function(use)
   end
 end)
 
-vim.cmd([[
-  hi IndentBlanklineChar guifg=#373737 guibg=none gui=none
-  hi IndentBlanklineContextChar guifg=#808080 guibg=none gui=none
-]])
-
 vim.g.mapleader = " "
-
-require("user.options")
-require("user.theme")
+vim.opt.termguicolors = true
 
 require("nvim-autopairs").setup({})
-
-require("user.file-tree")
-require("user.treesitter")
-require("user.telescope")
-require("user.gitsigns")
-require("user.comp")
-require("user.lsp")
-require("user.comment")
-require("user.snippets")
-require("user.lualine")
-require("user.session")
-require("user.remaps")
-require("user.cmds")
-require("user.aus")