diff --git a/README.md b/README.md
index 38b2a57..3dc9c06 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Just install and start writing `public static void main(String[] args)`.
 ## How to Use
 
 ```lua
-local java = require('java')
+local java = require('java-core')
 local dap = require("java.dap")
 
 -- update dap config on attach event
diff --git a/lua/java.lua b/lua/java-core.lua
similarity index 79%
rename from lua/java.lua
rename to lua/java-core.lua
index 5c120b2..6f5fcdc 100644
--- a/lua/java.lua
+++ b/lua/java-core.lua
@@ -1,6 +1,6 @@
-local server = require('java.server')
-local config = require('java.config')
-local lsp = require('java.utils.lsp')
+local server = require('java-core.server')
+local config = require('java-core.config')
+local lsp = require('java-core.utils.lsp')
 
 ---@class Java
 ---@field config JavaConfig
diff --git a/lua/java/config.lua b/lua/java-core/config.lua
similarity index 100%
rename from lua/java/config.lua
rename to lua/java-core/config.lua
diff --git a/lua/java/dap.lua b/lua/java-core/dap.lua
similarity index 95%
rename from lua/java/dap.lua
rename to lua/java-core/dap.lua
index d518a3a..74565af 100644
--- a/lua/java/dap.lua
+++ b/lua/java-core/dap.lua
@@ -1,7 +1,7 @@
-local log = require('java.utils.log')
-local lsp = require('java.utils.lsp')
-local JavaDebug = require('java.ls.clients.java-debug-client')
-local Promise = require('java.utils.promise')
+local log = require('java-core.utils.log')
+local lsp = require('java-core.utils.lsp')
+local JavaDebug = require('java-core.ls.clients.java-debug-client')
+local Promise = require('java-core.utils.promise')
 
 local M = {}
 
diff --git a/lua/java/jdtls-types.lua b/lua/java-core/jdtls-types.lua
similarity index 100%
rename from lua/java/jdtls-types.lua
rename to lua/java-core/jdtls-types.lua
diff --git a/lua/java/ls/adapters/test-adapter.lua b/lua/java-core/ls/adapters/test-adapter.lua
similarity index 94%
rename from lua/java/ls/adapters/test-adapter.lua
rename to lua/java-core/ls/adapters/test-adapter.lua
index 30b05a3..ea716bb 100644
--- a/lua/java/ls/adapters/test-adapter.lua
+++ b/lua/java-core/ls/adapters/test-adapter.lua
@@ -1,6 +1,6 @@
-local List = require('java.utils.list')
-local Set = require('java.utils.set')
-local JavaTestClient = require('java.ls.clients.java-test-client')
+local List = require('java-core.utils.list')
+local Set = require('java-core.utils.set')
+local JavaTestClient = require('java-core.ls.clients.java-test-client')
 
 local M = {}
 
diff --git a/lua/java/ls/clients/java-debug-client.lua b/lua/java-core/ls/clients/java-debug-client.lua
similarity index 97%
rename from lua/java/ls/clients/java-debug-client.lua
rename to lua/java-core/ls/clients/java-debug-client.lua
index 80501f1..0ea9457 100644
--- a/lua/java/ls/clients/java-debug-client.lua
+++ b/lua/java-core/ls/clients/java-debug-client.lua
@@ -1,4 +1,4 @@
-local JDTLSClient = require('java.ls.clients.jdtls-client')
+local JDTLSClient = require('java-core.ls.clients.jdtls-client')
 
 ---@class JavaDebugClient: JDTLSClient
 local M = JDTLSClient:new()
diff --git a/lua/java/ls/clients/java-test-client.lua b/lua/java-core/ls/clients/java-test-client.lua
similarity index 96%
rename from lua/java/ls/clients/java-test-client.lua
rename to lua/java-core/ls/clients/java-test-client.lua
index d253260..4718927 100644
--- a/lua/java/ls/clients/java-test-client.lua
+++ b/lua/java-core/ls/clients/java-test-client.lua
@@ -1,5 +1,5 @@
-local log = require('java.utils.log')
-local JDTLSClient = require('java.ls.clients.jdtls-client')
+local log = require('java-core.utils.log')
+local JDTLSClient = require('java-core.ls.clients.jdtls-client')
 
 ---@class JavaTestDetails: Configuration
 ---@field fullName string
diff --git a/lua/java/ls/clients/jdtls-client.lua b/lua/java-core/ls/clients/jdtls-client.lua
similarity index 93%
rename from lua/java/ls/clients/jdtls-client.lua
rename to lua/java-core/ls/clients/jdtls-client.lua
index 95c58a0..d32ec9d 100644
--- a/lua/java/ls/clients/jdtls-client.lua
+++ b/lua/java-core/ls/clients/jdtls-client.lua
@@ -1,5 +1,5 @@
-local log = require('java.utils.log')
-local Promise = require('java.utils.promise')
+local log = require('java-core.utils.log')
+local Promise = require('java-core.utils.promise')
 
 ---@class JDTLSClient
 ---@field client LSPClient
diff --git a/lua/java/ls/helpers/java-test-helper.lua b/lua/java-core/ls/helpers/java-test-helper.lua
similarity index 90%
rename from lua/java/ls/helpers/java-test-helper.lua
rename to lua/java-core/ls/helpers/java-test-helper.lua
index 2e89513..61aae60 100644
--- a/lua/java/ls/helpers/java-test-helper.lua
+++ b/lua/java-core/ls/helpers/java-test-helper.lua
@@ -1,11 +1,11 @@
-local lsp = require('java.utils.lsp')
-local log = require('java.utils.log')
-local java_test_adapter = require('java.ls.adapters.test-adapter')
-
-local List = require('java.utils.list')
-local Promise = require('java.utils.promise')
-local JavaTestClient = require('java.ls.clients.java-test-client')
-local JavaDebugClient = require('java.ls.clients.java-debug-client')
+local lsp = require('java-core.utils.lsp')
+local log = require('java-core.utils.log')
+local java_test_adapter = require('java-core.ls.adapters.test-adapter')
+
+local List = require('java-core.utils.list')
+local Promise = require('java-core.utils.promise')
+local JavaTestClient = require('java-core.ls.clients.java-test-client')
+local JavaDebugClient = require('java-core.ls.clients.java-debug-client')
 
 local M = {}
 
diff --git a/lua/java/ls/helpers/test-helper.lua b/lua/java-core/ls/helpers/test-helper.lua
similarity index 91%
rename from lua/java/ls/helpers/test-helper.lua
rename to lua/java-core/ls/helpers/test-helper.lua
index 7aeaa58..4bf93ea 100644
--- a/lua/java/ls/helpers/test-helper.lua
+++ b/lua/java-core/ls/helpers/test-helper.lua
@@ -1,10 +1,10 @@
-local log = require('java.utils.log')
-local java_test_adapter = require('java.ls.adapters.test-adapter')
+local log = require('java-core.utils.log')
+local java_test_adapter = require('java-core.ls.adapters.test-adapter')
 
-local List = require('java.utils.list')
-local Promise = require('java.utils.promise')
-local JavaTestClient = require('java.ls.clients.java-test-client')
-local JavaDebugClient = require('java.ls.clients.java-debug-client')
+local List = require('java-core.utils.list')
+local Promise = require('java-core.utils.promise')
+local JavaTestClient = require('java-core.ls.clients.java-test-client')
+local JavaDebugClient = require('java-core.ls.clients.java-debug-client')
 
 ---@class JavaTestHelper
 ---@field client JDTLSClient
diff --git a/lua/java/lspconfig-types.lua b/lua/java-core/lspconfig-types.lua
similarity index 100%
rename from lua/java/lspconfig-types.lua
rename to lua/java-core/lspconfig-types.lua
diff --git a/lua/java/server.lua b/lua/java-core/server.lua
similarity index 87%
rename from lua/java/server.lua
rename to lua/java-core/server.lua
index f8b62ef..8b040e7 100644
--- a/lua/java/server.lua
+++ b/lua/java-core/server.lua
@@ -1,11 +1,11 @@
 local util = require('lspconfig.util')
-local system = require('java.utils.system')
-local file = require('java.utils.file')
-local mason = require('java.utils.mason')
-local plugin = require('java.utils.plugin')
-local log = require('java.utils.log')
-local tbl = require('java.utils.table')
-local workspace = require('java.workspace')
+local system = require('java-core.utils.system')
+local file = require('java-core.utils.file')
+local mason = require('java-core.utils.mason')
+local plugin = require('java-core.utils.plugin')
+local log = require('java-core.utils.log')
+local tbl = require('java-core.utils.table')
+local workspace = require('java-core.workspace')
 
 local M = {}
 
diff --git a/lua/java/settings.lua b/lua/java-core/settings.lua
similarity index 83%
rename from lua/java/settings.lua
rename to lua/java-core/settings.lua
index c1579f0..d65965d 100644
--- a/lua/java/settings.lua
+++ b/lua/java-core/settings.lua
@@ -1,5 +1,5 @@
-local lsp = require('java.utils.lsp')
-local log = require('java.utils.log')
+local lsp = require('java-core.utils.lsp')
+local log = require('java-core.utils.log')
 
 local M = {}
 
diff --git a/lua/java/utils/file.lua b/lua/java-core/utils/file.lua
similarity index 100%
rename from lua/java/utils/file.lua
rename to lua/java-core/utils/file.lua
diff --git a/lua/java/utils/list.lua b/lua/java-core/utils/list.lua
similarity index 100%
rename from lua/java/utils/list.lua
rename to lua/java-core/utils/list.lua
diff --git a/lua/java/utils/log.lua b/lua/java-core/utils/log.lua
similarity index 100%
rename from lua/java/utils/log.lua
rename to lua/java-core/utils/log.lua
diff --git a/lua/java/utils/lsp.lua b/lua/java-core/utils/lsp.lua
similarity index 86%
rename from lua/java/utils/lsp.lua
rename to lua/java-core/utils/lsp.lua
index 666153a..72fc12d 100644
--- a/lua/java/utils/lsp.lua
+++ b/lua/java-core/utils/lsp.lua
@@ -1,5 +1,5 @@
-local log = require('java.utils.log')
-local List = require('java.utils.list')
+local log = require('java-core.utils.log')
+local List = require('java-core.utils.list')
 
 local M = {}
 
diff --git a/lua/java/utils/mason.lua b/lua/java-core/utils/mason.lua
similarity index 100%
rename from lua/java/utils/mason.lua
rename to lua/java-core/utils/mason.lua
diff --git a/lua/java/utils/plugin.lua b/lua/java-core/utils/plugin.lua
similarity index 86%
rename from lua/java/utils/plugin.lua
rename to lua/java-core/utils/plugin.lua
index ae2ae1d..9b92f32 100644
--- a/lua/java/utils/plugin.lua
+++ b/lua/java-core/utils/plugin.lua
@@ -1,6 +1,6 @@
-local log = require('java.utils.log')
-local file = require('java.utils.file')
-local mason = require('java.utils.mason')
+local log = require('java-core.utils.log')
+local file = require('java-core.utils.file')
+local mason = require('java-core.utils.mason')
 
 local M = {}
 
diff --git a/lua/java/utils/promise.lua b/lua/java-core/utils/promise.lua
similarity index 100%
rename from lua/java/utils/promise.lua
rename to lua/java-core/utils/promise.lua
diff --git a/lua/java/utils/set.lua b/lua/java-core/utils/set.lua
similarity index 100%
rename from lua/java/utils/set.lua
rename to lua/java-core/utils/set.lua
diff --git a/lua/java/utils/system.lua b/lua/java-core/utils/system.lua
similarity index 100%
rename from lua/java/utils/system.lua
rename to lua/java-core/utils/system.lua
diff --git a/lua/java/utils/table.lua b/lua/java-core/utils/table.lua
similarity index 100%
rename from lua/java/utils/table.lua
rename to lua/java-core/utils/table.lua
diff --git a/lua/java/workspace.lua b/lua/java-core/workspace.lua
similarity index 100%
rename from lua/java/workspace.lua
rename to lua/java-core/workspace.lua
diff --git a/plugin/java.lua b/plugin/java.lua
index ff02fef..587f642 100644
--- a/plugin/java.lua
+++ b/plugin/java.lua
@@ -1 +1 @@
--- vim.api.nvim_create_user_command('JavaRun', require('java').__run, {})
+-- vim.api.nvim_create_user_command('JavaRun', require('java-core').__run, {})
diff --git a/tests/java/java_spec.lua b/tests/java/java_spec.lua
index 84af331..c4568cc 100644
--- a/tests/java/java_spec.lua
+++ b/tests/java/java_spec.lua
@@ -1,4 +1,4 @@
-local java = require('java')
+local java = require('java-core')
 
 describe('setup', function()
 	it('get_config API is available', function()