diff --git a/lua/completion.lua b/lua/completion.lua
deleted file mode 100644
index 1b2aaac..0000000
--- a/lua/completion.lua
+++ /dev/null
@@ -1,73 +0,0 @@
-vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
-vim.opt.shortmess:append 'c'
-
-local lspkind = require 'lspkind'
-lspkind.init {
-  symbol_map = {
-    Copilot = '',
-  },
-  mode = 'symbol',
-}
-vim.api.nvim_set_hl(0, 'CmpItemKindCopilot', { fg = '#6CC644' })
-
-local cmp = require 'cmp'
-
-cmp.setup {
-  sources = {
-    { name = 'copilot' },
-    { name = 'luasnip' },
-    { name = 'nvim_lsp' },
-    { name = 'path' },
-    { name = 'buffer' },
-  },
-  mapping = {
-    ['<C-n>'] = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Insert },
-    ['<C-p>'] = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Insert },
-    ['<C-y>'] = cmp.mapping(
-      cmp.mapping.confirm {
-        behavior = cmp.ConfirmBehavior.Insert,
-        select = true,
-      },
-      { 'i', 'c' }
-    ),
-  },
-
-  -- Enable luasnip to handle snippet expansion for nvim-cmp
-  snippet = {
-    expand = function(args)
-      require('luasnip').lsp_expand(args.body)
-    end,
-  },
-}
-
--- Setup up vim-dadbod
-cmp.setup.filetype({ 'sql' }, {
-  sources = {
-    { name = 'vim-dadbod-completion' },
-    { name = 'buffer' },
-  },
-})
-
-local ls = require 'luasnip'
-ls.config.set_config {
-  history = false,
-  updateevents = 'TextChanged,TextChangedI',
-}
-
-for _, ft_path in ipairs(vim.api.nvim_get_runtime_file('lua/custom/snippets/*.lua', true)) do
-  loadfile(ft_path)()
-end
-
-vim.keymap.set({ 'i', 's' }, '<c-k>', function()
-  if ls.expand_or_jumpable() then
-    ls.expand_or_jump()
-  end
-end, { silent = true })
-
-vim.keymap.set({ 'i', 's' }, '<c-j>', function()
-  if ls.jumpable(-1) then
-    ls.jump(-1)
-  end
-end, { silent = true })
-
-require('luasnip/loaders/from_vscode').lazy_load()
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
index aa00392..b6444f5 100644
--- a/lua/plugins/cmp.lua
+++ b/lua/plugins/cmp.lua
@@ -14,7 +14,79 @@ return {
       'zbirenbaum/copilot-cmp',
     },
     config = function()
-      require 'completion'
+      vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
+      vim.opt.shortmess:append 'c'
+
+      local lspkind = require 'lspkind'
+      lspkind.init {
+        symbol_map = {
+          Copilot = '',
+        },
+        mode = 'symbol',
+      }
+      vim.api.nvim_set_hl(0, 'CmpItemKindCopilot', { fg = '#6CC644' })
+
+      local cmp = require 'cmp'
+
+      cmp.setup {
+        sources = {
+          { name = 'copilot' },
+          { name = 'luasnip' },
+          { name = 'nvim_lsp' },
+          { name = 'path' },
+          { name = 'buffer' },
+        },
+        mapping = {
+          ['<C-n>'] = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Insert },
+          ['<C-p>'] = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Insert },
+          ['<C-y>'] = cmp.mapping(
+            cmp.mapping.confirm {
+              behavior = cmp.ConfirmBehavior.Insert,
+              select = true,
+            },
+            { 'i', 'c' }
+          ),
+        },
+
+        -- Enable luasnip to handle snippet expansion for nvim-cmp
+        snippet = {
+          expand = function(args)
+            require('luasnip').lsp_expand(args.body)
+          end,
+        },
+      }
+
+      -- Setup up vim-dadbod
+      cmp.setup.filetype({ 'sql' }, {
+        sources = {
+          { name = 'vim-dadbod-completion' },
+          { name = 'buffer' },
+        },
+      })
+
+      local ls = require 'luasnip'
+      ls.config.set_config {
+        history = false,
+        updateevents = 'TextChanged,TextChangedI',
+      }
+
+      for _, ft_path in ipairs(vim.api.nvim_get_runtime_file('lua/custom/snippets/*.lua', true)) do
+        loadfile(ft_path)()
+      end
+
+      vim.keymap.set({ 'i', 's' }, '<c-k>', function()
+        if ls.expand_or_jumpable() then
+          ls.expand_or_jump()
+        end
+      end, { silent = true })
+
+      vim.keymap.set({ 'i', 's' }, '<c-j>', function()
+        if ls.jumpable(-1) then
+          ls.jump(-1)
+        end
+      end, { silent = true })
+
+      require('luasnip/loaders/from_vscode').lazy_load()
     end,
   },
 }