diff --git a/init.lua b/init.lua
index 3a46a65..cd7f6b0 100644
--- a/init.lua
+++ b/init.lua
@@ -1,9 +1,9 @@
 vim.opt.termguicolors = true
 
-require("core.keymaps")
+require("config.keymaps")
 require("config.lazy")
-require("core.options")
-require("core.functions")
+require("config.options")
+require("config.functions")
 --require("core.plugins")
-require("core.aliases")
-require("core.plugin_config")
+require("config.aliases")
+require("config.plugin")
diff --git a/lua/core/aliases.lua b/lua/config/aliases.lua
similarity index 100%
rename from lua/core/aliases.lua
rename to lua/config/aliases.lua
diff --git a/lua/core/functions.lua b/lua/config/functions.lua
similarity index 100%
rename from lua/core/functions.lua
rename to lua/config/functions.lua
diff --git a/lua/core/keymaps.lua b/lua/config/keymaps.lua
similarity index 100%
rename from lua/core/keymaps.lua
rename to lua/config/keymaps.lua
diff --git a/lua/core/options.lua b/lua/config/options.lua
similarity index 100%
rename from lua/core/options.lua
rename to lua/config/options.lua
diff --git a/lua/core/plugin_config/catppuccin.lua b/lua/config/plugin/catppuccin.lua
similarity index 61%
rename from lua/core/plugin_config/catppuccin.lua
rename to lua/config/plugin/catppuccin.lua
index 077d3c0..288e15f 100644
--- a/lua/core/plugin_config/catppuccin.lua
+++ b/lua/config/plugin/catppuccin.lua
@@ -1,4 +1,4 @@
 -- setup must be called before loading
 
 require 'catppuccin'.setup()
-vim.cmd.colorscheme "catppuccin-macchiato"
+vim.cmd.colorscheme "catppuccin-mocha"
diff --git a/lua/core/plugin_config/colorizer.lua b/lua/config/plugin/colorizer.lua
similarity index 100%
rename from lua/core/plugin_config/colorizer.lua
rename to lua/config/plugin/colorizer.lua
diff --git a/lua/core/plugin_config/deadcolumn.lua b/lua/config/plugin/deadcolumn.lua
similarity index 100%
rename from lua/core/plugin_config/deadcolumn.lua
rename to lua/config/plugin/deadcolumn.lua
diff --git a/lua/core/plugin_config/gruvbox.lua b/lua/config/plugin/gruvbox.lua
similarity index 100%
rename from lua/core/plugin_config/gruvbox.lua
rename to lua/config/plugin/gruvbox.lua
diff --git a/lua/core/plugin_config/indent-blankline.lua b/lua/config/plugin/indent-blankline.lua
similarity index 100%
rename from lua/core/plugin_config/indent-blankline.lua
rename to lua/config/plugin/indent-blankline.lua
diff --git a/lua/config/plugin/init.lua b/lua/config/plugin/init.lua
new file mode 100644
index 0000000..2c6c880
--- /dev/null
+++ b/lua/config/plugin/init.lua
@@ -0,0 +1,17 @@
+--require("config.plugin.gruvbox")
+require("config.plugin.catppuccin")
+require("config.plugin.lualine")
+require("config.plugin.nvim-tree")
+require("config.plugin.treesitter")
+require("config.plugin.telescope")
+require("config.plugin.vim-fugitive")
+require("config.plugin.tagbar")
+require("config.plugin.vim-gitgutter")
+require("config.plugin.deadcolumn")
+require("config.plugin.colorizer")
+require("config.plugin.synattr")
+require("config.plugin.rainbow-delimiters")
+require("config.plugin.marks")
+--require("config.plugin.lsp_config")
+--require("config.plugin.indent-blankline")
+require("config.plugin.vim-indentwise")
diff --git a/lua/core/plugin_config/lsp_config.lua b/lua/config/plugin/lsp_config.lua
similarity index 100%
rename from lua/core/plugin_config/lsp_config.lua
rename to lua/config/plugin/lsp_config.lua
diff --git a/lua/core/plugin_config/lualine.lua b/lua/config/plugin/lualine.lua
similarity index 86%
rename from lua/core/plugin_config/lualine.lua
rename to lua/config/plugin/lualine.lua
index 3d22319..186c94d 100644
--- a/lua/core/plugin_config/lualine.lua
+++ b/lua/config/plugin/lualine.lua
@@ -1,7 +1,7 @@
 require('lualine').setup {
     options = {
         icons_enabled = true,
-        theme = 'catppuccin',
+        theme = 'catppuccin-mocha'
     },
     sections = {
         lualine_a = { 
diff --git a/lua/core/plugin_config/marks.lua b/lua/config/plugin/marks.lua
similarity index 100%
rename from lua/core/plugin_config/marks.lua
rename to lua/config/plugin/marks.lua
diff --git a/lua/core/plugin_config/nvim-tree.lua b/lua/config/plugin/nvim-tree.lua
similarity index 100%
rename from lua/core/plugin_config/nvim-tree.lua
rename to lua/config/plugin/nvim-tree.lua
diff --git a/lua/core/plugin_config/rainbow-delimiters.lua b/lua/config/plugin/rainbow-delimiters.lua
similarity index 100%
rename from lua/core/plugin_config/rainbow-delimiters.lua
rename to lua/config/plugin/rainbow-delimiters.lua
diff --git a/lua/core/plugin_config/synattr.lua b/lua/config/plugin/synattr.lua
similarity index 100%
rename from lua/core/plugin_config/synattr.lua
rename to lua/config/plugin/synattr.lua
diff --git a/lua/core/plugin_config/tagbar.lua b/lua/config/plugin/tagbar.lua
similarity index 100%
rename from lua/core/plugin_config/tagbar.lua
rename to lua/config/plugin/tagbar.lua
diff --git a/lua/core/plugin_config/telescope.lua b/lua/config/plugin/telescope.lua
similarity index 100%
rename from lua/core/plugin_config/telescope.lua
rename to lua/config/plugin/telescope.lua
diff --git a/lua/core/plugin_config/treesitter.lua b/lua/config/plugin/treesitter.lua
similarity index 100%
rename from lua/core/plugin_config/treesitter.lua
rename to lua/config/plugin/treesitter.lua
diff --git a/lua/core/plugin_config/vim-fugitive.lua b/lua/config/plugin/vim-fugitive.lua
similarity index 100%
rename from lua/core/plugin_config/vim-fugitive.lua
rename to lua/config/plugin/vim-fugitive.lua
diff --git a/lua/core/plugin_config/vim-gitgutter.lua b/lua/config/plugin/vim-gitgutter.lua
similarity index 100%
rename from lua/core/plugin_config/vim-gitgutter.lua
rename to lua/config/plugin/vim-gitgutter.lua
diff --git a/lua/core/plugin_config/vim-indentwise.lua b/lua/config/plugin/vim-indentwise.lua
similarity index 100%
rename from lua/core/plugin_config/vim-indentwise.lua
rename to lua/config/plugin/vim-indentwise.lua
diff --git a/lua/core/plugin_config/init.lua b/lua/core/plugin_config/init.lua
deleted file mode 100644
index 6905e9a..0000000
--- a/lua/core/plugin_config/init.lua
+++ /dev/null
@@ -1,17 +0,0 @@
---require("core.plugin_config.gruvbox")
-require("core.plugin_config.catppuccin")
-require("core.plugin_config.lualine")
-require("core.plugin_config.nvim-tree")
-require("core.plugin_config.treesitter")
-require("core.plugin_config.telescope")
-require("core.plugin_config.vim-fugitive")
-require("core.plugin_config.tagbar")
-require("core.plugin_config.vim-gitgutter")
-require("core.plugin_config.deadcolumn")
-require("core.plugin_config.colorizer")
-require("core.plugin_config.synattr")
-require("core.plugin_config.rainbow-delimiters")
-require("core.plugin_config.marks")
---require("core.plugin_config.lsp_config")
---require("core.plugin_config.indent-blankline")
-require("core.plugin_config.vim-indentwise")