diff --git a/lua/cmp/mapping.lua b/lua/cmp/config/mapping.lua
similarity index 100%
rename from lua/cmp/mapping.lua
rename to lua/cmp/config/mapping.lua
diff --git a/lua/cmp/init.lua b/lua/cmp/init.lua
index 5f0b3af..3dfdc21 100644
--- a/lua/cmp/init.lua
+++ b/lua/cmp/init.lua
@@ -2,7 +2,7 @@ local core = require('cmp.core')
 local keymap = require('cmp.utils.keymap')
 local source = require('cmp.source')
 local config = require('cmp.config')
-local autocmd = require('cmp.autocmd')
+local autocmd = require('cmp.utils.autocmd')
 
 local cmp = {}
 
@@ -14,7 +14,7 @@ cmp.lsp = require('cmp.types.lsp')
 cmp.vim = require('cmp.types.vim')
 
 ---Export mapping
-cmp.mapping = require('cmp.mapping')
+cmp.mapping = require('cmp.config.mapping')
 
 ---Register completion sources
 ---@param name string
diff --git a/lua/cmp/menu.lua b/lua/cmp/menu.lua
index cd24b11..088c3ba 100644
--- a/lua/cmp/menu.lua
+++ b/lua/cmp/menu.lua
@@ -3,7 +3,7 @@ local types = require('cmp.types')
 local async = require('cmp.utils.async')
 local float = require('cmp.float')
 local config = require('cmp.config')
-local autocmd = require('cmp.autocmd')
+local autocmd = require('cmp.utils.autocmd')
 local check = require('cmp.utils.check')
 
 ---@class cmp.MenuOption
diff --git a/lua/cmp/autocmd.lua b/lua/cmp/utils/autocmd.lua
similarity index 100%
rename from lua/cmp/autocmd.lua
rename to lua/cmp/utils/autocmd.lua
diff --git a/plugin/cmp.lua b/plugin/cmp.lua
index c9df80a..4deece0 100644
--- a/plugin/cmp.lua
+++ b/plugin/cmp.lua
@@ -3,18 +3,15 @@ if vim.g.loaded_cmp then
 end
 vim.g.loaded_cmp = true
 
-local cmp = require'cmp'
-local misc = require'cmp.utils.misc'
-
 -- TODO: https://github.com/neovim/neovim/pull/14661
 vim.cmd [[
   augroup cmp
     autocmd!
-    autocmd InsertEnter * lua require'cmp.autocmd'.emit('InsertEnter')
-    autocmd InsertLeave * lua require'cmp.autocmd'.emit('InsertLeave')
-    autocmd TextChangedI,TextChangedP * lua require'cmp.autocmd'.emit('TextChanged')
-    autocmd CompleteChanged * lua require'cmp.autocmd'.emit('CompleteChanged')
-    autocmd CompleteDone * lua require'cmp.autocmd'.emit('CompleteDone')
+    autocmd InsertEnter * lua require'cmp.utils.autocmd'.emit('InsertEnter')
+    autocmd InsertLeave * lua require'cmp.utils.autocmd'.emit('InsertLeave')
+    autocmd TextChangedI,TextChangedP * lua require'cmp.utils.autocmd'.emit('TextChanged')
+    autocmd CompleteChanged * lua require'cmp.utils.autocmd'.emit('CompleteChanged')
+    autocmd CompleteDone * lua require'cmp.utils.autocmd'.emit('CompleteDone')
   augroup END
 ]]