diff --git a/moonraker/plugins/__init__.py b/moonraker/components/__init__.py
similarity index 73%
rename from moonraker/plugins/__init__.py
rename to moonraker/components/__init__.py
index 643b86f..1f4533a 100644
--- a/moonraker/plugins/__init__.py
+++ b/moonraker/components/__init__.py
@@ -1,5 +1,5 @@
 
-# Package definition for the plugins directory
+# Package definition for the components directory
 #
 # Copyright (C) 2020 Eric Callahan <arksine.code@gmail.com>
 #
diff --git a/moonraker/plugins/data_store.py b/moonraker/components/data_store.py
similarity index 100%
rename from moonraker/plugins/data_store.py
rename to moonraker/components/data_store.py
diff --git a/moonraker/plugins/database.py b/moonraker/components/database.py
similarity index 100%
rename from moonraker/plugins/database.py
rename to moonraker/components/database.py
diff --git a/moonraker/plugins/file_manager.py b/moonraker/components/file_manager.py
similarity index 100%
rename from moonraker/plugins/file_manager.py
rename to moonraker/components/file_manager.py
diff --git a/moonraker/plugins/history.py b/moonraker/components/history.py
similarity index 100%
rename from moonraker/plugins/history.py
rename to moonraker/components/history.py
diff --git a/moonraker/plugins/klippy_apis.py b/moonraker/components/klippy_apis.py
similarity index 100%
rename from moonraker/plugins/klippy_apis.py
rename to moonraker/components/klippy_apis.py
diff --git a/moonraker/plugins/machine.py b/moonraker/components/machine.py
similarity index 100%
rename from moonraker/plugins/machine.py
rename to moonraker/components/machine.py
diff --git a/moonraker/plugins/octoprint_compat.py b/moonraker/components/octoprint_compat.py
similarity index 100%
rename from moonraker/plugins/octoprint_compat.py
rename to moonraker/components/octoprint_compat.py
diff --git a/moonraker/plugins/paneldue.py b/moonraker/components/paneldue.py
similarity index 100%
rename from moonraker/plugins/paneldue.py
rename to moonraker/components/paneldue.py
diff --git a/moonraker/plugins/power.py b/moonraker/components/power.py
similarity index 100%
rename from moonraker/plugins/power.py
rename to moonraker/components/power.py
diff --git a/moonraker/plugins/proc_stats.py b/moonraker/components/proc_stats.py
similarity index 100%
rename from moonraker/plugins/proc_stats.py
rename to moonraker/components/proc_stats.py
diff --git a/moonraker/plugins/shell_command.py b/moonraker/components/shell_command.py
similarity index 100%
rename from moonraker/plugins/shell_command.py
rename to moonraker/components/shell_command.py
diff --git a/moonraker/plugins/update_manager.py b/moonraker/components/update_manager.py
similarity index 100%
rename from moonraker/plugins/update_manager.py
rename to moonraker/components/update_manager.py