diff --git a/nvim/.config/nvim/lua/lazy-init.lua b/nvim/.config/nvim/lua/lazy-init.lua
index d16bdc0..264700e 100644
--- a/nvim/.config/nvim/lua/lazy-init.lua
+++ b/nvim/.config/nvim/lua/lazy-init.lua
@@ -18,60 +18,5 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("lazy").setup({
-    -- Sensible defaults
-    "tpope/vim-sensible",
-
-    -- Plenary
-    "nvim-lua/plenary.nvim",
-
-    -- Indent line
-    "lukas-reineke/indent-blankline.nvim",
-
-    -- CSS color
-    "ap/vim-css-color",
-
-    -- Symlink follow
-    --"aymericbeaumet/vim-symlink",
-
-    -- Git
-    "lewis6991/gitsigns.nvim",
-
-    -- Lastplace
-    "farmergreg/vim-lastplace",
-
-    -- Autopair
-    {
-        "windwp/nvim-autopairs",
-        event = "InsertEnter",
-        opts = {},
-    },
-
-    -- Tagbar
-    "preservim/tagbar",
-
-    -- Color scheme
-    "navarasu/onedark.nvim",
-
-    -- Surround
-    "tpope/vim-surround",
-
-    -- Barbar (tabline bar)
-    {
-        "romgrk/barbar.nvim",
-        dependencies = {
-            'lewis6991/gitsigns.nvim',
-            'nvim-tree/nvim-web-devicons',
-        },
-    },
-
-    -- Dashboard (start screen)
-    {
-        'goolord/alpha-nvim',
-        dependencies = { 'nvim-tree/nvim-web-devicons' },
-        config = function ()
-            require'alpha'.setup(require'alpha.themes.startify'.config)
-        end,
-    },
-})
+require("lazy").setup("lazy-plugins")
 
diff --git a/nvim/.config/nvim/lua/lazy-plugins/alpha.lua b/nvim/.config/nvim/lua/lazy-plugins/alpha.lua
new file mode 100644
index 0000000..b11a37b
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/alpha.lua
@@ -0,0 +1,8 @@
+-- Alpha (start screen/dashboard)
+return {
+    "goolord/alpha-nvim",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    config = function ()
+        require"alpha".setup(require"alpha.themes.startify".config)
+    end,
+}
diff --git a/nvim/.config/nvim/lua/lazy-plugins/autopairs.lua b/nvim/.config/nvim/lua/lazy-plugins/autopairs.lua
new file mode 100644
index 0000000..f38f155
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/autopairs.lua
@@ -0,0 +1,6 @@
+-- Autopairs
+return {
+    "windwp/nvim-autopairs",
+    event = "InsertEnter",
+    opts = {},
+} 
diff --git a/nvim/.config/nvim/lua/lazy-plugins/barbar.lua b/nvim/.config/nvim/lua/lazy-plugins/barbar.lua
new file mode 100644
index 0000000..64c90b9
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/barbar.lua
@@ -0,0 +1,8 @@
+-- Barbar (tabline bar)
+return {
+    "romgrk/barbar.nvim",
+    dependencies = {
+        "lewis6991/gitsigns.nvim",
+        "nvim-tree/nvim-web-devicons",
+    },
+}
diff --git a/nvim/.config/nvim/lua/lazy-plugins/css-color.lua b/nvim/.config/nvim/lua/lazy-plugins/css-color.lua
new file mode 100644
index 0000000..f587662
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/css-color.lua
@@ -0,0 +1,6 @@
+-- CSS color
+return {
+    "ap/vim-css-color",
+}
+
+
diff --git a/nvim/.config/nvim/lua/lazy-plugins/git-signs.lua b/nvim/.config/nvim/lua/lazy-plugins/git-signs.lua
new file mode 100644
index 0000000..7052fcb
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/git-signs.lua
@@ -0,0 +1,7 @@
+-- Git signs
+return {
+    "lewis6991/gitsigns.nvim",
+    config = function ()
+        require("gitsigns").setup()
+    end
+}
diff --git a/nvim/.config/nvim/lua/lazy-plugins/indent-blankline.lua b/nvim/.config/nvim/lua/lazy-plugins/indent-blankline.lua
new file mode 100644
index 0000000..f3ae156
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/indent-blankline.lua
@@ -0,0 +1,4 @@
+-- Indent blankline
+return {
+    "lukas-reineke/indent-blankline.nvim",
+}
diff --git a/nvim/.config/nvim/lua/lazy-plugins/lastplace.lua b/nvim/.config/nvim/lua/lazy-plugins/lastplace.lua
new file mode 100644
index 0000000..b31685f
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/lastplace.lua
@@ -0,0 +1,5 @@
+-- Lastplace
+return {
+    "farmergreg/vim-lastplace",
+}
+
diff --git a/nvim/.config/nvim/lua/lazy-plugins/plenary.lua b/nvim/.config/nvim/lua/lazy-plugins/plenary.lua
new file mode 100644
index 0000000..5b8c0e9
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/plenary.lua
@@ -0,0 +1,4 @@
+-- Plenary
+return {
+    "nvim-lua/plenary.nvim",
+}
diff --git a/nvim/.config/nvim/lua/lazy-plugins/surround.lua b/nvim/.config/nvim/lua/lazy-plugins/surround.lua
new file mode 100644
index 0000000..98d8eb4
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/surround.lua
@@ -0,0 +1,4 @@
+-- Surround
+return {
+    "tpope/vim-surround",
+}
diff --git a/nvim/.config/nvim/lua/lazy-plugins/tagbar.lua b/nvim/.config/nvim/lua/lazy-plugins/tagbar.lua
new file mode 100644
index 0000000..24168b6
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/tagbar.lua
@@ -0,0 +1,4 @@
+-- Tagbar
+return {
+    "preservim/tagbar",
+}
diff --git a/nvim/.config/nvim/lua/lazy-plugins/telescope.lua b/nvim/.config/nvim/lua/lazy-plugins/telescope.lua
new file mode 100644
index 0000000..b849bfb
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/telescope.lua
@@ -0,0 +1,25 @@
+-- Telescope
+return {
+    "nvim-telescope/telescope.nvim",
+    dependencies = { 
+        "nvim-lua/plenary.nvim",
+    },
+    keys = {
+        {
+            "<leader>fp",
+            function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
+        },
+        {
+            "<leader>ff",
+            function() require('telescope.builtin').live_grep() end,
+        },
+        {
+            "<leader>fb",
+            function() require('telescope.builtin').buffers() end,
+        },
+        {
+            "<leader>fh",
+            function() require('telescope.builtin').help_tags() end,
+        },
+    },
+}
diff --git a/nvim/.config/nvim/lua/lazy-plugins/theme-onedark.lua b/nvim/.config/nvim/lua/lazy-plugins/theme-onedark.lua
new file mode 100644
index 0000000..90eac19
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/theme-onedark.lua
@@ -0,0 +1,4 @@
+-- Onedark theme
+return {
+    "navarasu/onedark.nvim",
+}
diff --git a/nvim/.config/nvim/lua/lazy-plugins/vim-sensible.lua b/nvim/.config/nvim/lua/lazy-plugins/vim-sensible.lua
new file mode 100644
index 0000000..37ac253
--- /dev/null
+++ b/nvim/.config/nvim/lua/lazy-plugins/vim-sensible.lua
@@ -0,0 +1,4 @@
+-- Sensible defaults
+return {
+    "tpope/vim-sensible",
+}