diff --git a/docs/source/platypush/plugins/google.youtube.rst b/docs/source/platypush/plugins/google.youtube.rst
deleted file mode 100644
index 84e26ade2..000000000
--- a/docs/source/platypush/plugins/google.youtube.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``google.youtube``
-====================================
-
-.. automodule:: platypush.plugins.google.youtube
-	:members:
-
diff --git a/docs/source/platypush/plugins/youtube.rst b/docs/source/platypush/plugins/youtube.rst
new file mode 100644
index 000000000..b63f95193
--- /dev/null
+++ b/docs/source/platypush/plugins/youtube.rst
@@ -0,0 +1,5 @@
+``youtube``
+===========
+
+.. automodule:: platypush.plugins.youtube
+    :members:
diff --git a/docs/source/plugins.rst b/docs/source/plugins.rst
index a602352fc..57fb4ca25 100644
--- a/docs/source/plugins.rst
+++ b/docs/source/plugins.rst
@@ -41,7 +41,6 @@ Plugins
     platypush/plugins/google.maps.rst
     platypush/plugins/google.pubsub.rst
     platypush/plugins/google.translate.rst
-    platypush/plugins/google.youtube.rst
     platypush/plugins/gotify.rst
     platypush/plugins/gpio.rst
     platypush/plugins/gpio.zeroborg.rst
@@ -142,6 +141,7 @@ Plugins
     platypush/plugins/websocket.rst
     platypush/plugins/wiimote.rst
     platypush/plugins/xmpp.rst
+    platypush/plugins/youtube.rst
     platypush/plugins/zeroconf.rst
     platypush/plugins/zigbee.mqtt.rst
     platypush/plugins/zwave.mqtt.rst
diff --git a/platypush/plugins/google/youtube/__init__.py b/platypush/plugins/youtube/__init__.py
similarity index 98%
rename from platypush/plugins/google/youtube/__init__.py
rename to platypush/plugins/youtube/__init__.py
index bafcccb6e..8719a57e8 100644
--- a/platypush/plugins/google/youtube/__init__.py
+++ b/platypush/plugins/youtube/__init__.py
@@ -3,7 +3,7 @@ from platypush.plugins import action
 from platypush.plugins.google import GooglePlugin
 
 
-class GoogleYoutubePlugin(GooglePlugin):
+class YoutubePlugin(GooglePlugin):
     r"""
     YouTube plugin.
 
diff --git a/platypush/plugins/google/youtube/manifest.yaml b/platypush/plugins/youtube/manifest.yaml
similarity index 93%
rename from platypush/plugins/google/youtube/manifest.yaml
rename to platypush/plugins/youtube/manifest.yaml
index 88d578463..f994eed6d 100644
--- a/platypush/plugins/google/youtube/manifest.yaml
+++ b/platypush/plugins/youtube/manifest.yaml
@@ -25,5 +25,5 @@ manifest:
       - google-auth
       - oauth2client
       - httplib2
-  package: platypush.plugins.google.youtube
+  package: platypush.plugins.youtube
   type: plugin