diff --git a/init.lua b/init.lua
index 46a7335..2d2b1d0 100644
--- a/init.lua
+++ b/init.lua
@@ -1,25 +1,19 @@
+require("options")
+require("keymaps")
+
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
+	vim.fn.system({
+		"git",
+		"clone",
+		"--filter=blob:none",
+		"https://github.com/folke/lazy.nvim.git",
+		"--branch=stable", -- latest stable release
+		lazypath,
+	})
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("options")
-require("keymaps")
-require("lazy").setup("plugins")
-require("luasnip.loaders.from_vscode").lazy_load()
-vim.cmd "colorscheme rose-pine"
+require("lazy").setup({ { import = "plugins" }, { import = "plugins.lsp" }, { import = "plugins.themes" } })
 
-require('Comment').setup()
-require("setup/lualine")
-require("setup/bufferline")
-require("setup/nvim-cmp")
-require("setup/lsp")
-require("setup/toggle-diagnostics")
+vim.cmd("colorscheme rose-pine")