diff --git a/platypush/plugins/picovoice/__init__.py b/platypush/plugins/assistant/picovoice/__init__.py
similarity index 99%
rename from platypush/plugins/picovoice/__init__.py
rename to platypush/plugins/assistant/picovoice/__init__.py
index 811fe2deb0..c669f19f99 100644
--- a/platypush/plugins/picovoice/__init__.py
+++ b/platypush/plugins/assistant/picovoice/__init__.py
@@ -8,7 +8,7 @@ from ._state import AssistantState
 
 
 # pylint: disable=too-many-ancestors
-class PicovoicePlugin(AssistantPlugin, RunnablePlugin):
+class AssistantPicovoicePlugin(AssistantPlugin, RunnablePlugin):
     """
     A voice assistant that runs on your device, based on the `Picovoice
     <https://picovoice.ai/>`_ engine.
diff --git a/platypush/plugins/picovoice/_assistant.py b/platypush/plugins/assistant/picovoice/_assistant.py
similarity index 100%
rename from platypush/plugins/picovoice/_assistant.py
rename to platypush/plugins/assistant/picovoice/_assistant.py
diff --git a/platypush/plugins/picovoice/_context.py b/platypush/plugins/assistant/picovoice/_context.py
similarity index 100%
rename from platypush/plugins/picovoice/_context.py
rename to platypush/plugins/assistant/picovoice/_context.py
diff --git a/platypush/plugins/picovoice/_recorder.py b/platypush/plugins/assistant/picovoice/_recorder.py
similarity index 100%
rename from platypush/plugins/picovoice/_recorder.py
rename to platypush/plugins/assistant/picovoice/_recorder.py
diff --git a/platypush/plugins/picovoice/_state.py b/platypush/plugins/assistant/picovoice/_state.py
similarity index 100%
rename from platypush/plugins/picovoice/_state.py
rename to platypush/plugins/assistant/picovoice/_state.py
diff --git a/platypush/plugins/picovoice/manifest.yaml b/platypush/plugins/assistant/picovoice/manifest.yaml
similarity index 91%
rename from platypush/plugins/picovoice/manifest.yaml
rename to platypush/plugins/assistant/picovoice/manifest.yaml
index 9e9afc06df..a44bbccdfb 100644
--- a/platypush/plugins/picovoice/manifest.yaml
+++ b/platypush/plugins/assistant/picovoice/manifest.yaml
@@ -1,5 +1,5 @@
 manifest:
-  package: platypush.plugins.picovoice
+  package: platypush.plugins.assistant.picovoice
   type: plugin
   events:
     - platypush.message.event.assistant.ConversationEndEvent
@@ -17,6 +17,7 @@ manifest:
     pip:
       - pvcheetah
       - pvleopard
+      - pvorca
       - pvporcupine
       - pvrhino
       - sounddevice
diff --git a/platypush/utils/mock/modules.py b/platypush/utils/mock/modules.py
index eb6149f984..e83fd377e1 100644
--- a/platypush/utils/mock/modules.py
+++ b/platypush/utils/mock/modules.py
@@ -84,6 +84,7 @@ mock_imports = [
     "psutil",
     "pvcheetah",
     "pvleopard",
+    "pvorca",
     "pvporcupine",
     "pvrhino",
     "pyHS100",