diff --git a/examples/foundational/20e-persistent-context-aws-nova-sonic.py b/examples/foundational/20e-persistent-context-aws-nova-sonic.py
index bd3d9d545..2161aff8f 100644
--- a/examples/foundational/20e-persistent-context-aws-nova-sonic.py
+++ b/examples/foundational/20e-persistent-context-aws-nova-sonic.py
@@ -23,7 +23,7 @@ from pipecat.pipeline.task import PipelineParams, PipelineTask
 from pipecat.processors.aggregators.openai_llm_context import OpenAILLMContext
 from pipecat.runner.types import RunnerArguments
 from pipecat.runner.utils import create_transport
-from pipecat.services.aws_nova_sonic.aws import AWSNovaSonicLLMService
+from pipecat.services.aws.nova_sonic.llm import AWSNovaSonicLLMService
 from pipecat.services.llm_service import FunctionCallParams
 from pipecat.transports.base_transport import BaseTransport, TransportParams
 from pipecat.transports.daily.transport import DailyParams
diff --git a/examples/foundational/40-aws-nova-sonic.py b/examples/foundational/40-aws-nova-sonic.py
index de7bbf638..d9bd2257d 100644
--- a/examples/foundational/40-aws-nova-sonic.py
+++ b/examples/foundational/40-aws-nova-sonic.py
@@ -21,7 +21,7 @@ from pipecat.pipeline.task import PipelineParams, PipelineTask
 from pipecat.processors.aggregators.openai_llm_context import OpenAILLMContext
 from pipecat.runner.types import RunnerArguments
 from pipecat.runner.utils import create_transport
-from pipecat.services.aws_nova_sonic import AWSNovaSonicLLMService
+from pipecat.services.aws.nova_sonic.llm import AWSNovaSonicLLMService
 from pipecat.services.llm_service import FunctionCallParams
 from pipecat.transports.base_transport import BaseTransport, TransportParams
 from pipecat.transports.daily.transport import DailyParams
diff --git a/src/pipecat/services/aws/__init__.py b/src/pipecat/services/aws/__init__.py
index b1f157bd3..3cdd4cc5a 100644
--- a/src/pipecat/services/aws/__init__.py
+++ b/src/pipecat/services/aws/__init__.py
@@ -9,6 +9,7 @@ import sys
 from pipecat.services import DeprecatedModuleProxy
 
 from .llm import *
+from .nova_sonic import *
 from .stt import *
 from .tts import *
 
diff --git a/src/pipecat/services/aws/nova_sonic/__init__.py b/src/pipecat/services/aws/nova_sonic/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/pipecat/services/aws_nova_sonic/context.py b/src/pipecat/services/aws/nova_sonic/context.py
similarity index 99%
rename from src/pipecat/services/aws_nova_sonic/context.py
rename to src/pipecat/services/aws/nova_sonic/context.py
index 0ce5ce033..86aa0f0b5 100644
--- a/src/pipecat/services/aws_nova_sonic/context.py
+++ b/src/pipecat/services/aws/nova_sonic/context.py
@@ -33,7 +33,7 @@ from pipecat.frames.frames import (
 )
 from pipecat.processors.aggregators.openai_llm_context import OpenAILLMContext
 from pipecat.processors.frame_processor import FrameDirection
-from pipecat.services.aws_nova_sonic.frames import AWSNovaSonicFunctionCallResultFrame
+from pipecat.services.aws.nova_sonic.frames import AWSNovaSonicFunctionCallResultFrame
 from pipecat.services.openai.llm import (
     OpenAIAssistantContextAggregator,
     OpenAIUserContextAggregator,
diff --git a/src/pipecat/services/aws_nova_sonic/frames.py b/src/pipecat/services/aws/nova_sonic/frames.py
similarity index 100%
rename from src/pipecat/services/aws_nova_sonic/frames.py
rename to src/pipecat/services/aws/nova_sonic/frames.py
diff --git a/src/pipecat/services/aws_nova_sonic/aws.py b/src/pipecat/services/aws/nova_sonic/llm.py
similarity index 99%
rename from src/pipecat/services/aws_nova_sonic/aws.py
rename to src/pipecat/services/aws/nova_sonic/llm.py
index 66b020055..2801de688 100644
--- a/src/pipecat/services/aws_nova_sonic/aws.py
+++ b/src/pipecat/services/aws/nova_sonic/llm.py
@@ -54,14 +54,14 @@ from pipecat.processors.aggregators.openai_llm_context import (
     OpenAILLMContextFrame,
 )
 from pipecat.processors.frame_processor import FrameDirection
-from pipecat.services.aws_nova_sonic.context import (
+from pipecat.services.aws.nova_sonic.context import (
     AWSNovaSonicAssistantContextAggregator,
     AWSNovaSonicContextAggregatorPair,
     AWSNovaSonicLLMContext,
     AWSNovaSonicUserContextAggregator,
     Role,
 )
-from pipecat.services.aws_nova_sonic.frames import AWSNovaSonicFunctionCallResultFrame
+from pipecat.services.aws.nova_sonic.frames import AWSNovaSonicFunctionCallResultFrame
 from pipecat.services.llm_service import LLMService
 from pipecat.utils.time import time_now_iso8601
 
@@ -251,7 +251,7 @@ class AWSNovaSonicLLMService(LLMService):
         self._connected_time: Optional[float] = None
         self._wants_connection = False
 
-        file_path = files("pipecat.services.aws_nova_sonic").joinpath("ready.wav")
+        file_path = files("pipecat.services.aws.nova_sonic").joinpath("ready.wav")
         with wave.open(file_path.open("rb"), "rb") as wav_file:
             self._assistant_response_trigger_audio = wav_file.readframes(wav_file.getnframes())
 
diff --git a/src/pipecat/services/aws_nova_sonic/ready.wav b/src/pipecat/services/aws/nova_sonic/ready.wav
similarity index 100%
rename from src/pipecat/services/aws_nova_sonic/ready.wav
rename to src/pipecat/services/aws/nova_sonic/ready.wav
diff --git a/src/pipecat/services/aws_nova_sonic/__init__.py b/src/pipecat/services/aws_nova_sonic/__init__.py
deleted file mode 100644
index 4da394cf6..000000000
--- a/src/pipecat/services/aws_nova_sonic/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .aws import AWSNovaSonicLLMService, Params