diff --git a/basic.lua b/config/basic.lua
similarity index 93%
rename from basic.lua
rename to config/basic.lua
index 265a8b9..e248df6 100644
--- a/basic.lua
+++ b/config/basic.lua
@@ -16,14 +16,6 @@ vim.opt.encoding = "utf-8"
 -- True color support
 vim.opt.termguicolors = true
 
--- Theme (required plugin 'material-vim')
--- Available styles: default, planight, ocean, lighter
--- darker, default-community, palenight-community, ocean-community,
--- lighter-community, darker-community
--- vim.g.material_theme_style = "default"
--- vim.g.lightline = { colorscheme = "material_vim" }
--- vim.cmd("colorscheme material")
-
 -- Other options
 vim.cmd("syntax on")
 vim.opt.backspace = { "indent", "eol", "start" }
diff --git a/default.nix b/default.nix
index 99d0566..4325764 100644
--- a/default.nix
+++ b/default.nix
@@ -6,14 +6,15 @@ let
   callPlugins = list: builtins.map (p: callPackage p { }) list;
 
   plugins = callPlugins [
-    ./syntax
-    ./explorer
-    ./theme
-    ./lsp
+    ./plugins/syntax
+    ./plugins/explorer
+    ./plugins/theme
+    ./plugins/lsp
   ];
 
-  basicConfig = builtins.readFile ./basic.lua;
-
+  basicConfigs = [builtins.readFile ./config/basic.lua];
+  pluginConfigs = lib.extractAttrs "luaConfig" plugins;
+  allConfigs = basicConfigs ++ pluginConfigs;
 in
 wrapNeovim neovim-unwrapped {
   withPython3 = false;
@@ -21,9 +22,8 @@ wrapNeovim neovim-unwrapped {
   withRuby = false;
 
   configure = {
-    customRC = lib.mkLuaRc ([ basicConfig ] ++ lib.extractAttrs "luaConfig" plugins);
+    customRC = lib.mkLuaRc allConfigs;
 
-    packages.myVimPackages =
-      { start = lib.extractAttrs "plugins" plugins; };
+    packages.myVimPackages = { start = lib.extractAttrs "plugins" plugins; };
   };
 }
diff --git a/explorer/default.nix b/plugins/explorer/default.nix
similarity index 100%
rename from explorer/default.nix
rename to plugins/explorer/default.nix
diff --git a/explorer/nvim-tree.lua b/plugins/explorer/nvim-tree.lua
similarity index 100%
rename from explorer/nvim-tree.lua
rename to plugins/explorer/nvim-tree.lua
diff --git a/lsp/config.lua b/plugins/lsp/config.lua
similarity index 100%
rename from lsp/config.lua
rename to plugins/lsp/config.lua
diff --git a/lsp/default.nix b/plugins/lsp/default.nix
similarity index 100%
rename from lsp/default.nix
rename to plugins/lsp/default.nix
diff --git a/syntax/default.nix b/plugins/syntax/default.nix
similarity index 100%
rename from syntax/default.nix
rename to plugins/syntax/default.nix
diff --git a/syntax/treesitter.lua b/plugins/syntax/treesitter.lua
similarity index 100%
rename from syntax/treesitter.lua
rename to plugins/syntax/treesitter.lua
diff --git a/theme/catppuccin-nvim.lua b/plugins/theme/catppuccin-nvim.lua
similarity index 100%
rename from theme/catppuccin-nvim.lua
rename to plugins/theme/catppuccin-nvim.lua
diff --git a/theme/default.nix b/plugins/theme/default.nix
similarity index 100%
rename from theme/default.nix
rename to plugins/theme/default.nix