diff --git a/llama_stack/providers/inline/meta_reference/safety/__init__.py b/llama_stack/providers/inline/safety/meta_reference/__init__.py
similarity index 100%
rename from llama_stack/providers/inline/meta_reference/safety/__init__.py
rename to llama_stack/providers/inline/safety/meta_reference/__init__.py
diff --git a/llama_stack/providers/inline/meta_reference/safety/base.py b/llama_stack/providers/inline/safety/meta_reference/base.py
similarity index 100%
rename from llama_stack/providers/inline/meta_reference/safety/base.py
rename to llama_stack/providers/inline/safety/meta_reference/base.py
diff --git a/llama_stack/providers/inline/meta_reference/safety/config.py b/llama_stack/providers/inline/safety/meta_reference/config.py
similarity index 100%
rename from llama_stack/providers/inline/meta_reference/safety/config.py
rename to llama_stack/providers/inline/safety/meta_reference/config.py
diff --git a/llama_stack/providers/inline/meta_reference/safety/llama_guard.py b/llama_stack/providers/inline/safety/meta_reference/llama_guard.py
similarity index 100%
rename from llama_stack/providers/inline/meta_reference/safety/llama_guard.py
rename to llama_stack/providers/inline/safety/meta_reference/llama_guard.py
diff --git a/llama_stack/providers/inline/meta_reference/safety/prompt_guard.py b/llama_stack/providers/inline/safety/meta_reference/prompt_guard.py
similarity index 100%
rename from llama_stack/providers/inline/meta_reference/safety/prompt_guard.py
rename to llama_stack/providers/inline/safety/meta_reference/prompt_guard.py
diff --git a/llama_stack/providers/inline/meta_reference/safety/safety.py b/llama_stack/providers/inline/safety/meta_reference/safety.py
similarity index 100%
rename from llama_stack/providers/inline/meta_reference/safety/safety.py
rename to llama_stack/providers/inline/safety/meta_reference/safety.py
diff --git a/llama_stack/providers/registry/safety.py b/llama_stack/providers/registry/safety.py
index fdaa33192..fb5b6695a 100644
--- a/llama_stack/providers/registry/safety.py
+++ b/llama_stack/providers/registry/safety.py
@@ -24,8 +24,8 @@ def available_providers() -> List[ProviderSpec]:
                 "transformers",
                 "torch --index-url https://download.pytorch.org/whl/cpu",
             ],
-            module="llama_stack.providers.inline.meta_reference.safety",
-            config_class="llama_stack.providers.inline.meta_reference.safety.SafetyConfig",
+            module="llama_stack.providers.inline.safety.meta_reference",
+            config_class="llama_stack.providers.inline.safety.meta_reference.SafetyConfig",
             api_dependencies=[
                 Api.inference,
             ],
@@ -54,8 +54,8 @@ def available_providers() -> List[ProviderSpec]:
             pip_packages=[
                 "codeshield",
             ],
-            module="llama_stack.providers.inline.meta_reference.codeshield",
-            config_class="llama_stack.providers.inline.meta_reference.codeshield.CodeShieldConfig",
+            module="llama_stack.providers.inline.safety.meta_reference",
+            config_class="llama_stack.providers.inline.safety.meta_reference.CodeShieldConfig",
             api_dependencies=[],
         ),
     ]
diff --git a/llama_stack/providers/tests/safety/fixtures.py b/llama_stack/providers/tests/safety/fixtures.py
index de1829355..58859c991 100644
--- a/llama_stack/providers/tests/safety/fixtures.py
+++ b/llama_stack/providers/tests/safety/fixtures.py
@@ -8,7 +8,7 @@ import pytest
 import pytest_asyncio
 
 from llama_stack.distribution.datatypes import Api, Provider
-from llama_stack.providers.inline.meta_reference.safety import (
+from llama_stack.providers.inline.safety.meta_reference import (
     LlamaGuardShieldConfig,
     SafetyConfig,
 )