diff --git a/init.lua b/init.lua
index 9b704154..0ab991fd 100644
--- a/init.lua
+++ b/init.lua
@@ -450,8 +450,17 @@ require('lazy').setup({
   --  Here are some example plugins that I've included in the kickstart repository.
   --  Uncomment any of the lines below to enable them (you will need to restart nvim).
   --
-  -- require 'kickstart.plugins.debug',
-  -- require 'kickstart.plugins.indent_line',
+  require 'kickstart.plugins.autopairs',
+  require 'kickstart.plugins.conform',
+  require 'kickstart.plugins.dap',
+  require 'kickstart.plugins.debug',
+  require 'kickstart.plugins.fzf-telescope',
+  require 'kickstart.plugins.indent_line',
+  require 'kickstart.plugins.lsp-config',
+  require 'kickstart.plugins.mini',
+  require 'kickstart.plugins.nvim-cmp',
+  require 'kickstart.plugins.treesitter',
+  require 'kickstart.plugins.vim-fugitive',
 
   -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`.
   --    For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
diff --git a/lua/custom/plugins/autopairs.lua b/lua/kickstart/plugins/autopairs.lua
similarity index 57%
rename from lua/custom/plugins/autopairs.lua
rename to lua/kickstart/plugins/autopairs.lua
index e2cf4a31..3807819d 100644
--- a/lua/custom/plugins/autopairs.lua
+++ b/lua/kickstart/plugins/autopairs.lua
@@ -1,13 +1,11 @@
--- File: lua/custom/plugins/autopairs.lua
-
 return {
   'windwp/nvim-autopairs',
   event = 'InsertEnter',
-  -- config = true,
-  -- use opts = {} for passing setup options
-  -- this is equivalent to setup({}) function
-  opts = {},
+  -- Optional dependency
+  dependencies = { 'hrsh7th/nvim-cmp' },
   config = function()
+    require('nvim-autopairs').setup {}
+    -- If you want to automatically add `(` after selecting a function or method
     local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
     local cmp = require 'cmp'
     cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
diff --git a/lua/custom/plugins/conform.lua b/lua/kickstart/plugins/conform.lua
similarity index 100%
rename from lua/custom/plugins/conform.lua
rename to lua/kickstart/plugins/conform.lua
diff --git a/lua/custom/plugins/dap.lua b/lua/kickstart/plugins/dap.lua
similarity index 100%
rename from lua/custom/plugins/dap.lua
rename to lua/kickstart/plugins/dap.lua
diff --git a/lua/custom/plugins/fzf-telescope.lua b/lua/kickstart/plugins/fzf-telescope.lua
similarity index 100%
rename from lua/custom/plugins/fzf-telescope.lua
rename to lua/kickstart/plugins/fzf-telescope.lua
diff --git a/lua/custom/plugins/lsp-config.lua b/lua/kickstart/plugins/lsp-config.lua
similarity index 100%
rename from lua/custom/plugins/lsp-config.lua
rename to lua/kickstart/plugins/lsp-config.lua
diff --git a/lua/custom/plugins/mini.lua b/lua/kickstart/plugins/mini.lua
similarity index 100%
rename from lua/custom/plugins/mini.lua
rename to lua/kickstart/plugins/mini.lua
diff --git a/lua/custom/plugins/nvim-cmp.lua b/lua/kickstart/plugins/nvim-cmp.lua
similarity index 100%
rename from lua/custom/plugins/nvim-cmp.lua
rename to lua/kickstart/plugins/nvim-cmp.lua
diff --git a/lua/custom/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua
similarity index 100%
rename from lua/custom/plugins/treesitter.lua
rename to lua/kickstart/plugins/treesitter.lua
diff --git a/lua/custom/plugins/vim-fugitive.lua b/lua/kickstart/plugins/vim-fugitive.lua
similarity index 100%
rename from lua/custom/plugins/vim-fugitive.lua
rename to lua/kickstart/plugins/vim-fugitive.lua