diff --git a/docs/source/backends.rst b/docs/source/backends.rst
index bc8a3f4c33..6982db847a 100644
--- a/docs/source/backends.rst
+++ b/docs/source/backends.rst
@@ -18,9 +18,6 @@ Backends
     platypush/backend/google.pubsub.rst
     platypush/backend/gps.rst
     platypush/backend/http.rst
-    platypush/backend/joystick.rst
-    platypush/backend/joystick.jstest.rst
-    platypush/backend/joystick.linux.rst
     platypush/backend/kafka.rst
     platypush/backend/log.http.rst
     platypush/backend/mail.rst
diff --git a/docs/source/platypush/backend/joystick.jstest.rst b/docs/source/platypush/backend/joystick.jstest.rst
deleted file mode 100644
index 26df2c0cc3..0000000000
--- a/docs/source/platypush/backend/joystick.jstest.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-``joystick.jstest``
-=====================================
-
-.. automodule:: platypush.backend.joystick.jstest
-    :members:
diff --git a/docs/source/platypush/backend/joystick.linux.rst b/docs/source/platypush/backend/joystick.linux.rst
deleted file mode 100644
index 290802bb31..0000000000
--- a/docs/source/platypush/backend/joystick.linux.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-``joystick.linux``
-====================================
-
-.. automodule:: platypush.backend.joystick.linux
-    :members:
diff --git a/docs/source/platypush/backend/joystick.rst b/docs/source/platypush/backend/joystick.rst
deleted file mode 100644
index 076a8e20b8..0000000000
--- a/docs/source/platypush/backend/joystick.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``joystick``
-==============================
-
-.. automodule:: platypush.backend.joystick
-    :members:
-
diff --git a/docs/source/platypush/plugins/inputs.rst b/docs/source/platypush/plugins/inputs.rst
deleted file mode 100644
index 942cfcdf45..0000000000
--- a/docs/source/platypush/plugins/inputs.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-``inputs``
-============================
-
-.. automodule:: platypush.plugins.inputs
-    :members:
diff --git a/docs/source/platypush/plugins/joystick.rst b/docs/source/platypush/plugins/joystick.rst
new file mode 100644
index 0000000000..44654a43f3
--- /dev/null
+++ b/docs/source/platypush/plugins/joystick.rst
@@ -0,0 +1,5 @@
+``joystick``
+============
+
+.. automodule:: platypush.plugins.joystick
+    :members:
diff --git a/docs/source/plugins.rst b/docs/source/plugins.rst
index 57fb4ca259..8e9a3b785a 100644
--- a/docs/source/plugins.rst
+++ b/docs/source/plugins.rst
@@ -49,8 +49,8 @@ Plugins
     platypush/plugins/http.request.rst
     platypush/plugins/http.webpage.rst
     platypush/plugins/ifttt.rst
-    platypush/plugins/inputs.rst
     platypush/plugins/inspect.rst
+    platypush/plugins/joystick.rst
     platypush/plugins/kafka.rst
     platypush/plugins/lastfm.rst
     platypush/plugins/lcd.gpio.rst