diff --git a/modules/core/default.nix b/modules/core/build/default.nix
similarity index 76%
rename from modules/core/default.nix
rename to modules/core/build/default.nix
index e4703b6c..3b88e648 100644
--- a/modules/core/default.nix
+++ b/modules/core/build/default.nix
@@ -8,6 +8,7 @@
   inherit (lib) nvim;
   inherit (nvim.lua) toLuaObject;
   inherit (nvim.vim) valToVim;
+  inherit (nvim.bool) mkBool;
 
   cfg = config.vim;
 
@@ -20,13 +21,6 @@
     EOF
   '';
 
-  mkBool = value: description:
-    mkOption {
-      type = types.bool;
-      default = value;
-      inherit description;
-    };
-
   # Most of the keybindings code is highly inspired by pta2002/nixvim. Thank you!
   mapConfigOptions = {
     silent =
@@ -93,60 +87,8 @@
         inherit mode;
       })
       maps);
-
-  mapOption = types.submodule {
-    options =
-      mapConfigOptions
-      // {
-        action = mkOption {
-          type = types.str;
-          description = "The action to execute.";
-        };
-
-        lua = mkOption {
-          type = types.bool;
-          description = ''
-            If true, `action` is considered to be lua code.
-            Thus, it will not be wrapped in `""`.
-          '';
-          default = false;
-        };
-      };
-  };
-
-  mapOptions = mode:
-    mkOption {
-      description = "Mappings for ${mode} mode";
-      type = types.attrsOf mapOption;
-      default = {};
-    };
 in {
   options = {
-    assertions = lib.mkOption {
-      type = with types; listOf unspecified;
-      internal = true;
-      default = [];
-      example = literalExpression ''
-        [
-          {
-            assertion = false;
-            message = "you can't enable this for that reason";
-          }
-        ]
-      '';
-    };
-
-    warnings = mkOption {
-      internal = true;
-      default = [];
-      type = with types; listOf str;
-      example = ["The `foo' service is deprecated and will go away soon!"];
-      description = lib.mdDoc ''
-        This option allows modules to show warnings to users during
-        the evaluation of the system configuration.
-      '';
-    };
-
     vim = {
       viAlias = mkOption {
         description = "Enable vi alias";
@@ -196,17 +138,19 @@ in {
           Note that these are setup after builtin plugins.
         '';
         example = literalExpression ''
-            with pkgs.vimPlugins; {
+          with pkgs.vimPlugins; {
             aerial = {
               package = aerial-nvim;
               setup = "require('aerial').setup {}";
             };
+
             harpoon = {
               package = harpoon;
               setup = "require('harpoon').setup {}";
               after = ["aerial"];
             };
-          }'';
+          }
+        '';
       };
 
       globals = mkOption {
@@ -214,40 +158,6 @@ in {
         description = "Set containing global variable values";
         type = types.attrs;
       };
-
-      maps = mkOption {
-        type = types.submodule {
-          options = {
-            normal = mapOptions "normal";
-            insert = mapOptions "insert";
-            select = mapOptions "select";
-            visual = mapOptions "visual and select";
-            terminal = mapOptions "terminal";
-            normalVisualOp = mapOptions "normal, visual, select and operator-pending (same as plain 'map')";
-
-            visualOnly = mapOptions "visual only";
-            operator = mapOptions "operator-pending";
-            insertCommand = mapOptions "insert and command-line";
-            lang = mapOptions "insert, command-line and lang-arg";
-            command = mapOptions "command-line";
-          };
-        };
-        default = {};
-        description = ''
-          Custom keybindings for any mode.
-
-          For plain maps (e.g. just 'map' or 'remap') use maps.normalVisualOp.
-        '';
-
-        example = ''
-          maps = {
-            normal."<leader>m" = {
-              silent = true;
-              action = "<cmd>make<CR>";
-            }; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
-          };
-        '';
-      };
     };
   };
 
diff --git a/modules/core/mappings/default.nix b/modules/core/mappings/default.nix
new file mode 100644
index 00000000..f9b3f823
--- /dev/null
+++ b/modules/core/mappings/default.nix
@@ -0,0 +1,103 @@
+{lib, ...}: let
+  inherit (lib) mkOption types;
+  inherit (lib) nvim;
+  inherit (nvim.bool) mkBool;
+
+  # Most of the keybindings code is highly inspired by pta2002/nixvim. Thank you!
+  mapConfigOptions = {
+    silent =
+      mkBool false
+      "Whether this mapping should be silent. Equivalent to adding <silent> to a map.";
+
+    nowait =
+      mkBool false
+      "Whether to wait for extra input on ambiguous mappings. Equivalent to adding <nowait> to a map.";
+
+    script =
+      mkBool false
+      "Equivalent to adding <script> to a map.";
+
+    expr =
+      mkBool false
+      "Means that the action is actually an expression. Equivalent to adding <expr> to a map.";
+
+    unique =
+      mkBool false
+      "Whether to fail if the map is already defined. Equivalent to adding <unique> to a map.";
+
+    noremap =
+      mkBool true
+      "Whether to use the 'noremap' variant of the command, ignoring any custom mappings on the defined action. It is highly advised to keep this on, which is the default.";
+
+    desc = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "A description of this keybind, to be shown in which-key, if you have it enabled.";
+    };
+  };
+
+  mapOption = types.submodule {
+    options =
+      mapConfigOptions
+      // {
+        action = mkOption {
+          type = types.str;
+          description = "The action to execute.";
+        };
+
+        lua = mkOption {
+          type = types.bool;
+          description = ''
+            If true, `action` is considered to be lua code.
+            Thus, it will not be wrapped in `""`.
+          '';
+          default = false;
+        };
+      };
+  };
+
+  mapOptions = mode:
+    mkOption {
+      description = "Mappings for ${mode} mode";
+      type = types.attrsOf mapOption;
+      default = {};
+    };
+in {
+  options = {
+    vim = {
+      maps = mkOption {
+        type = types.submodule {
+          options = {
+            normal = mapOptions "normal";
+            insert = mapOptions "insert";
+            select = mapOptions "select";
+            visual = mapOptions "visual and select";
+            terminal = mapOptions "terminal";
+            normalVisualOp = mapOptions "normal, visual, select and operator-pending (same as plain 'map')";
+
+            visualOnly = mapOptions "visual only";
+            operator = mapOptions "operator-pending";
+            insertCommand = mapOptions "insert and command-line";
+            lang = mapOptions "insert, command-line and lang-arg";
+            command = mapOptions "command-line";
+          };
+        };
+        default = {};
+        description = ''
+          Custom keybindings for any mode.
+
+          For plain maps (e.g. just 'map' or 'remap') use maps.normalVisualOp.
+        '';
+
+        example = ''
+          maps = {
+            normal."<leader>m" = {
+              silent = true;
+              action = "<cmd>make<CR>";
+            }; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
+          };
+        '';
+      };
+    };
+  };
+}
diff --git a/modules/core/warnings/default.nix b/modules/core/warnings/default.nix
new file mode 100644
index 00000000..3739ed2f
--- /dev/null
+++ b/modules/core/warnings/default.nix
@@ -0,0 +1,31 @@
+{lib, ...}: let
+  inherit (lib) types;
+  inherit (lib.options) mkOption literalExpression;
+in {
+  options = {
+    assertions = mkOption {
+      type = with types; listOf unspecified;
+      internal = true;
+      default = [];
+      example = literalExpression ''
+        [
+          {
+            assertion = false;
+            message = "you can't enable this for that reason";
+          }
+        ]
+      '';
+    };
+
+    warnings = mkOption {
+      internal = true;
+      default = [];
+      type = with types; listOf str;
+      example = ["The `foo' service is deprecated and will go away soon!"];
+      description = ''
+        This option allows modules to show warnings to users during
+        the evaluation of the system configuration.
+      '';
+    };
+  };
+}
diff --git a/modules/modules.nix b/modules/modules.nix
index 1bfc0698..55f2c016 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -3,33 +3,43 @@
   lib,
   check ? true,
 }: let
+  inherit (lib) mkDefault;
+
+  plugins = builtins.map (p: ./plugins + "/${p}") [
+    "completion"
+    "theme"
+    "statusline"
+    "tabline"
+    "filetree"
+    "visuals"
+    "lsp"
+    "treesitter"
+    "autopairs"
+    "snippets"
+    "git"
+    "minimap"
+    "dashboard"
+    "utility"
+    "rich-presence"
+    "notes"
+    "terminal"
+    "ui"
+    "assistant"
+    "session"
+    "comments"
+    "projects"
+    "languages"
+    "debugger"
+  ];
+
+  core = builtins.map (p: ./core + "/${p}") [
+    "build"
+    "mappings"
+    "warnings"
+  ];
+
   modules = [
-    ./completion
-    ./theme
-    ./core
-    ./basic
-    ./statusline
-    ./tabline
-    ./filetree
-    ./visuals
-    ./lsp
-    ./treesitter
-    ./autopairs
-    ./snippets
-    ./git
-    ./minimap
-    ./dashboard
-    ./utility
-    ./rich-presence
-    ./notes
-    ./terminal
-    ./ui
-    ./assistant
-    ./session
-    ./comments
-    ./projects
-    ./languages
-    ./debugger
+    ./neovim
   ];
 
   pkgsModule = {config, ...}: {
@@ -38,11 +48,11 @@
         inherit check;
         args = {
           baseModules = modules;
-          pkgsPath = lib.mkDefault pkgs.path;
-          pkgs = lib.mkDefault pkgs;
+          pkgsPath = mkDefault pkgs.path;
+          pkgs = mkDefault pkgs;
         };
       };
     };
   };
 in
-  modules ++ [pkgsModule]
+  [pkgsModule] ++ (lib.concatLists [core modules plugins])
diff --git a/modules/basic/config.nix b/modules/neovim/config.nix
similarity index 100%
rename from modules/basic/config.nix
rename to modules/neovim/config.nix
diff --git a/modules/basic/default.nix b/modules/neovim/default.nix
similarity index 100%
rename from modules/basic/default.nix
rename to modules/neovim/default.nix
diff --git a/modules/basic/module.nix b/modules/neovim/module.nix
similarity index 100%
rename from modules/basic/module.nix
rename to modules/neovim/module.nix
diff --git a/modules/assistant/copilot/config.nix b/modules/plugins/assistant/copilot/config.nix
similarity index 100%
rename from modules/assistant/copilot/config.nix
rename to modules/plugins/assistant/copilot/config.nix
diff --git a/modules/assistant/copilot/copilot.nix b/modules/plugins/assistant/copilot/copilot.nix
similarity index 100%
rename from modules/assistant/copilot/copilot.nix
rename to modules/plugins/assistant/copilot/copilot.nix
diff --git a/modules/assistant/copilot/default.nix b/modules/plugins/assistant/copilot/default.nix
similarity index 100%
rename from modules/assistant/copilot/default.nix
rename to modules/plugins/assistant/copilot/default.nix
diff --git a/modules/assistant/default.nix b/modules/plugins/assistant/default.nix
similarity index 100%
rename from modules/assistant/default.nix
rename to modules/plugins/assistant/default.nix
diff --git a/modules/assistant/tabnine/config.nix b/modules/plugins/assistant/tabnine/config.nix
similarity index 100%
rename from modules/assistant/tabnine/config.nix
rename to modules/plugins/assistant/tabnine/config.nix
diff --git a/modules/assistant/tabnine/default.nix b/modules/plugins/assistant/tabnine/default.nix
similarity index 100%
rename from modules/assistant/tabnine/default.nix
rename to modules/plugins/assistant/tabnine/default.nix
diff --git a/modules/assistant/tabnine/tabnine.nix b/modules/plugins/assistant/tabnine/tabnine.nix
similarity index 100%
rename from modules/assistant/tabnine/tabnine.nix
rename to modules/plugins/assistant/tabnine/tabnine.nix
diff --git a/modules/autopairs/default.nix b/modules/plugins/autopairs/default.nix
similarity index 100%
rename from modules/autopairs/default.nix
rename to modules/plugins/autopairs/default.nix
diff --git a/modules/autopairs/nvim-autopairs/config.nix b/modules/plugins/autopairs/nvim-autopairs/config.nix
similarity index 100%
rename from modules/autopairs/nvim-autopairs/config.nix
rename to modules/plugins/autopairs/nvim-autopairs/config.nix
diff --git a/modules/autopairs/nvim-autopairs/default.nix b/modules/plugins/autopairs/nvim-autopairs/default.nix
similarity index 100%
rename from modules/autopairs/nvim-autopairs/default.nix
rename to modules/plugins/autopairs/nvim-autopairs/default.nix
diff --git a/modules/autopairs/nvim-autopairs/nvim-autopairs.nix b/modules/plugins/autopairs/nvim-autopairs/nvim-autopairs.nix
similarity index 100%
rename from modules/autopairs/nvim-autopairs/nvim-autopairs.nix
rename to modules/plugins/autopairs/nvim-autopairs/nvim-autopairs.nix
diff --git a/modules/comments/comment-nvim/comment-nvim.nix b/modules/plugins/comments/comment-nvim/comment-nvim.nix
similarity index 100%
rename from modules/comments/comment-nvim/comment-nvim.nix
rename to modules/plugins/comments/comment-nvim/comment-nvim.nix
diff --git a/modules/comments/comment-nvim/config.nix b/modules/plugins/comments/comment-nvim/config.nix
similarity index 100%
rename from modules/comments/comment-nvim/config.nix
rename to modules/plugins/comments/comment-nvim/config.nix
diff --git a/modules/comments/comment-nvim/default.nix b/modules/plugins/comments/comment-nvim/default.nix
similarity index 100%
rename from modules/comments/comment-nvim/default.nix
rename to modules/plugins/comments/comment-nvim/default.nix
diff --git a/modules/comments/default.nix b/modules/plugins/comments/default.nix
similarity index 100%
rename from modules/comments/default.nix
rename to modules/plugins/comments/default.nix
diff --git a/modules/completion/default.nix b/modules/plugins/completion/default.nix
similarity index 100%
rename from modules/completion/default.nix
rename to modules/plugins/completion/default.nix
diff --git a/modules/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix
similarity index 100%
rename from modules/completion/nvim-cmp/config.nix
rename to modules/plugins/completion/nvim-cmp/config.nix
diff --git a/modules/completion/nvim-cmp/default.nix b/modules/plugins/completion/nvim-cmp/default.nix
similarity index 100%
rename from modules/completion/nvim-cmp/default.nix
rename to modules/plugins/completion/nvim-cmp/default.nix
diff --git a/modules/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
similarity index 100%
rename from modules/completion/nvim-cmp/nvim-cmp.nix
rename to modules/plugins/completion/nvim-cmp/nvim-cmp.nix
diff --git a/modules/dashboard/alpha/alpha.nix b/modules/plugins/dashboard/alpha/alpha.nix
similarity index 100%
rename from modules/dashboard/alpha/alpha.nix
rename to modules/plugins/dashboard/alpha/alpha.nix
diff --git a/modules/dashboard/alpha/config.nix b/modules/plugins/dashboard/alpha/config.nix
similarity index 100%
rename from modules/dashboard/alpha/config.nix
rename to modules/plugins/dashboard/alpha/config.nix
diff --git a/modules/dashboard/alpha/default.nix b/modules/plugins/dashboard/alpha/default.nix
similarity index 100%
rename from modules/dashboard/alpha/default.nix
rename to modules/plugins/dashboard/alpha/default.nix
diff --git a/modules/dashboard/dashboard-nvim/config.nix b/modules/plugins/dashboard/dashboard-nvim/config.nix
similarity index 100%
rename from modules/dashboard/dashboard-nvim/config.nix
rename to modules/plugins/dashboard/dashboard-nvim/config.nix
diff --git a/modules/dashboard/dashboard-nvim/dashboard-nvim.nix b/modules/plugins/dashboard/dashboard-nvim/dashboard-nvim.nix
similarity index 100%
rename from modules/dashboard/dashboard-nvim/dashboard-nvim.nix
rename to modules/plugins/dashboard/dashboard-nvim/dashboard-nvim.nix
diff --git a/modules/dashboard/dashboard-nvim/default.nix b/modules/plugins/dashboard/dashboard-nvim/default.nix
similarity index 100%
rename from modules/dashboard/dashboard-nvim/default.nix
rename to modules/plugins/dashboard/dashboard-nvim/default.nix
diff --git a/modules/dashboard/default.nix b/modules/plugins/dashboard/default.nix
similarity index 100%
rename from modules/dashboard/default.nix
rename to modules/plugins/dashboard/default.nix
diff --git a/modules/dashboard/startify/config.nix b/modules/plugins/dashboard/startify/config.nix
similarity index 100%
rename from modules/dashboard/startify/config.nix
rename to modules/plugins/dashboard/startify/config.nix
diff --git a/modules/dashboard/startify/default.nix b/modules/plugins/dashboard/startify/default.nix
similarity index 100%
rename from modules/dashboard/startify/default.nix
rename to modules/plugins/dashboard/startify/default.nix
diff --git a/modules/dashboard/startify/startify.nix b/modules/plugins/dashboard/startify/startify.nix
similarity index 100%
rename from modules/dashboard/startify/startify.nix
rename to modules/plugins/dashboard/startify/startify.nix
diff --git a/modules/debugger/default.nix b/modules/plugins/debugger/default.nix
similarity index 100%
rename from modules/debugger/default.nix
rename to modules/plugins/debugger/default.nix
diff --git a/modules/debugger/nvim-dap/config.nix b/modules/plugins/debugger/nvim-dap/config.nix
similarity index 100%
rename from modules/debugger/nvim-dap/config.nix
rename to modules/plugins/debugger/nvim-dap/config.nix
diff --git a/modules/debugger/nvim-dap/default.nix b/modules/plugins/debugger/nvim-dap/default.nix
similarity index 100%
rename from modules/debugger/nvim-dap/default.nix
rename to modules/plugins/debugger/nvim-dap/default.nix
diff --git a/modules/debugger/nvim-dap/nvim-dap.nix b/modules/plugins/debugger/nvim-dap/nvim-dap.nix
similarity index 100%
rename from modules/debugger/nvim-dap/nvim-dap.nix
rename to modules/plugins/debugger/nvim-dap/nvim-dap.nix
diff --git a/modules/filetree/default.nix b/modules/plugins/filetree/default.nix
similarity index 100%
rename from modules/filetree/default.nix
rename to modules/plugins/filetree/default.nix
diff --git a/modules/filetree/nvimtree/config.nix b/modules/plugins/filetree/nvimtree/config.nix
similarity index 100%
rename from modules/filetree/nvimtree/config.nix
rename to modules/plugins/filetree/nvimtree/config.nix
diff --git a/modules/filetree/nvimtree/default.nix b/modules/plugins/filetree/nvimtree/default.nix
similarity index 100%
rename from modules/filetree/nvimtree/default.nix
rename to modules/plugins/filetree/nvimtree/default.nix
diff --git a/modules/filetree/nvimtree/nvimtree.nix b/modules/plugins/filetree/nvimtree/nvimtree.nix
similarity index 100%
rename from modules/filetree/nvimtree/nvimtree.nix
rename to modules/plugins/filetree/nvimtree/nvimtree.nix
diff --git a/modules/git/config.nix b/modules/plugins/git/config.nix
similarity index 100%
rename from modules/git/config.nix
rename to modules/plugins/git/config.nix
diff --git a/modules/git/default.nix b/modules/plugins/git/default.nix
similarity index 100%
rename from modules/git/default.nix
rename to modules/plugins/git/default.nix
diff --git a/modules/git/git.nix b/modules/plugins/git/git.nix
similarity index 100%
rename from modules/git/git.nix
rename to modules/plugins/git/git.nix
diff --git a/modules/languages/bash/bash.nix b/modules/plugins/languages/bash/bash.nix
similarity index 100%
rename from modules/languages/bash/bash.nix
rename to modules/plugins/languages/bash/bash.nix
diff --git a/modules/languages/bash/config.nix b/modules/plugins/languages/bash/config.nix
similarity index 100%
rename from modules/languages/bash/config.nix
rename to modules/plugins/languages/bash/config.nix
diff --git a/modules/languages/bash/default.nix b/modules/plugins/languages/bash/default.nix
similarity index 100%
rename from modules/languages/bash/default.nix
rename to modules/plugins/languages/bash/default.nix
diff --git a/modules/languages/clang.nix b/modules/plugins/languages/clang.nix
similarity index 100%
rename from modules/languages/clang.nix
rename to modules/plugins/languages/clang.nix
diff --git a/modules/languages/css.nix b/modules/plugins/languages/css.nix
similarity index 100%
rename from modules/languages/css.nix
rename to modules/plugins/languages/css.nix
diff --git a/modules/languages/dart/config.nix b/modules/plugins/languages/dart/config.nix
similarity index 100%
rename from modules/languages/dart/config.nix
rename to modules/plugins/languages/dart/config.nix
diff --git a/modules/languages/dart/dart.nix b/modules/plugins/languages/dart/dart.nix
similarity index 100%
rename from modules/languages/dart/dart.nix
rename to modules/plugins/languages/dart/dart.nix
diff --git a/modules/languages/dart/default.nix b/modules/plugins/languages/dart/default.nix
similarity index 100%
rename from modules/languages/dart/default.nix
rename to modules/plugins/languages/dart/default.nix
diff --git a/modules/languages/default.nix b/modules/plugins/languages/default.nix
similarity index 100%
rename from modules/languages/default.nix
rename to modules/plugins/languages/default.nix
diff --git a/modules/languages/elixir/config.nix b/modules/plugins/languages/elixir/config.nix
similarity index 100%
rename from modules/languages/elixir/config.nix
rename to modules/plugins/languages/elixir/config.nix
diff --git a/modules/languages/elixir/default.nix b/modules/plugins/languages/elixir/default.nix
similarity index 100%
rename from modules/languages/elixir/default.nix
rename to modules/plugins/languages/elixir/default.nix
diff --git a/modules/languages/elixir/elixir-tools.nix b/modules/plugins/languages/elixir/elixir-tools.nix
similarity index 100%
rename from modules/languages/elixir/elixir-tools.nix
rename to modules/plugins/languages/elixir/elixir-tools.nix
diff --git a/modules/languages/go.nix b/modules/plugins/languages/go.nix
similarity index 100%
rename from modules/languages/go.nix
rename to modules/plugins/languages/go.nix
diff --git a/modules/languages/html.nix b/modules/plugins/languages/html.nix
similarity index 100%
rename from modules/languages/html.nix
rename to modules/plugins/languages/html.nix
diff --git a/modules/languages/java.nix b/modules/plugins/languages/java.nix
similarity index 100%
rename from modules/languages/java.nix
rename to modules/plugins/languages/java.nix
diff --git a/modules/languages/lua.nix b/modules/plugins/languages/lua.nix
similarity index 100%
rename from modules/languages/lua.nix
rename to modules/plugins/languages/lua.nix
diff --git a/modules/languages/markdown/config.nix b/modules/plugins/languages/markdown/config.nix
similarity index 100%
rename from modules/languages/markdown/config.nix
rename to modules/plugins/languages/markdown/config.nix
diff --git a/modules/languages/markdown/default.nix b/modules/plugins/languages/markdown/default.nix
similarity index 100%
rename from modules/languages/markdown/default.nix
rename to modules/plugins/languages/markdown/default.nix
diff --git a/modules/languages/markdown/markdown.nix b/modules/plugins/languages/markdown/markdown.nix
similarity index 100%
rename from modules/languages/markdown/markdown.nix
rename to modules/plugins/languages/markdown/markdown.nix
diff --git a/modules/languages/nim.nix b/modules/plugins/languages/nim.nix
similarity index 100%
rename from modules/languages/nim.nix
rename to modules/plugins/languages/nim.nix
diff --git a/modules/languages/nix.nix b/modules/plugins/languages/nix.nix
similarity index 100%
rename from modules/languages/nix.nix
rename to modules/plugins/languages/nix.nix
diff --git a/modules/languages/php.nix b/modules/plugins/languages/php.nix
similarity index 100%
rename from modules/languages/php.nix
rename to modules/plugins/languages/php.nix
diff --git a/modules/languages/python.nix b/modules/plugins/languages/python.nix
similarity index 100%
rename from modules/languages/python.nix
rename to modules/plugins/languages/python.nix
diff --git a/modules/languages/rust.nix b/modules/plugins/languages/rust.nix
similarity index 100%
rename from modules/languages/rust.nix
rename to modules/plugins/languages/rust.nix
diff --git a/modules/languages/sql.nix b/modules/plugins/languages/sql.nix
similarity index 100%
rename from modules/languages/sql.nix
rename to modules/plugins/languages/sql.nix
diff --git a/modules/languages/svelte.nix b/modules/plugins/languages/svelte.nix
similarity index 100%
rename from modules/languages/svelte.nix
rename to modules/plugins/languages/svelte.nix
diff --git a/modules/languages/tailwind.nix b/modules/plugins/languages/tailwind.nix
similarity index 100%
rename from modules/languages/tailwind.nix
rename to modules/plugins/languages/tailwind.nix
diff --git a/modules/languages/terraform.nix b/modules/plugins/languages/terraform.nix
similarity index 100%
rename from modules/languages/terraform.nix
rename to modules/plugins/languages/terraform.nix
diff --git a/modules/languages/tidal/config.nix b/modules/plugins/languages/tidal/config.nix
similarity index 100%
rename from modules/languages/tidal/config.nix
rename to modules/plugins/languages/tidal/config.nix
diff --git a/modules/languages/tidal/default.nix b/modules/plugins/languages/tidal/default.nix
similarity index 100%
rename from modules/languages/tidal/default.nix
rename to modules/plugins/languages/tidal/default.nix
diff --git a/modules/languages/tidal/tidal.nix b/modules/plugins/languages/tidal/tidal.nix
similarity index 100%
rename from modules/languages/tidal/tidal.nix
rename to modules/plugins/languages/tidal/tidal.nix
diff --git a/modules/languages/ts.nix b/modules/plugins/languages/ts.nix
similarity index 100%
rename from modules/languages/ts.nix
rename to modules/plugins/languages/ts.nix
diff --git a/modules/languages/zig.nix b/modules/plugins/languages/zig.nix
similarity index 100%
rename from modules/languages/zig.nix
rename to modules/plugins/languages/zig.nix
diff --git a/modules/lsp/config.nix b/modules/plugins/lsp/config.nix
similarity index 100%
rename from modules/lsp/config.nix
rename to modules/plugins/lsp/config.nix
diff --git a/modules/lsp/default.nix b/modules/plugins/lsp/default.nix
similarity index 100%
rename from modules/lsp/default.nix
rename to modules/plugins/lsp/default.nix
diff --git a/modules/lsp/lightbulb/config.nix b/modules/plugins/lsp/lightbulb/config.nix
similarity index 100%
rename from modules/lsp/lightbulb/config.nix
rename to modules/plugins/lsp/lightbulb/config.nix
diff --git a/modules/lsp/lightbulb/default.nix b/modules/plugins/lsp/lightbulb/default.nix
similarity index 100%
rename from modules/lsp/lightbulb/default.nix
rename to modules/plugins/lsp/lightbulb/default.nix
diff --git a/modules/lsp/lightbulb/lightbulb.nix b/modules/plugins/lsp/lightbulb/lightbulb.nix
similarity index 100%
rename from modules/lsp/lightbulb/lightbulb.nix
rename to modules/plugins/lsp/lightbulb/lightbulb.nix
diff --git a/modules/lsp/lsp-signature/config.nix b/modules/plugins/lsp/lsp-signature/config.nix
similarity index 100%
rename from modules/lsp/lsp-signature/config.nix
rename to modules/plugins/lsp/lsp-signature/config.nix
diff --git a/modules/lsp/lsp-signature/default.nix b/modules/plugins/lsp/lsp-signature/default.nix
similarity index 100%
rename from modules/lsp/lsp-signature/default.nix
rename to modules/plugins/lsp/lsp-signature/default.nix
diff --git a/modules/lsp/lsp-signature/lsp-signature.nix b/modules/plugins/lsp/lsp-signature/lsp-signature.nix
similarity index 100%
rename from modules/lsp/lsp-signature/lsp-signature.nix
rename to modules/plugins/lsp/lsp-signature/lsp-signature.nix
diff --git a/modules/lsp/lspconfig/config.nix b/modules/plugins/lsp/lspconfig/config.nix
similarity index 100%
rename from modules/lsp/lspconfig/config.nix
rename to modules/plugins/lsp/lspconfig/config.nix
diff --git a/modules/lsp/lspconfig/default.nix b/modules/plugins/lsp/lspconfig/default.nix
similarity index 100%
rename from modules/lsp/lspconfig/default.nix
rename to modules/plugins/lsp/lspconfig/default.nix
diff --git a/modules/lsp/lspconfig/lspconfig.nix b/modules/plugins/lsp/lspconfig/lspconfig.nix
similarity index 100%
rename from modules/lsp/lspconfig/lspconfig.nix
rename to modules/plugins/lsp/lspconfig/lspconfig.nix
diff --git a/modules/lsp/lspkind/config.nix b/modules/plugins/lsp/lspkind/config.nix
similarity index 100%
rename from modules/lsp/lspkind/config.nix
rename to modules/plugins/lsp/lspkind/config.nix
diff --git a/modules/lsp/lspkind/default.nix b/modules/plugins/lsp/lspkind/default.nix
similarity index 100%
rename from modules/lsp/lspkind/default.nix
rename to modules/plugins/lsp/lspkind/default.nix
diff --git a/modules/lsp/lspkind/lspkind.nix b/modules/plugins/lsp/lspkind/lspkind.nix
similarity index 100%
rename from modules/lsp/lspkind/lspkind.nix
rename to modules/plugins/lsp/lspkind/lspkind.nix
diff --git a/modules/lsp/lsplines/config.nix b/modules/plugins/lsp/lsplines/config.nix
similarity index 100%
rename from modules/lsp/lsplines/config.nix
rename to modules/plugins/lsp/lsplines/config.nix
diff --git a/modules/lsp/lsplines/default.nix b/modules/plugins/lsp/lsplines/default.nix
similarity index 100%
rename from modules/lsp/lsplines/default.nix
rename to modules/plugins/lsp/lsplines/default.nix
diff --git a/modules/lsp/lsplines/lsplines.nix b/modules/plugins/lsp/lsplines/lsplines.nix
similarity index 100%
rename from modules/lsp/lsplines/lsplines.nix
rename to modules/plugins/lsp/lsplines/lsplines.nix
diff --git a/modules/lsp/lspsaga/config.nix b/modules/plugins/lsp/lspsaga/config.nix
similarity index 100%
rename from modules/lsp/lspsaga/config.nix
rename to modules/plugins/lsp/lspsaga/config.nix
diff --git a/modules/lsp/lspsaga/default.nix b/modules/plugins/lsp/lspsaga/default.nix
similarity index 100%
rename from modules/lsp/lspsaga/default.nix
rename to modules/plugins/lsp/lspsaga/default.nix
diff --git a/modules/lsp/lspsaga/lspsaga.nix b/modules/plugins/lsp/lspsaga/lspsaga.nix
similarity index 100%
rename from modules/lsp/lspsaga/lspsaga.nix
rename to modules/plugins/lsp/lspsaga/lspsaga.nix
diff --git a/modules/lsp/module.nix b/modules/plugins/lsp/module.nix
similarity index 100%
rename from modules/lsp/module.nix
rename to modules/plugins/lsp/module.nix
diff --git a/modules/lsp/null-ls/config.nix b/modules/plugins/lsp/null-ls/config.nix
similarity index 100%
rename from modules/lsp/null-ls/config.nix
rename to modules/plugins/lsp/null-ls/config.nix
diff --git a/modules/lsp/null-ls/default.nix b/modules/plugins/lsp/null-ls/default.nix
similarity index 100%
rename from modules/lsp/null-ls/default.nix
rename to modules/plugins/lsp/null-ls/default.nix
diff --git a/modules/lsp/null-ls/null-ls.nix b/modules/plugins/lsp/null-ls/null-ls.nix
similarity index 100%
rename from modules/lsp/null-ls/null-ls.nix
rename to modules/plugins/lsp/null-ls/null-ls.nix
diff --git a/modules/lsp/nvim-code-action-menu/config.nix b/modules/plugins/lsp/nvim-code-action-menu/config.nix
similarity index 100%
rename from modules/lsp/nvim-code-action-menu/config.nix
rename to modules/plugins/lsp/nvim-code-action-menu/config.nix
diff --git a/modules/lsp/nvim-code-action-menu/default.nix b/modules/plugins/lsp/nvim-code-action-menu/default.nix
similarity index 100%
rename from modules/lsp/nvim-code-action-menu/default.nix
rename to modules/plugins/lsp/nvim-code-action-menu/default.nix
diff --git a/modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix b/modules/plugins/lsp/nvim-code-action-menu/nvim-code-action-menu.nix
similarity index 100%
rename from modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix
rename to modules/plugins/lsp/nvim-code-action-menu/nvim-code-action-menu.nix
diff --git a/modules/lsp/nvim-docs-view/config.nix b/modules/plugins/lsp/nvim-docs-view/config.nix
similarity index 100%
rename from modules/lsp/nvim-docs-view/config.nix
rename to modules/plugins/lsp/nvim-docs-view/config.nix
diff --git a/modules/lsp/nvim-docs-view/default.nix b/modules/plugins/lsp/nvim-docs-view/default.nix
similarity index 100%
rename from modules/lsp/nvim-docs-view/default.nix
rename to modules/plugins/lsp/nvim-docs-view/default.nix
diff --git a/modules/lsp/nvim-docs-view/nvim-docs-view.nix b/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix
similarity index 100%
rename from modules/lsp/nvim-docs-view/nvim-docs-view.nix
rename to modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix
diff --git a/modules/lsp/trouble/config.nix b/modules/plugins/lsp/trouble/config.nix
similarity index 100%
rename from modules/lsp/trouble/config.nix
rename to modules/plugins/lsp/trouble/config.nix
diff --git a/modules/lsp/trouble/default.nix b/modules/plugins/lsp/trouble/default.nix
similarity index 100%
rename from modules/lsp/trouble/default.nix
rename to modules/plugins/lsp/trouble/default.nix
diff --git a/modules/lsp/trouble/trouble.nix b/modules/plugins/lsp/trouble/trouble.nix
similarity index 100%
rename from modules/lsp/trouble/trouble.nix
rename to modules/plugins/lsp/trouble/trouble.nix
diff --git a/modules/minimap/codewindow/codewindow.nix b/modules/plugins/minimap/codewindow/codewindow.nix
similarity index 100%
rename from modules/minimap/codewindow/codewindow.nix
rename to modules/plugins/minimap/codewindow/codewindow.nix
diff --git a/modules/minimap/codewindow/config.nix b/modules/plugins/minimap/codewindow/config.nix
similarity index 100%
rename from modules/minimap/codewindow/config.nix
rename to modules/plugins/minimap/codewindow/config.nix
diff --git a/modules/minimap/codewindow/default.nix b/modules/plugins/minimap/codewindow/default.nix
similarity index 100%
rename from modules/minimap/codewindow/default.nix
rename to modules/plugins/minimap/codewindow/default.nix
diff --git a/modules/minimap/default.nix b/modules/plugins/minimap/default.nix
similarity index 100%
rename from modules/minimap/default.nix
rename to modules/plugins/minimap/default.nix
diff --git a/modules/minimap/minimap-vim/config.nix b/modules/plugins/minimap/minimap-vim/config.nix
similarity index 100%
rename from modules/minimap/minimap-vim/config.nix
rename to modules/plugins/minimap/minimap-vim/config.nix
diff --git a/modules/minimap/minimap-vim/default.nix b/modules/plugins/minimap/minimap-vim/default.nix
similarity index 100%
rename from modules/minimap/minimap-vim/default.nix
rename to modules/plugins/minimap/minimap-vim/default.nix
diff --git a/modules/minimap/minimap-vim/minimap-vim.nix b/modules/plugins/minimap/minimap-vim/minimap-vim.nix
similarity index 100%
rename from modules/minimap/minimap-vim/minimap-vim.nix
rename to modules/plugins/minimap/minimap-vim/minimap-vim.nix
diff --git a/modules/notes/default.nix b/modules/plugins/notes/default.nix
similarity index 100%
rename from modules/notes/default.nix
rename to modules/plugins/notes/default.nix
diff --git a/modules/notes/mind-nvim/config.nix b/modules/plugins/notes/mind-nvim/config.nix
similarity index 100%
rename from modules/notes/mind-nvim/config.nix
rename to modules/plugins/notes/mind-nvim/config.nix
diff --git a/modules/notes/mind-nvim/default.nix b/modules/plugins/notes/mind-nvim/default.nix
similarity index 100%
rename from modules/notes/mind-nvim/default.nix
rename to modules/plugins/notes/mind-nvim/default.nix
diff --git a/modules/notes/mind-nvim/mind-nvim.nix b/modules/plugins/notes/mind-nvim/mind-nvim.nix
similarity index 100%
rename from modules/notes/mind-nvim/mind-nvim.nix
rename to modules/plugins/notes/mind-nvim/mind-nvim.nix
diff --git a/modules/notes/obsidian/config.nix b/modules/plugins/notes/obsidian/config.nix
similarity index 100%
rename from modules/notes/obsidian/config.nix
rename to modules/plugins/notes/obsidian/config.nix
diff --git a/modules/notes/obsidian/default.nix b/modules/plugins/notes/obsidian/default.nix
similarity index 100%
rename from modules/notes/obsidian/default.nix
rename to modules/plugins/notes/obsidian/default.nix
diff --git a/modules/notes/obsidian/obsidian.nix b/modules/plugins/notes/obsidian/obsidian.nix
similarity index 100%
rename from modules/notes/obsidian/obsidian.nix
rename to modules/plugins/notes/obsidian/obsidian.nix
diff --git a/modules/notes/orgmode/config.nix b/modules/plugins/notes/orgmode/config.nix
similarity index 100%
rename from modules/notes/orgmode/config.nix
rename to modules/plugins/notes/orgmode/config.nix
diff --git a/modules/notes/orgmode/default.nix b/modules/plugins/notes/orgmode/default.nix
similarity index 100%
rename from modules/notes/orgmode/default.nix
rename to modules/plugins/notes/orgmode/default.nix
diff --git a/modules/notes/orgmode/orgmode.nix b/modules/plugins/notes/orgmode/orgmode.nix
similarity index 100%
rename from modules/notes/orgmode/orgmode.nix
rename to modules/plugins/notes/orgmode/orgmode.nix
diff --git a/modules/notes/todo-comments/config.nix b/modules/plugins/notes/todo-comments/config.nix
similarity index 100%
rename from modules/notes/todo-comments/config.nix
rename to modules/plugins/notes/todo-comments/config.nix
diff --git a/modules/notes/todo-comments/default.nix b/modules/plugins/notes/todo-comments/default.nix
similarity index 100%
rename from modules/notes/todo-comments/default.nix
rename to modules/plugins/notes/todo-comments/default.nix
diff --git a/modules/notes/todo-comments/todo-comments.nix b/modules/plugins/notes/todo-comments/todo-comments.nix
similarity index 100%
rename from modules/notes/todo-comments/todo-comments.nix
rename to modules/plugins/notes/todo-comments/todo-comments.nix
diff --git a/modules/projects/default.nix b/modules/plugins/projects/default.nix
similarity index 100%
rename from modules/projects/default.nix
rename to modules/plugins/projects/default.nix
diff --git a/modules/projects/project-nvim/config.nix b/modules/plugins/projects/project-nvim/config.nix
similarity index 100%
rename from modules/projects/project-nvim/config.nix
rename to modules/plugins/projects/project-nvim/config.nix
diff --git a/modules/projects/project-nvim/default.nix b/modules/plugins/projects/project-nvim/default.nix
similarity index 100%
rename from modules/projects/project-nvim/default.nix
rename to modules/plugins/projects/project-nvim/default.nix
diff --git a/modules/projects/project-nvim/project-nvim.nix b/modules/plugins/projects/project-nvim/project-nvim.nix
similarity index 100%
rename from modules/projects/project-nvim/project-nvim.nix
rename to modules/plugins/projects/project-nvim/project-nvim.nix
diff --git a/modules/rich-presence/default.nix b/modules/plugins/rich-presence/default.nix
similarity index 100%
rename from modules/rich-presence/default.nix
rename to modules/plugins/rich-presence/default.nix
diff --git a/modules/rich-presence/neocord/config.nix b/modules/plugins/rich-presence/neocord/config.nix
similarity index 100%
rename from modules/rich-presence/neocord/config.nix
rename to modules/plugins/rich-presence/neocord/config.nix
diff --git a/modules/rich-presence/neocord/default.nix b/modules/plugins/rich-presence/neocord/default.nix
similarity index 100%
rename from modules/rich-presence/neocord/default.nix
rename to modules/plugins/rich-presence/neocord/default.nix
diff --git a/modules/rich-presence/neocord/neocord.nix b/modules/plugins/rich-presence/neocord/neocord.nix
similarity index 100%
rename from modules/rich-presence/neocord/neocord.nix
rename to modules/plugins/rich-presence/neocord/neocord.nix
diff --git a/modules/session/default.nix b/modules/plugins/session/default.nix
similarity index 100%
rename from modules/session/default.nix
rename to modules/plugins/session/default.nix
diff --git a/modules/session/nvim-session-manager/config.nix b/modules/plugins/session/nvim-session-manager/config.nix
similarity index 100%
rename from modules/session/nvim-session-manager/config.nix
rename to modules/plugins/session/nvim-session-manager/config.nix
diff --git a/modules/session/nvim-session-manager/default.nix b/modules/plugins/session/nvim-session-manager/default.nix
similarity index 100%
rename from modules/session/nvim-session-manager/default.nix
rename to modules/plugins/session/nvim-session-manager/default.nix
diff --git a/modules/session/nvim-session-manager/nvim-session-manager.nix b/modules/plugins/session/nvim-session-manager/nvim-session-manager.nix
similarity index 100%
rename from modules/session/nvim-session-manager/nvim-session-manager.nix
rename to modules/plugins/session/nvim-session-manager/nvim-session-manager.nix
diff --git a/modules/snippets/default.nix b/modules/plugins/snippets/default.nix
similarity index 100%
rename from modules/snippets/default.nix
rename to modules/plugins/snippets/default.nix
diff --git a/modules/snippets/vsnip/config.nix b/modules/plugins/snippets/vsnip/config.nix
similarity index 100%
rename from modules/snippets/vsnip/config.nix
rename to modules/plugins/snippets/vsnip/config.nix
diff --git a/modules/snippets/vsnip/default.nix b/modules/plugins/snippets/vsnip/default.nix
similarity index 100%
rename from modules/snippets/vsnip/default.nix
rename to modules/plugins/snippets/vsnip/default.nix
diff --git a/modules/snippets/vsnip/vsnip.nix b/modules/plugins/snippets/vsnip/vsnip.nix
similarity index 100%
rename from modules/snippets/vsnip/vsnip.nix
rename to modules/plugins/snippets/vsnip/vsnip.nix
diff --git a/modules/statusline/default.nix b/modules/plugins/statusline/default.nix
similarity index 100%
rename from modules/statusline/default.nix
rename to modules/plugins/statusline/default.nix
diff --git a/modules/statusline/lualine/config.nix b/modules/plugins/statusline/lualine/config.nix
similarity index 100%
rename from modules/statusline/lualine/config.nix
rename to modules/plugins/statusline/lualine/config.nix
diff --git a/modules/statusline/lualine/default.nix b/modules/plugins/statusline/lualine/default.nix
similarity index 100%
rename from modules/statusline/lualine/default.nix
rename to modules/plugins/statusline/lualine/default.nix
diff --git a/modules/statusline/lualine/lualine.nix b/modules/plugins/statusline/lualine/lualine.nix
similarity index 100%
rename from modules/statusline/lualine/lualine.nix
rename to modules/plugins/statusline/lualine/lualine.nix
diff --git a/modules/statusline/lualine/supported_themes.nix b/modules/plugins/statusline/lualine/supported_themes.nix
similarity index 100%
rename from modules/statusline/lualine/supported_themes.nix
rename to modules/plugins/statusline/lualine/supported_themes.nix
diff --git a/modules/tabline/default.nix b/modules/plugins/tabline/default.nix
similarity index 100%
rename from modules/tabline/default.nix
rename to modules/plugins/tabline/default.nix
diff --git a/modules/tabline/nvim-bufferline/config.nix b/modules/plugins/tabline/nvim-bufferline/config.nix
similarity index 100%
rename from modules/tabline/nvim-bufferline/config.nix
rename to modules/plugins/tabline/nvim-bufferline/config.nix
diff --git a/modules/tabline/nvim-bufferline/default.nix b/modules/plugins/tabline/nvim-bufferline/default.nix
similarity index 100%
rename from modules/tabline/nvim-bufferline/default.nix
rename to modules/plugins/tabline/nvim-bufferline/default.nix
diff --git a/modules/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
similarity index 100%
rename from modules/tabline/nvim-bufferline/nvim-bufferline.nix
rename to modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
diff --git a/modules/terminal/default.nix b/modules/plugins/terminal/default.nix
similarity index 100%
rename from modules/terminal/default.nix
rename to modules/plugins/terminal/default.nix
diff --git a/modules/terminal/toggleterm/config.nix b/modules/plugins/terminal/toggleterm/config.nix
similarity index 100%
rename from modules/terminal/toggleterm/config.nix
rename to modules/plugins/terminal/toggleterm/config.nix
diff --git a/modules/terminal/toggleterm/default.nix b/modules/plugins/terminal/toggleterm/default.nix
similarity index 100%
rename from modules/terminal/toggleterm/default.nix
rename to modules/plugins/terminal/toggleterm/default.nix
diff --git a/modules/terminal/toggleterm/toggleterm.nix b/modules/plugins/terminal/toggleterm/toggleterm.nix
similarity index 100%
rename from modules/terminal/toggleterm/toggleterm.nix
rename to modules/plugins/terminal/toggleterm/toggleterm.nix
diff --git a/modules/theme/config.nix b/modules/plugins/theme/config.nix
similarity index 100%
rename from modules/theme/config.nix
rename to modules/plugins/theme/config.nix
diff --git a/modules/theme/default.nix b/modules/plugins/theme/default.nix
similarity index 100%
rename from modules/theme/default.nix
rename to modules/plugins/theme/default.nix
diff --git a/modules/theme/supported_themes.nix b/modules/plugins/theme/supported_themes.nix
similarity index 100%
rename from modules/theme/supported_themes.nix
rename to modules/plugins/theme/supported_themes.nix
diff --git a/modules/theme/theme.nix b/modules/plugins/theme/theme.nix
similarity index 100%
rename from modules/theme/theme.nix
rename to modules/plugins/theme/theme.nix
diff --git a/modules/treesitter/config.nix b/modules/plugins/treesitter/config.nix
similarity index 100%
rename from modules/treesitter/config.nix
rename to modules/plugins/treesitter/config.nix
diff --git a/modules/treesitter/context.nix b/modules/plugins/treesitter/context.nix
similarity index 100%
rename from modules/treesitter/context.nix
rename to modules/plugins/treesitter/context.nix
diff --git a/modules/treesitter/default.nix b/modules/plugins/treesitter/default.nix
similarity index 100%
rename from modules/treesitter/default.nix
rename to modules/plugins/treesitter/default.nix
diff --git a/modules/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix
similarity index 100%
rename from modules/treesitter/treesitter.nix
rename to modules/plugins/treesitter/treesitter.nix
diff --git a/modules/ui/borders/borders.nix b/modules/plugins/ui/borders/borders.nix
similarity index 100%
rename from modules/ui/borders/borders.nix
rename to modules/plugins/ui/borders/borders.nix
diff --git a/modules/ui/borders/default.nix b/modules/plugins/ui/borders/default.nix
similarity index 100%
rename from modules/ui/borders/default.nix
rename to modules/plugins/ui/borders/default.nix
diff --git a/modules/ui/breadcrumbs/breadcrumbs.nix b/modules/plugins/ui/breadcrumbs/breadcrumbs.nix
similarity index 100%
rename from modules/ui/breadcrumbs/breadcrumbs.nix
rename to modules/plugins/ui/breadcrumbs/breadcrumbs.nix
diff --git a/modules/ui/breadcrumbs/config.nix b/modules/plugins/ui/breadcrumbs/config.nix
similarity index 100%
rename from modules/ui/breadcrumbs/config.nix
rename to modules/plugins/ui/breadcrumbs/config.nix
diff --git a/modules/ui/breadcrumbs/default.nix b/modules/plugins/ui/breadcrumbs/default.nix
similarity index 100%
rename from modules/ui/breadcrumbs/default.nix
rename to modules/plugins/ui/breadcrumbs/default.nix
diff --git a/modules/ui/colorizer/colorizer.nix b/modules/plugins/ui/colorizer/colorizer.nix
similarity index 100%
rename from modules/ui/colorizer/colorizer.nix
rename to modules/plugins/ui/colorizer/colorizer.nix
diff --git a/modules/ui/colorizer/config.nix b/modules/plugins/ui/colorizer/config.nix
similarity index 100%
rename from modules/ui/colorizer/config.nix
rename to modules/plugins/ui/colorizer/config.nix
diff --git a/modules/ui/colorizer/default.nix b/modules/plugins/ui/colorizer/default.nix
similarity index 100%
rename from modules/ui/colorizer/default.nix
rename to modules/plugins/ui/colorizer/default.nix
diff --git a/modules/ui/default.nix b/modules/plugins/ui/default.nix
similarity index 100%
rename from modules/ui/default.nix
rename to modules/plugins/ui/default.nix
diff --git a/modules/ui/illuminate/config.nix b/modules/plugins/ui/illuminate/config.nix
similarity index 100%
rename from modules/ui/illuminate/config.nix
rename to modules/plugins/ui/illuminate/config.nix
diff --git a/modules/ui/illuminate/default.nix b/modules/plugins/ui/illuminate/default.nix
similarity index 100%
rename from modules/ui/illuminate/default.nix
rename to modules/plugins/ui/illuminate/default.nix
diff --git a/modules/ui/illuminate/illuminate.nix b/modules/plugins/ui/illuminate/illuminate.nix
similarity index 100%
rename from modules/ui/illuminate/illuminate.nix
rename to modules/plugins/ui/illuminate/illuminate.nix
diff --git a/modules/ui/modes/config.nix b/modules/plugins/ui/modes/config.nix
similarity index 100%
rename from modules/ui/modes/config.nix
rename to modules/plugins/ui/modes/config.nix
diff --git a/modules/ui/modes/default.nix b/modules/plugins/ui/modes/default.nix
similarity index 100%
rename from modules/ui/modes/default.nix
rename to modules/plugins/ui/modes/default.nix
diff --git a/modules/ui/modes/modes.nix b/modules/plugins/ui/modes/modes.nix
similarity index 100%
rename from modules/ui/modes/modes.nix
rename to modules/plugins/ui/modes/modes.nix
diff --git a/modules/ui/noice/config.nix b/modules/plugins/ui/noice/config.nix
similarity index 100%
rename from modules/ui/noice/config.nix
rename to modules/plugins/ui/noice/config.nix
diff --git a/modules/ui/noice/default.nix b/modules/plugins/ui/noice/default.nix
similarity index 100%
rename from modules/ui/noice/default.nix
rename to modules/plugins/ui/noice/default.nix
diff --git a/modules/ui/noice/noice.nix b/modules/plugins/ui/noice/noice.nix
similarity index 100%
rename from modules/ui/noice/noice.nix
rename to modules/plugins/ui/noice/noice.nix
diff --git a/modules/ui/notifications/default.nix b/modules/plugins/ui/notifications/default.nix
similarity index 100%
rename from modules/ui/notifications/default.nix
rename to modules/plugins/ui/notifications/default.nix
diff --git a/modules/ui/notifications/nvim-notify/config.nix b/modules/plugins/ui/notifications/nvim-notify/config.nix
similarity index 100%
rename from modules/ui/notifications/nvim-notify/config.nix
rename to modules/plugins/ui/notifications/nvim-notify/config.nix
diff --git a/modules/ui/notifications/nvim-notify/default.nix b/modules/plugins/ui/notifications/nvim-notify/default.nix
similarity index 100%
rename from modules/ui/notifications/nvim-notify/default.nix
rename to modules/plugins/ui/notifications/nvim-notify/default.nix
diff --git a/modules/ui/notifications/nvim-notify/nvim-notify.nix b/modules/plugins/ui/notifications/nvim-notify/nvim-notify.nix
similarity index 100%
rename from modules/ui/notifications/nvim-notify/nvim-notify.nix
rename to modules/plugins/ui/notifications/nvim-notify/nvim-notify.nix
diff --git a/modules/ui/smartcolumn/config.nix b/modules/plugins/ui/smartcolumn/config.nix
similarity index 100%
rename from modules/ui/smartcolumn/config.nix
rename to modules/plugins/ui/smartcolumn/config.nix
diff --git a/modules/ui/smartcolumn/default.nix b/modules/plugins/ui/smartcolumn/default.nix
similarity index 100%
rename from modules/ui/smartcolumn/default.nix
rename to modules/plugins/ui/smartcolumn/default.nix
diff --git a/modules/ui/smartcolumn/smartcolumn.nix b/modules/plugins/ui/smartcolumn/smartcolumn.nix
similarity index 100%
rename from modules/ui/smartcolumn/smartcolumn.nix
rename to modules/plugins/ui/smartcolumn/smartcolumn.nix
diff --git a/modules/utility/binds/cheatsheet/cheatsheet.nix b/modules/plugins/utility/binds/cheatsheet/cheatsheet.nix
similarity index 100%
rename from modules/utility/binds/cheatsheet/cheatsheet.nix
rename to modules/plugins/utility/binds/cheatsheet/cheatsheet.nix
diff --git a/modules/utility/binds/cheatsheet/config.nix b/modules/plugins/utility/binds/cheatsheet/config.nix
similarity index 100%
rename from modules/utility/binds/cheatsheet/config.nix
rename to modules/plugins/utility/binds/cheatsheet/config.nix
diff --git a/modules/utility/binds/cheatsheet/default.nix b/modules/plugins/utility/binds/cheatsheet/default.nix
similarity index 100%
rename from modules/utility/binds/cheatsheet/default.nix
rename to modules/plugins/utility/binds/cheatsheet/default.nix
diff --git a/modules/utility/binds/default.nix b/modules/plugins/utility/binds/default.nix
similarity index 100%
rename from modules/utility/binds/default.nix
rename to modules/plugins/utility/binds/default.nix
diff --git a/modules/utility/binds/which-key/config.nix b/modules/plugins/utility/binds/which-key/config.nix
similarity index 100%
rename from modules/utility/binds/which-key/config.nix
rename to modules/plugins/utility/binds/which-key/config.nix
diff --git a/modules/utility/binds/which-key/default.nix b/modules/plugins/utility/binds/which-key/default.nix
similarity index 100%
rename from modules/utility/binds/which-key/default.nix
rename to modules/plugins/utility/binds/which-key/default.nix
diff --git a/modules/utility/binds/which-key/which-key.nix b/modules/plugins/utility/binds/which-key/which-key.nix
similarity index 100%
rename from modules/utility/binds/which-key/which-key.nix
rename to modules/plugins/utility/binds/which-key/which-key.nix
diff --git a/modules/utility/ccc/ccc.nix b/modules/plugins/utility/ccc/ccc.nix
similarity index 100%
rename from modules/utility/ccc/ccc.nix
rename to modules/plugins/utility/ccc/ccc.nix
diff --git a/modules/utility/ccc/config.nix b/modules/plugins/utility/ccc/config.nix
similarity index 100%
rename from modules/utility/ccc/config.nix
rename to modules/plugins/utility/ccc/config.nix
diff --git a/modules/utility/ccc/default.nix b/modules/plugins/utility/ccc/default.nix
similarity index 100%
rename from modules/utility/ccc/default.nix
rename to modules/plugins/utility/ccc/default.nix
diff --git a/modules/utility/default.nix b/modules/plugins/utility/default.nix
similarity index 100%
rename from modules/utility/default.nix
rename to modules/plugins/utility/default.nix
diff --git a/modules/utility/diffview/config.nix b/modules/plugins/utility/diffview/config.nix
similarity index 100%
rename from modules/utility/diffview/config.nix
rename to modules/plugins/utility/diffview/config.nix
diff --git a/modules/utility/diffview/default.nix b/modules/plugins/utility/diffview/default.nix
similarity index 100%
rename from modules/utility/diffview/default.nix
rename to modules/plugins/utility/diffview/default.nix
diff --git a/modules/utility/diffview/diffview.nix b/modules/plugins/utility/diffview/diffview.nix
similarity index 100%
rename from modules/utility/diffview/diffview.nix
rename to modules/plugins/utility/diffview/diffview.nix
diff --git a/modules/utility/gestures/default.nix b/modules/plugins/utility/gestures/default.nix
similarity index 100%
rename from modules/utility/gestures/default.nix
rename to modules/plugins/utility/gestures/default.nix
diff --git a/modules/utility/gestures/gesture-nvim/config.nix b/modules/plugins/utility/gestures/gesture-nvim/config.nix
similarity index 100%
rename from modules/utility/gestures/gesture-nvim/config.nix
rename to modules/plugins/utility/gestures/gesture-nvim/config.nix
diff --git a/modules/utility/gestures/gesture-nvim/default.nix b/modules/plugins/utility/gestures/gesture-nvim/default.nix
similarity index 100%
rename from modules/utility/gestures/gesture-nvim/default.nix
rename to modules/plugins/utility/gestures/gesture-nvim/default.nix
diff --git a/modules/utility/gestures/gesture-nvim/gesture-nvim.nix b/modules/plugins/utility/gestures/gesture-nvim/gesture-nvim.nix
similarity index 100%
rename from modules/utility/gestures/gesture-nvim/gesture-nvim.nix
rename to modules/plugins/utility/gestures/gesture-nvim/gesture-nvim.nix
diff --git a/modules/utility/icon-picker/config.nix b/modules/plugins/utility/icon-picker/config.nix
similarity index 100%
rename from modules/utility/icon-picker/config.nix
rename to modules/plugins/utility/icon-picker/config.nix
diff --git a/modules/utility/icon-picker/default.nix b/modules/plugins/utility/icon-picker/default.nix
similarity index 100%
rename from modules/utility/icon-picker/default.nix
rename to modules/plugins/utility/icon-picker/default.nix
diff --git a/modules/utility/icon-picker/icon-picker.nix b/modules/plugins/utility/icon-picker/icon-picker.nix
similarity index 100%
rename from modules/utility/icon-picker/icon-picker.nix
rename to modules/plugins/utility/icon-picker/icon-picker.nix
diff --git a/modules/utility/motion/default.nix b/modules/plugins/utility/motion/default.nix
similarity index 100%
rename from modules/utility/motion/default.nix
rename to modules/plugins/utility/motion/default.nix
diff --git a/modules/utility/motion/hop/config.nix b/modules/plugins/utility/motion/hop/config.nix
similarity index 100%
rename from modules/utility/motion/hop/config.nix
rename to modules/plugins/utility/motion/hop/config.nix
diff --git a/modules/utility/motion/hop/default.nix b/modules/plugins/utility/motion/hop/default.nix
similarity index 100%
rename from modules/utility/motion/hop/default.nix
rename to modules/plugins/utility/motion/hop/default.nix
diff --git a/modules/utility/motion/hop/hop.nix b/modules/plugins/utility/motion/hop/hop.nix
similarity index 100%
rename from modules/utility/motion/hop/hop.nix
rename to modules/plugins/utility/motion/hop/hop.nix
diff --git a/modules/utility/motion/leap/config.nix b/modules/plugins/utility/motion/leap/config.nix
similarity index 100%
rename from modules/utility/motion/leap/config.nix
rename to modules/plugins/utility/motion/leap/config.nix
diff --git a/modules/utility/motion/leap/default.nix b/modules/plugins/utility/motion/leap/default.nix
similarity index 100%
rename from modules/utility/motion/leap/default.nix
rename to modules/plugins/utility/motion/leap/default.nix
diff --git a/modules/utility/motion/leap/leap.nix b/modules/plugins/utility/motion/leap/leap.nix
similarity index 100%
rename from modules/utility/motion/leap/leap.nix
rename to modules/plugins/utility/motion/leap/leap.nix
diff --git a/modules/utility/preview/default.nix b/modules/plugins/utility/preview/default.nix
similarity index 100%
rename from modules/utility/preview/default.nix
rename to modules/plugins/utility/preview/default.nix
diff --git a/modules/utility/preview/glow/config.nix b/modules/plugins/utility/preview/glow/config.nix
similarity index 100%
rename from modules/utility/preview/glow/config.nix
rename to modules/plugins/utility/preview/glow/config.nix
diff --git a/modules/utility/preview/glow/default.nix b/modules/plugins/utility/preview/glow/default.nix
similarity index 100%
rename from modules/utility/preview/glow/default.nix
rename to modules/plugins/utility/preview/glow/default.nix
diff --git a/modules/utility/preview/glow/glow.nix b/modules/plugins/utility/preview/glow/glow.nix
similarity index 100%
rename from modules/utility/preview/glow/glow.nix
rename to modules/plugins/utility/preview/glow/glow.nix
diff --git a/modules/utility/preview/markdown-preview/config.nix b/modules/plugins/utility/preview/markdown-preview/config.nix
similarity index 100%
rename from modules/utility/preview/markdown-preview/config.nix
rename to modules/plugins/utility/preview/markdown-preview/config.nix
diff --git a/modules/utility/preview/markdown-preview/default.nix b/modules/plugins/utility/preview/markdown-preview/default.nix
similarity index 100%
rename from modules/utility/preview/markdown-preview/default.nix
rename to modules/plugins/utility/preview/markdown-preview/default.nix
diff --git a/modules/utility/preview/markdown-preview/markdown-preview.nix b/modules/plugins/utility/preview/markdown-preview/markdown-preview.nix
similarity index 100%
rename from modules/utility/preview/markdown-preview/markdown-preview.nix
rename to modules/plugins/utility/preview/markdown-preview/markdown-preview.nix
diff --git a/modules/utility/surround/config.nix b/modules/plugins/utility/surround/config.nix
similarity index 100%
rename from modules/utility/surround/config.nix
rename to modules/plugins/utility/surround/config.nix
diff --git a/modules/utility/surround/default.nix b/modules/plugins/utility/surround/default.nix
similarity index 100%
rename from modules/utility/surround/default.nix
rename to modules/plugins/utility/surround/default.nix
diff --git a/modules/utility/surround/surround.nix b/modules/plugins/utility/surround/surround.nix
similarity index 100%
rename from modules/utility/surround/surround.nix
rename to modules/plugins/utility/surround/surround.nix
diff --git a/modules/utility/telescope/config.nix b/modules/plugins/utility/telescope/config.nix
similarity index 100%
rename from modules/utility/telescope/config.nix
rename to modules/plugins/utility/telescope/config.nix
diff --git a/modules/utility/telescope/default.nix b/modules/plugins/utility/telescope/default.nix
similarity index 100%
rename from modules/utility/telescope/default.nix
rename to modules/plugins/utility/telescope/default.nix
diff --git a/modules/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix
similarity index 100%
rename from modules/utility/telescope/telescope.nix
rename to modules/plugins/utility/telescope/telescope.nix
diff --git a/modules/utility/wakatime/config.nix b/modules/plugins/utility/wakatime/config.nix
similarity index 100%
rename from modules/utility/wakatime/config.nix
rename to modules/plugins/utility/wakatime/config.nix
diff --git a/modules/utility/wakatime/default.nix b/modules/plugins/utility/wakatime/default.nix
similarity index 100%
rename from modules/utility/wakatime/default.nix
rename to modules/plugins/utility/wakatime/default.nix
diff --git a/modules/utility/wakatime/vim-wakatime.nix b/modules/plugins/utility/wakatime/vim-wakatime.nix
similarity index 100%
rename from modules/utility/wakatime/vim-wakatime.nix
rename to modules/plugins/utility/wakatime/vim-wakatime.nix
diff --git a/modules/visuals/config.nix b/modules/plugins/visuals/config.nix
similarity index 100%
rename from modules/visuals/config.nix
rename to modules/plugins/visuals/config.nix
diff --git a/modules/visuals/default.nix b/modules/plugins/visuals/default.nix
similarity index 100%
rename from modules/visuals/default.nix
rename to modules/plugins/visuals/default.nix
diff --git a/modules/visuals/visuals.nix b/modules/plugins/visuals/visuals.nix
similarity index 100%
rename from modules/visuals/visuals.nix
rename to modules/plugins/visuals/visuals.nix