diff --git a/recipes/tests_authentik/__init__.py b/recipes/authentik/tests_authentik/__init__.py
similarity index 100%
rename from recipes/tests_authentik/__init__.py
rename to recipes/authentik/tests_authentik/__init__.py
diff --git a/recipes/tests_authentik/fixtures_authentik.py b/recipes/authentik/tests_authentik/fixtures_authentik.py
similarity index 100%
rename from recipes/tests_authentik/fixtures_authentik.py
rename to recipes/authentik/tests_authentik/fixtures_authentik.py
diff --git a/recipes/tests_authentik/runner_authentik.py b/recipes/authentik/tests_authentik/runner_authentik.py
similarity index 100%
rename from recipes/tests_authentik/runner_authentik.py
rename to recipes/authentik/tests_authentik/runner_authentik.py
diff --git a/recipes/tests_authentik/setup_authentik.py b/recipes/authentik/tests_authentik/setup_authentik.py
similarity index 100%
rename from recipes/tests_authentik/setup_authentik.py
rename to recipes/authentik/tests_authentik/setup_authentik.py
diff --git a/recipes/tests_authentik/test_authentik_dummy.py b/recipes/authentik/tests_authentik/test_authentik_dummy.py
similarity index 100%
rename from recipes/tests_authentik/test_authentik_dummy.py
rename to recipes/authentik/tests_authentik/test_authentik_dummy.py
diff --git a/recipes/tests_demo/__init__.py b/recipes/demo/tests_demo/__init__.py
similarity index 100%
rename from recipes/tests_demo/__init__.py
rename to recipes/demo/tests_demo/__init__.py
diff --git a/recipes/tests_demo/fixtures_demo.py b/recipes/demo/tests_demo/fixtures_demo.py
similarity index 100%
rename from recipes/tests_demo/fixtures_demo.py
rename to recipes/demo/tests_demo/fixtures_demo.py
diff --git a/recipes/tests_demo/runner_demo.py b/recipes/demo/tests_demo/runner_demo.py
similarity index 100%
rename from recipes/tests_demo/runner_demo.py
rename to recipes/demo/tests_demo/runner_demo.py
diff --git a/recipes/tests_demo/setup_demo.py b/recipes/demo/tests_demo/setup_demo.py
similarity index 100%
rename from recipes/tests_demo/setup_demo.py
rename to recipes/demo/tests_demo/setup_demo.py
diff --git a/recipes/tests_nextcloud/__init__.py b/recipes/nextcloud/tests_nextcloud/__init__.py
similarity index 100%
rename from recipes/tests_nextcloud/__init__.py
rename to recipes/nextcloud/tests_nextcloud/__init__.py
diff --git a/recipes/tests_nextcloud/cleanup_nextcloud.py b/recipes/nextcloud/tests_nextcloud/cleanup_nextcloud.py
similarity index 100%
rename from recipes/tests_nextcloud/cleanup_nextcloud.py
rename to recipes/nextcloud/tests_nextcloud/cleanup_nextcloud.py
diff --git a/recipes/tests_nextcloud/conftest.py b/recipes/nextcloud/tests_nextcloud/conftest.py
similarity index 100%
rename from recipes/tests_nextcloud/conftest.py
rename to recipes/nextcloud/tests_nextcloud/conftest.py
diff --git a/recipes/tests_nextcloud/runner_nextcloud.py b/recipes/nextcloud/tests_nextcloud/runner_nextcloud.py
similarity index 100%
rename from recipes/tests_nextcloud/runner_nextcloud.py
rename to recipes/nextcloud/tests_nextcloud/runner_nextcloud.py
diff --git a/recipes/tests_nextcloud/setup_nextcloud.py b/recipes/nextcloud/tests_nextcloud/setup_nextcloud.py
similarity index 100%
rename from recipes/tests_nextcloud/setup_nextcloud.py
rename to recipes/nextcloud/tests_nextcloud/setup_nextcloud.py
diff --git a/recipes/tests_nextcloud/tests_nextcloud.py b/recipes/nextcloud/tests_nextcloud/tests_nextcloud.py
similarity index 100%
rename from recipes/tests_nextcloud/tests_nextcloud.py
rename to recipes/nextcloud/tests_nextcloud/tests_nextcloud.py
diff --git a/recipes/tests_nextcloud/tests_nextcloud_onlyoffice.py b/recipes/nextcloud/tests_nextcloud/tests_nextcloud_onlyoffice.py
similarity index 100%
rename from recipes/tests_nextcloud/tests_nextcloud_onlyoffice.py
rename to recipes/nextcloud/tests_nextcloud/tests_nextcloud_onlyoffice.py
diff --git a/recipes/tests_wordpress/__init__.py b/recipes/wordpress/tests_wordpress/__init__.py
similarity index 100%
rename from recipes/tests_wordpress/__init__.py
rename to recipes/wordpress/tests_wordpress/__init__.py
diff --git a/recipes/tests_wordpress/conftest.py b/recipes/wordpress/tests_wordpress/conftest.py
similarity index 100%
rename from recipes/tests_wordpress/conftest.py
rename to recipes/wordpress/tests_wordpress/conftest.py
diff --git a/recipes/tests_wordpress/runner_wordpress.py b/recipes/wordpress/tests_wordpress/runner_wordpress.py
similarity index 100%
rename from recipes/tests_wordpress/runner_wordpress.py
rename to recipes/wordpress/tests_wordpress/runner_wordpress.py
diff --git a/recipes/tests_wordpress/setup_wordpress.py b/recipes/wordpress/tests_wordpress/setup_wordpress.py
similarity index 100%
rename from recipes/tests_wordpress/setup_wordpress.py
rename to recipes/wordpress/tests_wordpress/setup_wordpress.py
diff --git a/recipes/tests_wordpress/test_wordpress.py b/recipes/wordpress/tests_wordpress/test_wordpress.py
similarity index 100%
rename from recipes/tests_wordpress/test_wordpress.py
rename to recipes/wordpress/tests_wordpress/test_wordpress.py
diff --git a/recipes/tests_wordpress/test_wordpress_localization.py b/recipes/wordpress/tests_wordpress/test_wordpress_localization.py
similarity index 100%
rename from recipes/tests_wordpress/test_wordpress_localization.py
rename to recipes/wordpress/tests_wordpress/test_wordpress_localization.py