diff --git a/init.lua b/init.lua
index 7d7b1156..47bcb4ad 100644
--- a/init.lua
+++ b/init.lua
@@ -233,7 +233,8 @@ require('lazy').setup({
 -- [[ Basic Keymaps ]]
 -- Keymaps for better default experience
 -- See `:help vim.keymap.set()`
-require('custom')
+require('custom.config.options')
+require('custom.config.keymaps')
 
 -- [[ Highlight on yank ]]
 -- See `:help vim.highlight.on_yank()`
@@ -430,8 +431,6 @@ local servers = {
   -- gopls = {},
   -- pyright = {},
   -- rust_analyzer = {},
-  -- tsserver = {},
-  -- html = { filetypes = { 'html', 'twig', 'hbs'} },
 
   lua_ls = {
     Lua = {
diff --git a/lua/custom/config/init.lua b/lua/custom/config/init.lua
new file mode 100644
index 00000000..8b39994b
--- /dev/null
+++ b/lua/custom/config/init.lua
@@ -0,0 +1,2 @@
+require("options")
+require("keymaps")
diff --git a/lua/custom/keymap.lua b/lua/custom/config/keymaps.lua
similarity index 100%
rename from lua/custom/keymap.lua
rename to lua/custom/config/keymaps.lua
diff --git a/lua/custom/options.lua b/lua/custom/config/options.lua
similarity index 100%
rename from lua/custom/options.lua
rename to lua/custom/config/options.lua
diff --git a/lua/custom/init.lua b/lua/custom/init.lua
deleted file mode 100644
index b7031bea..00000000
--- a/lua/custom/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-require("custom.options")
-require("custom.keymap")