diff --git a/t/Config/hydra-notify.t b/t/Hydra/Config/hydra-notify.t
similarity index 100%
rename from t/Config/hydra-notify.t
rename to t/Hydra/Config/hydra-notify.t
diff --git a/t/Config/include.t b/t/Hydra/Config/include.t
similarity index 100%
rename from t/Config/include.t
rename to t/Hydra/Config/include.t
diff --git a/t/Config/statsd.t b/t/Hydra/Config/statsd.t
similarity index 100%
rename from t/Config/statsd.t
rename to t/Hydra/Config/statsd.t
diff --git a/t/Controller/Admin/clear-queue-non-current.t b/t/Hydra/Controller/Admin/clear-queue-non-current.t
similarity index 100%
rename from t/Controller/Admin/clear-queue-non-current.t
rename to t/Hydra/Controller/Admin/clear-queue-non-current.t
diff --git a/t/Controller/Build/cancel.t b/t/Hydra/Controller/Build/cancel.t
similarity index 100%
rename from t/Controller/Build/cancel.t
rename to t/Hydra/Controller/Build/cancel.t
diff --git a/t/Controller/Build/constituents.t b/t/Hydra/Controller/Build/constituents.t
similarity index 100%
rename from t/Controller/Build/constituents.t
rename to t/Hydra/Controller/Build/constituents.t
diff --git a/t/Controller/Build/evals.t b/t/Hydra/Controller/Build/evals.t
similarity index 100%
rename from t/Controller/Build/evals.t
rename to t/Hydra/Controller/Build/evals.t
diff --git a/t/Controller/Build/restart.t b/t/Hydra/Controller/Build/restart.t
similarity index 100%
rename from t/Controller/Build/restart.t
rename to t/Hydra/Controller/Build/restart.t
diff --git a/t/Controller/Jobset/channel.t b/t/Hydra/Controller/Jobset/channel.t
similarity index 100%
rename from t/Controller/Jobset/channel.t
rename to t/Hydra/Controller/Jobset/channel.t
diff --git a/t/Controller/Jobset/evals.t b/t/Hydra/Controller/Jobset/evals.t
similarity index 100%
rename from t/Controller/Jobset/evals.t
rename to t/Hydra/Controller/Jobset/evals.t
diff --git a/t/Controller/Jobset/http.t b/t/Hydra/Controller/Jobset/http.t
similarity index 100%
rename from t/Controller/Jobset/http.t
rename to t/Hydra/Controller/Jobset/http.t
diff --git a/t/Controller/Jobset/type-constraints.t b/t/Hydra/Controller/Jobset/type-constraints.t
similarity index 100%
rename from t/Controller/Jobset/type-constraints.t
rename to t/Hydra/Controller/Jobset/type-constraints.t
diff --git a/t/Controller/JobsetEval/cancel.t b/t/Hydra/Controller/JobsetEval/cancel.t
similarity index 100%
rename from t/Controller/JobsetEval/cancel.t
rename to t/Hydra/Controller/JobsetEval/cancel.t
diff --git a/t/Controller/JobsetEval/restart.t b/t/Hydra/Controller/JobsetEval/restart.t
similarity index 100%
rename from t/Controller/JobsetEval/restart.t
rename to t/Hydra/Controller/JobsetEval/restart.t
diff --git a/t/Controller/Root/evals.t b/t/Hydra/Controller/Root/evals.t
similarity index 100%
rename from t/Controller/Root/evals.t
rename to t/Hydra/Controller/Root/evals.t
diff --git a/t/Controller/Root/narinfo.t b/t/Hydra/Controller/Root/narinfo.t
similarity index 100%
rename from t/Controller/Root/narinfo.t
rename to t/Hydra/Controller/Root/narinfo.t
diff --git a/t/Controller/Root/queue-runner-status.t b/t/Hydra/Controller/Root/queue-runner-status.t
similarity index 100%
rename from t/Controller/Root/queue-runner-status.t
rename to t/Hydra/Controller/Root/queue-runner-status.t
diff --git a/t/Controller/metrics.t b/t/Hydra/Controller/metrics.t
similarity index 100%
rename from t/Controller/metrics.t
rename to t/Hydra/Controller/metrics.t
diff --git a/t/Controller/projects.t b/t/Hydra/Controller/projects.t
similarity index 100%
rename from t/Controller/projects.t
rename to t/Hydra/Controller/projects.t
diff --git a/t/Event.t b/t/Hydra/Event.t
similarity index 100%
rename from t/Event.t
rename to t/Hydra/Event.t
diff --git a/t/Event/BuildFinished.t b/t/Hydra/Event/BuildFinished.t
similarity index 100%
rename from t/Event/BuildFinished.t
rename to t/Hydra/Event/BuildFinished.t
diff --git a/t/Event/BuildQueued.t b/t/Hydra/Event/BuildQueued.t
similarity index 100%
rename from t/Event/BuildQueued.t
rename to t/Hydra/Event/BuildQueued.t
diff --git a/t/Event/BuildStarted.t b/t/Hydra/Event/BuildStarted.t
similarity index 100%
rename from t/Event/BuildStarted.t
rename to t/Hydra/Event/BuildStarted.t
diff --git a/t/Event/StepFinished.t b/t/Hydra/Event/StepFinished.t
similarity index 100%
rename from t/Event/StepFinished.t
rename to t/Hydra/Event/StepFinished.t
diff --git a/t/Helper/CatalystUtils.t b/t/Hydra/Helper/CatalystUtils.t
similarity index 100%
rename from t/Helper/CatalystUtils.t
rename to t/Hydra/Helper/CatalystUtils.t
diff --git a/t/Helper/Nix.t b/t/Hydra/Helper/Nix.t
similarity index 100%
rename from t/Helper/Nix.t
rename to t/Hydra/Helper/Nix.t
diff --git a/t/Helper/attributeset.t b/t/Hydra/Helper/attributeset.t
similarity index 100%
rename from t/Helper/attributeset.t
rename to t/Hydra/Helper/attributeset.t
diff --git a/t/Helper/escape.t b/t/Hydra/Helper/escape.t
similarity index 100%
rename from t/Helper/escape.t
rename to t/Hydra/Helper/escape.t
diff --git a/t/Math.t b/t/Hydra/Math.t
similarity index 100%
rename from t/Math.t
rename to t/Hydra/Math.t
diff --git a/t/plugins/RunCommand/basic.t b/t/Hydra/Plugin/RunCommand/basic.t
similarity index 100%
rename from t/plugins/RunCommand/basic.t
rename to t/Hydra/Plugin/RunCommand/basic.t
diff --git a/t/plugins/RunCommand/errno.t b/t/Hydra/Plugin/RunCommand/errno.t
similarity index 100%
rename from t/plugins/RunCommand/errno.t
rename to t/Hydra/Plugin/RunCommand/errno.t
diff --git a/t/plugins/RunCommand/json.t b/t/Hydra/Plugin/RunCommand/json.t
similarity index 100%
rename from t/plugins/RunCommand/json.t
rename to t/Hydra/Plugin/RunCommand/json.t
diff --git a/t/plugins/RunCommand/matcher.t b/t/Hydra/Plugin/RunCommand/matcher.t
similarity index 100%
rename from t/plugins/RunCommand/matcher.t
rename to t/Hydra/Plugin/RunCommand/matcher.t
diff --git a/t/plugins/gitea.t b/t/Hydra/Plugin/gitea.t
similarity index 100%
rename from t/plugins/gitea.t
rename to t/Hydra/Plugin/gitea.t
diff --git a/t/PostgresListener.t b/t/Hydra/PostgresListener.t
similarity index 100%
rename from t/PostgresListener.t
rename to t/Hydra/PostgresListener.t
diff --git a/t/Schema/Result/RunCommandLogs.t b/t/Hydra/Schema/Result/RunCommandLogs.t
similarity index 100%
rename from t/Schema/Result/RunCommandLogs.t
rename to t/Hydra/Schema/Result/RunCommandLogs.t
diff --git a/t/Schema/Result/TaskRetries.t b/t/Hydra/Schema/Result/TaskRetries.t
similarity index 100%
rename from t/Schema/Result/TaskRetries.t
rename to t/Hydra/Schema/Result/TaskRetries.t
diff --git a/t/Schema/ResultSet/TaskRetries.t b/t/Hydra/Schema/ResultSet/TaskRetries.t
similarity index 100%
rename from t/Schema/ResultSet/TaskRetries.t
rename to t/Hydra/Schema/ResultSet/TaskRetries.t
diff --git a/t/Schema/Users.t b/t/Hydra/Schema/Users.t
similarity index 100%
rename from t/Schema/Users.t
rename to t/Hydra/Schema/Users.t
diff --git a/t/TaskDispatcher.t b/t/Hydra/TaskDispatcher.t
similarity index 100%
rename from t/TaskDispatcher.t
rename to t/Hydra/TaskDispatcher.t
diff --git a/t/View/TT.t b/t/Hydra/View/TT.t
similarity index 100%
rename from t/View/TT.t
rename to t/Hydra/View/TT.t