diff --git a/nvim-plugin/lua/changetracker.lua b/nvim-plugin/lua/ethersync/changetracker.lua
similarity index 99%
rename from nvim-plugin/lua/changetracker.lua
rename to nvim-plugin/lua/ethersync/changetracker.lua
index c17175b..0c1e174 100644
--- a/nvim-plugin/lua/changetracker.lua
+++ b/nvim-plugin/lua/ethersync/changetracker.lua
@@ -4,8 +4,8 @@
 -- SPDX-License-Identifier: AGPL-3.0-or-later
 
 local sync = require("vim.lsp.sync")
-local utils = require("utils")
-local debug = require("logging").debug
+local utils = require("ethersync.utils")
+local debug = require("ethersync.logging").debug
 
 local M = {}
 
diff --git a/nvim-plugin/lua/cursor.lua b/nvim-plugin/lua/ethersync/cursor.lua
similarity index 100%
rename from nvim-plugin/lua/cursor.lua
rename to nvim-plugin/lua/ethersync/cursor.lua
diff --git a/nvim-plugin/lua/logging.lua b/nvim-plugin/lua/ethersync/logging.lua
similarity index 100%
rename from nvim-plugin/lua/logging.lua
rename to nvim-plugin/lua/ethersync/logging.lua
diff --git a/nvim-plugin/lua/utils.lua b/nvim-plugin/lua/ethersync/utils.lua
similarity index 100%
rename from nvim-plugin/lua/utils.lua
rename to nvim-plugin/lua/ethersync/utils.lua
diff --git a/nvim-plugin/plugin/ethersync.lua b/nvim-plugin/plugin/ethersync.lua
index 295ad13..c635125 100644
--- a/nvim-plugin/plugin/ethersync.lua
+++ b/nvim-plugin/plugin/ethersync.lua
@@ -3,9 +3,9 @@
 --
 -- SPDX-License-Identifier: AGPL-3.0-or-later
 
-local changetracker = require("changetracker")
-local cursor = require("cursor")
-local debug = require("logging").debug
+local changetracker = require("ethersync.changetracker")
+local cursor = require("ethersync.cursor")
+local debug = require("ethersync.logging").debug
 
 -- JSON-RPC connection.
 local client