diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9fe83edc..13013e9b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -111,22 +111,17 @@ Go to the CopilotChat.nvim in your GitHub account, select your branch, and click
 
 - [utils.lua](/lua/CopilotChat/utils.lua): General utility functions.
 
-- [utils/](/lua/CopilotChat/utils/): Utility modules —
+- [utils/](/lua/CopilotChat/utils/): Utility modules
   [class.lua](/lua/CopilotChat/utils/class.lua) (OOP helper),
   [curl.lua](/lua/CopilotChat/utils/curl.lua) (HTTP requests),
-  [diff.lua](/lua/CopilotChat/utils/diff.lua) (unified diff parsing and
-  application),
-  [files.lua](/lua/CopilotChat/utils/files.lua) (file I/O and filetype
-  detection),
-  [orderedmap.lua](/lua/CopilotChat/utils/orderedmap.lua) (insertion-ordered
-  map),
-  [stringbuffer.lua](/lua/CopilotChat/utils/stringbuffer.lua) (efficient string
-  concatenation).
+  [diff.lua](/lua/CopilotChat/utils/diff.lua) (unified diff parsing and application),
+  [files.lua](/lua/CopilotChat/utils/files.lua) (file I/O and filetype detection),
+  [notify.lua](/lua/CopilotChat/utils/notify.lua) (pub/sub notification system for status and message events)
+  [orderedmap.lua](/lua/CopilotChat/utils/orderedmap.lua) (insertion-ordered map),
+  [stringbuffer.lua](/lua/CopilotChat/utils/stringbuffer.lua) (efficient string concatenation).
 
 ### Other
 
 - [health.lua](/lua/CopilotChat/health.lua): `:checkhealth` integration.
   Verifies commands, libraries, and Treesitter parsers.
 
-- [notify.lua](/lua/CopilotChat/notify.lua): Pub/sub notification system for
-  status and message events.
diff --git a/lua/CopilotChat/client.lua b/lua/CopilotChat/client.lua
index 585e01aa..7bbc65d8 100644
--- a/lua/CopilotChat/client.lua
+++ b/lua/CopilotChat/client.lua
@@ -55,7 +55,7 @@
 
 local log = require('plenary.log')
 local constants = require('CopilotChat.constants')
-local notify = require('CopilotChat.notify')
+local notify = require('CopilotChat.utils.notify')
 local tiktoken = require('CopilotChat.tiktoken')
 local utils = require('CopilotChat.utils')
 local curl = require('CopilotChat.utils.curl')
diff --git a/lua/CopilotChat/config/providers.lua b/lua/CopilotChat/config/providers.lua
index fce20e3f..44233f3d 100644
--- a/lua/CopilotChat/config/providers.lua
+++ b/lua/CopilotChat/config/providers.lua
@@ -1,7 +1,7 @@
 local log = require('plenary.log')
 local plenary_utils = require('plenary.async.util')
 local constants = require('CopilotChat.constants')
-local notify = require('CopilotChat.notify')
+local notify = require('CopilotChat.utils.notify')
 local utils = require('CopilotChat.utils')
 local curl = require('CopilotChat.utils.curl')
 local files = require('CopilotChat.utils.files')
diff --git a/lua/CopilotChat/init.lua b/lua/CopilotChat/init.lua
index f6a2cc3b..e4dfdc3a 100644
--- a/lua/CopilotChat/init.lua
+++ b/lua/CopilotChat/init.lua
@@ -816,7 +816,7 @@ function M.setup(config)
   end)
 
   -- Initialize chat
-  require('CopilotChat.notify').clear()
+  require('CopilotChat.utils.notify').clear()
   if M.chat then
     M.chat:close()
     M.chat:delete()
diff --git a/lua/CopilotChat/prompts.lua b/lua/CopilotChat/prompts.lua
index f5c76525..7c4e60ce 100644
--- a/lua/CopilotChat/prompts.lua
+++ b/lua/CopilotChat/prompts.lua
@@ -1,7 +1,7 @@
 local client = require('CopilotChat.client')
 local constants = require('CopilotChat.constants')
 local functions = require('CopilotChat.functions')
-local notify = require('CopilotChat.notify')
+local notify = require('CopilotChat.utils.notify')
 local files = require('CopilotChat.utils.files')
 local orderedmap = require('CopilotChat.utils.orderedmap')
 local utils = require('CopilotChat.utils')
diff --git a/lua/CopilotChat/tiktoken.lua b/lua/CopilotChat/tiktoken.lua
index abe1ce1d..f7ea0de7 100644
--- a/lua/CopilotChat/tiktoken.lua
+++ b/lua/CopilotChat/tiktoken.lua
@@ -1,4 +1,4 @@
-local notify = require('CopilotChat.notify')
+local notify = require('CopilotChat.utils.notify')
 local utils = require('CopilotChat.utils')
 local curl = require('CopilotChat.utils.curl')
 local class = require('CopilotChat.utils.class')
diff --git a/lua/CopilotChat/ui/chat.lua b/lua/CopilotChat/ui/chat.lua
index f20d08b3..b77c290b 100644
--- a/lua/CopilotChat/ui/chat.lua
+++ b/lua/CopilotChat/ui/chat.lua
@@ -1,7 +1,7 @@
 local Overlay = require('CopilotChat.ui.overlay')
 local Spinner = require('CopilotChat.ui.spinner')
 local constants = require('CopilotChat.constants')
-local notify = require('CopilotChat.notify')
+local notify = require('CopilotChat.utils.notify')
 local utils = require('CopilotChat.utils')
 local class = require('CopilotChat.utils.class')
 local orderedmap = require('CopilotChat.utils.orderedmap')
diff --git a/lua/CopilotChat/ui/spinner.lua b/lua/CopilotChat/ui/spinner.lua
index 44c77b80..06091a16 100644
--- a/lua/CopilotChat/ui/spinner.lua
+++ b/lua/CopilotChat/ui/spinner.lua
@@ -1,4 +1,4 @@
-local notify = require('CopilotChat.notify')
+local notify = require('CopilotChat.utils.notify')
 local utils = require('CopilotChat.utils')
 local class = require('CopilotChat.utils.class')
 
diff --git a/lua/CopilotChat/notify.lua b/lua/CopilotChat/utils/notify.lua
similarity index 100%
rename from lua/CopilotChat/notify.lua
rename to lua/CopilotChat/utils/notify.lua
diff --git a/tests/notify_spec.lua b/tests/notify_spec.lua
index f0064056..020c9391 100644
--- a/tests/notify_spec.lua
+++ b/tests/notify_spec.lua
@@ -1,4 +1,4 @@
-local notify = require('CopilotChat.notify')
+local notify = require('CopilotChat.utils.notify')
 
 describe('CopilotChat.notify', function()
   before_each(function()