diff --git a/docs/api/backends/providers.rst b/docs/api/backends.rst
similarity index 100%
rename from docs/api/backends/providers.rst
rename to docs/api/backends.rst
diff --git a/docs/api/backends/controllers.rst b/docs/api/backends/controllers.rst
deleted file mode 100644
index 8d6687e2..00000000
--- a/docs/api/backends/controllers.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-.. _backend-controller-api:
-
-**********************
-Backend controller API
-**********************
-
-
-The backend controller API is the interface that is used by frontends like
-:mod:`mopidy.frontends.mpd`. If you want to implement your own backend, see the
-:ref:`backend-provider-api`.
-
-
-The backend
-===========
-
-.. autoclass:: mopidy.backends.base.Backend
-    :members:
-
-
-Playback controller
-===================
-
-Manages playback, with actions like play, pause, stop, next, previous,
-seek, and volume control.
-
-.. autoclass:: mopidy.backends.base.PlaybackController
-    :members:
-
-
-Current playlist controller
-===========================
-
-Manages everything related to the currently loaded playlist.
-
-.. autoclass:: mopidy.backends.base.CurrentPlaylistController
-    :members:
-
-
-Stored playlists controller
-===========================
-
-Manages stored playlist.
-
-.. autoclass:: mopidy.backends.base.StoredPlaylistsController
-    :members:
-
-
-Library controller
-==================
-
-Manages the music library, e.g. searching for tracks to be added to a playlist.
-
-.. autoclass:: mopidy.backends.base.LibraryController
-    :members:
diff --git a/docs/api/backends/concepts.rst b/docs/api/concepts.rst
similarity index 100%
rename from docs/api/backends/concepts.rst
rename to docs/api/concepts.rst
diff --git a/docs/api/core.rst b/docs/api/core.rst
new file mode 100644
index 00000000..1852733f
--- /dev/null
+++ b/docs/api/core.rst
@@ -0,0 +1,49 @@
+.. _backend-controller-api:
+
+********
+Core API
+********
+
+
+The core API is the interface that is used by frontends like
+:mod:`mopidy.frontends.mpd`. The core layer is inbetween the frontends and the
+backends.
+
+If you want to implement your own backend, see the :ref:`backend-provider-api`.
+
+
+Playback controller
+===================
+
+Manages playback, with actions like play, pause, stop, next, previous,
+seek, and volume control.
+
+.. autoclass:: mopidy.core.PlaybackController
+    :members:
+
+
+Current playlist controller
+===========================
+
+Manages everything related to the currently loaded playlist.
+
+.. autoclass:: mopidy.core.CurrentPlaylistController
+    :members:
+
+
+Stored playlists controller
+===========================
+
+Manages stored playlist.
+
+.. autoclass:: mopidy.core.StoredPlaylistsController
+    :members:
+
+
+Library controller
+==================
+
+Manages the music library, e.g. searching for tracks to be added to a playlist.
+
+.. autoclass:: mopidy.core.LibraryController
+    :members:
diff --git a/docs/api/index.rst b/docs/api/index.rst
index 1f37e9ff..b5be8ed4 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -5,7 +5,9 @@ API reference
 .. toctree::
     :glob:
 
-    backends/concepts
-    backends/controllers
-    backends/providers
-    *
+    concepts
+    models
+    backends
+    core
+    frontends
+    listeners