diff --git a/shepherd/__init__.py b/shepherd/__init__.py
index e69de29..c8b2664 100644
--- a/shepherd/__init__.py
+++ b/shepherd/__init__.py
@@ -0,0 +1 @@
+from .agent.plugins import Plugin  # noqa
diff --git a/shepherd/control.py b/shepherd/agent/control.py
similarity index 100%
rename from shepherd/control.py
rename to shepherd/agent/control.py
diff --git a/shepherd/core.py b/shepherd/agent/core.py
similarity index 100%
rename from shepherd/core.py
rename to shepherd/agent/core.py
diff --git a/shepherd/plugin.py b/shepherd/agent/plugin.py
similarity index 100%
rename from shepherd/plugin.py
rename to shepherd/agent/plugin.py
diff --git a/shepherd/scheduler.py b/shepherd/agent/scheduler.py
similarity index 100%
rename from shepherd/scheduler.py
rename to shepherd/agent/scheduler.py