diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 02ebf4b..abdb550 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -2,8 +2,6 @@
 vim.cmd [[ source ~/.vimrc ]]
 
 -- Modules
-require('core.plugins')
-require('core.opts')
-require('core.keymaps')
-require('core.style')
-require('core.lsp')
+require('core')
+require('plugins')
+require('lsp')
diff --git a/config/nvim/lua/core/init.lua b/config/nvim/lua/core/init.lua
new file mode 100644
index 0000000..abc9737
--- /dev/null
+++ b/config/nvim/lua/core/init.lua
@@ -0,0 +1,3 @@
+require('core.opts')
+require('core.keymaps')
+require('core.style')
diff --git a/config/nvim/lua/core/plugins/init.lua b/config/nvim/lua/core/plugins/init.lua
deleted file mode 100644
index f097487..0000000
--- a/config/nvim/lua/core/plugins/init.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require("nvim-web-devicons")
-require("core.plugins.lualine")
-require("core.plugins.nvim_tree")
diff --git a/config/nvim/lua/core/lsp/init.lua b/config/nvim/lua/lsp/init.lua
similarity index 75%
rename from config/nvim/lua/core/lsp/init.lua
rename to config/nvim/lua/lsp/init.lua
index a5f4146..fa209f6 100644
--- a/config/nvim/lua/core/lsp/init.lua
+++ b/config/nvim/lua/lsp/init.lua
@@ -4,4 +4,4 @@ on_attach = function(client)
     require'completion'.on_attach(client)
 end
 
-require('core.lsp.rust_analyzer')
+require('lsp.rust_analyzer')
diff --git a/config/nvim/lua/core/lsp/rust_analyzer.lua b/config/nvim/lua/lsp/rust_analyzer.lua
similarity index 100%
rename from config/nvim/lua/core/lsp/rust_analyzer.lua
rename to config/nvim/lua/lsp/rust_analyzer.lua
diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua
new file mode 100644
index 0000000..60310ac
--- /dev/null
+++ b/config/nvim/lua/plugins/init.lua
@@ -0,0 +1,3 @@
+require("plugins.nvim_web_devicons")
+require("plugins.lualine")
+require("plugins.nvim_tree")
diff --git a/config/nvim/lua/core/plugins/lualine.lua b/config/nvim/lua/plugins/lualine.lua
similarity index 100%
rename from config/nvim/lua/core/plugins/lualine.lua
rename to config/nvim/lua/plugins/lualine.lua
diff --git a/config/nvim/lua/core/plugins/nvim_tree.lua b/config/nvim/lua/plugins/nvim_tree.lua
similarity index 100%
rename from config/nvim/lua/core/plugins/nvim_tree.lua
rename to config/nvim/lua/plugins/nvim_tree.lua
diff --git a/config/nvim/lua/plugins/nvim_web_devicons.lua b/config/nvim/lua/plugins/nvim_web_devicons.lua
new file mode 100644
index 0000000..7c411e7
--- /dev/null
+++ b/config/nvim/lua/plugins/nvim_web_devicons.lua
@@ -0,0 +1 @@
+require('nvim-web-devicons')