diff --git a/.config/nvim/check_plugin_updates.sh b/.config/nvim/check_plugin_updates.sh
index ad29b07..a64251b 100755
--- a/.config/nvim/check_plugin_updates.sh
+++ b/.config/nvim/check_plugin_updates.sh
@@ -9,6 +9,7 @@
 #
 
 PLUGINS_DIR="$HOME/.local/share/nvim/site/pack/packer/start"
+CONF_DIR="$HOME/.config/nvim/lua/core/"
 
 function check_update() {
     local plugin=$1
@@ -24,7 +25,7 @@ function check_update() {
         echo -e "Plugin $plugin has a new version $last_commit (the current version is $current_commit)\n\tURL: $remote_url"
 
         if [[ $update == "--update" ]]; then
-            sed -i "s/$current_commit/$last_commit/" "$HOME/.config/nvim/lua/user/plugins.lua"
+            sed -i "s/$current_commit/$last_commit/" "$CONF_DIR/plugins.lua"
         fi
     else
         echo "Plugin $plugin is up to date."
@@ -34,7 +35,7 @@ function check_update() {
 }
 
 update=${1:-"false"}
-pushd "$HOME/.config/nvim/lua/user" > /dev/null || exit
+pushd "$CONF_DIR" > /dev/null || exit
 
 grep -P "^\t*use.*commit" plugins.lua  | cut -f 2,4 -d "\"" | while IFS= read -r line; do
     plugin=$(echo "$line" | cut -f1 -d "\"" | cut -f2 -d "/")
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 96f3e28..fcdb3b2 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,29 +1,2 @@
-require("user.options")
-require("user.keymaps")
-require("user.plugins")
-require("user.autocommands")
-require("user.commands")
-require("user.colorscheme")
-require("user.cmp")
-require("user.telescope")
-require("user.treesitter")
-require("user.autopairs")
-require("user.comment")
-require("user.gitsigns")
-require("user.neo-tree")
-require("user.bufferline")
-require("user.lualine")
-require("user.impatient")
-require("user.illuminate")
-require("user.indentline")
-require("user.lsp")
-require("user.dap")
-require("user.go")
-require("user.outline")
-require("user.wilder")
-require("user.trouble")
-require("user.autosave")
-require("user.markdowntoc")
-require("user.session-manager")
-require("user.diffview")
-require("user.sad")
+require("core")
+require("plugins")
diff --git a/.config/nvim/lua/user/autocommands.lua b/.config/nvim/lua/core/autocommands.lua
similarity index 100%
rename from .config/nvim/lua/user/autocommands.lua
rename to .config/nvim/lua/core/autocommands.lua
diff --git a/.config/nvim/lua/user/colorscheme.lua b/.config/nvim/lua/core/colorscheme.lua
similarity index 100%
rename from .config/nvim/lua/user/colorscheme.lua
rename to .config/nvim/lua/core/colorscheme.lua
diff --git a/.config/nvim/lua/user/commands.lua b/.config/nvim/lua/core/commands.lua
similarity index 100%
rename from .config/nvim/lua/user/commands.lua
rename to .config/nvim/lua/core/commands.lua
diff --git a/.config/nvim/lua/core/init.lua b/.config/nvim/lua/core/init.lua
new file mode 100644
index 0000000..40914a0
--- /dev/null
+++ b/.config/nvim/lua/core/init.lua
@@ -0,0 +1,6 @@
+require("core.options")
+require("core.keymaps")
+require("core.plugins")
+require("core.autocommands")
+require("core.commands")
+require("core.colorscheme")
diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/core/keymaps.lua
similarity index 100%
rename from .config/nvim/lua/user/keymaps.lua
rename to .config/nvim/lua/core/keymaps.lua
diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/core/options.lua
similarity index 100%
rename from .config/nvim/lua/user/options.lua
rename to .config/nvim/lua/core/options.lua
diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/core/plugins.lua
similarity index 100%
rename from .config/nvim/lua/user/plugins.lua
rename to .config/nvim/lua/core/plugins.lua
diff --git a/.config/nvim/lua/user/autopairs.lua b/.config/nvim/lua/plugins/autopairs.lua
similarity index 100%
rename from .config/nvim/lua/user/autopairs.lua
rename to .config/nvim/lua/plugins/autopairs.lua
diff --git a/.config/nvim/lua/user/autosave.lua b/.config/nvim/lua/plugins/autosave.lua
similarity index 100%
rename from .config/nvim/lua/user/autosave.lua
rename to .config/nvim/lua/plugins/autosave.lua
diff --git a/.config/nvim/lua/user/bufferline.lua b/.config/nvim/lua/plugins/bufferline.lua
similarity index 100%
rename from .config/nvim/lua/user/bufferline.lua
rename to .config/nvim/lua/plugins/bufferline.lua
diff --git a/.config/nvim/lua/user/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
similarity index 100%
rename from .config/nvim/lua/user/cmp.lua
rename to .config/nvim/lua/plugins/cmp.lua
diff --git a/.config/nvim/lua/user/comment.lua b/.config/nvim/lua/plugins/comment.lua
similarity index 100%
rename from .config/nvim/lua/user/comment.lua
rename to .config/nvim/lua/plugins/comment.lua
diff --git a/.config/nvim/lua/user/dap.lua b/.config/nvim/lua/plugins/dap.lua
similarity index 100%
rename from .config/nvim/lua/user/dap.lua
rename to .config/nvim/lua/plugins/dap.lua
diff --git a/.config/nvim/lua/user/diffview.lua b/.config/nvim/lua/plugins/diffview.lua
similarity index 100%
rename from .config/nvim/lua/user/diffview.lua
rename to .config/nvim/lua/plugins/diffview.lua
diff --git a/.config/nvim/lua/user/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua
similarity index 100%
rename from .config/nvim/lua/user/gitsigns.lua
rename to .config/nvim/lua/plugins/gitsigns.lua
diff --git a/.config/nvim/lua/user/go.lua b/.config/nvim/lua/plugins/go.lua
similarity index 100%
rename from .config/nvim/lua/user/go.lua
rename to .config/nvim/lua/plugins/go.lua
diff --git a/.config/nvim/lua/user/illuminate.lua b/.config/nvim/lua/plugins/illuminate.lua
similarity index 100%
rename from .config/nvim/lua/user/illuminate.lua
rename to .config/nvim/lua/plugins/illuminate.lua
diff --git a/.config/nvim/lua/user/impatient.lua b/.config/nvim/lua/plugins/impatient.lua
similarity index 100%
rename from .config/nvim/lua/user/impatient.lua
rename to .config/nvim/lua/plugins/impatient.lua
diff --git a/.config/nvim/lua/user/indentline.lua b/.config/nvim/lua/plugins/indentline.lua
similarity index 100%
rename from .config/nvim/lua/user/indentline.lua
rename to .config/nvim/lua/plugins/indentline.lua
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
new file mode 100644
index 0000000..2fbcbac
--- /dev/null
+++ b/.config/nvim/lua/plugins/init.lua
@@ -0,0 +1,23 @@
+require("plugins.cmp")
+require("plugins.telescope")
+require("plugins.treesitter")
+require("plugins.autopairs")
+require("plugins.comment")
+require("plugins.gitsigns")
+require("plugins.neo-tree")
+require("plugins.bufferline")
+require("plugins.lualine")
+require("plugins.impatient")
+require("plugins.illuminate")
+require("plugins.indentline")
+require("plugins.lsp")
+require("plugins.dap")
+require("plugins.go")
+require("plugins.outline")
+require("plugins.wilder")
+require("plugins.trouble")
+require("plugins.autosave")
+require("plugins.markdowntoc")
+require("plugins.session-manager")
+require("plugins.diffview")
+require("plugins.sad")
diff --git a/.config/nvim/lua/user/lsp/handlers.lua b/.config/nvim/lua/plugins/lsp/handlers.lua
similarity index 100%
rename from .config/nvim/lua/user/lsp/handlers.lua
rename to .config/nvim/lua/plugins/lsp/handlers.lua
diff --git a/.config/nvim/lua/user/lsp/init.lua b/.config/nvim/lua/plugins/lsp/init.lua
similarity index 57%
rename from .config/nvim/lua/user/lsp/init.lua
rename to .config/nvim/lua/plugins/lsp/init.lua
index 26eb4ca..72f3778 100644
--- a/.config/nvim/lua/user/lsp/init.lua
+++ b/.config/nvim/lua/plugins/lsp/init.lua
@@ -3,8 +3,8 @@ if not status_ok then
 	return
 end
 
-require("user.lsp.mason")
-require("user.lsp.handlers").setup()
-require("user.lsp.null-ls")
+require("plugins.lsp.mason")
+require("plugins.lsp.handlers").setup()
+require("plugins.lsp.null-ls")
 
 win.default_options.border = "rounded"
diff --git a/.config/nvim/lua/user/lsp/mason.lua b/.config/nvim/lua/plugins/lsp/mason.lua
similarity index 79%
rename from .config/nvim/lua/user/lsp/mason.lua
rename to .config/nvim/lua/plugins/lsp/mason.lua
index 3376b94..fe61fcb 100644
--- a/.config/nvim/lua/user/lsp/mason.lua
+++ b/.config/nvim/lua/plugins/lsp/mason.lua
@@ -36,13 +36,13 @@ local opts = {}
 
 for _, server in pairs(servers) do
 	opts = {
-		on_attach = require("user.lsp.handlers").on_attach,
-		capabilities = require("user.lsp.handlers").capabilities,
+		on_attach = require("plugins.lsp.handlers").on_attach,
+		capabilities = require("plugins.lsp.handlers").capabilities,
 	}
 
 	server = vim.split(server, "@")[1]
 
-	local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server)
+	local require_ok, conf_opts = pcall(require, "plugins.lsp.settings." .. server)
 	if require_ok then
 		opts = vim.tbl_deep_extend("force", conf_opts, opts)
 	end
diff --git a/.config/nvim/lua/user/lsp/null-ls.lua b/.config/nvim/lua/plugins/lsp/null-ls.lua
similarity index 100%
rename from .config/nvim/lua/user/lsp/null-ls.lua
rename to .config/nvim/lua/plugins/lsp/null-ls.lua
diff --git a/.config/nvim/lua/user/lsp/settings/sumneko_lua.lua b/.config/nvim/lua/plugins/lsp/settings/sumneko_lua.lua
similarity index 100%
rename from .config/nvim/lua/user/lsp/settings/sumneko_lua.lua
rename to .config/nvim/lua/plugins/lsp/settings/sumneko_lua.lua
diff --git a/.config/nvim/lua/user/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
similarity index 100%
rename from .config/nvim/lua/user/lualine.lua
rename to .config/nvim/lua/plugins/lualine.lua
diff --git a/.config/nvim/lua/user/markdowntoc.lua b/.config/nvim/lua/plugins/markdowntoc.lua
similarity index 100%
rename from .config/nvim/lua/user/markdowntoc.lua
rename to .config/nvim/lua/plugins/markdowntoc.lua
diff --git a/.config/nvim/lua/user/neo-tree.lua b/.config/nvim/lua/plugins/neo-tree.lua
similarity index 100%
rename from .config/nvim/lua/user/neo-tree.lua
rename to .config/nvim/lua/plugins/neo-tree.lua
diff --git a/.config/nvim/lua/user/outline.lua b/.config/nvim/lua/plugins/outline.lua
similarity index 100%
rename from .config/nvim/lua/user/outline.lua
rename to .config/nvim/lua/plugins/outline.lua
diff --git a/.config/nvim/lua/user/sad.lua b/.config/nvim/lua/plugins/sad.lua
similarity index 100%
rename from .config/nvim/lua/user/sad.lua
rename to .config/nvim/lua/plugins/sad.lua
diff --git a/.config/nvim/lua/user/session-manager.lua b/.config/nvim/lua/plugins/session-manager.lua
similarity index 100%
rename from .config/nvim/lua/user/session-manager.lua
rename to .config/nvim/lua/plugins/session-manager.lua
diff --git a/.config/nvim/lua/user/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
similarity index 100%
rename from .config/nvim/lua/user/telescope.lua
rename to .config/nvim/lua/plugins/telescope.lua
diff --git a/.config/nvim/lua/user/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from .config/nvim/lua/user/treesitter.lua
rename to .config/nvim/lua/plugins/treesitter.lua
diff --git a/.config/nvim/lua/user/trouble.lua b/.config/nvim/lua/plugins/trouble.lua
similarity index 100%
rename from .config/nvim/lua/user/trouble.lua
rename to .config/nvim/lua/plugins/trouble.lua
diff --git a/.config/nvim/lua/user/wilder.lua b/.config/nvim/lua/plugins/wilder.lua
similarity index 100%
rename from .config/nvim/lua/user/wilder.lua
rename to .config/nvim/lua/plugins/wilder.lua