diff --git a/docs/source/bluepyefe.formats.igorpy.rst b/docs/source/bluepyefe.formats.igorpy.rst
deleted file mode 100644
index 9383fd3..0000000
--- a/docs/source/bluepyefe.formats.igorpy.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-bluepyefe.formats.igorpy package
-================================
-
-Module contents
----------------
-
-.. automodule:: bluepyefe.formats.igorpy
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/bluepyefe.formats.rst b/docs/source/bluepyefe.formats.rst
deleted file mode 100644
index 9b92c55..0000000
--- a/docs/source/bluepyefe.formats.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-bluepyefe.formats package
-=========================
-
-Subpackages
------------
-
-.. toctree::
-
-   bluepyefe.formats.igorpy
-
-Submodules
-----------
-
-bluepyefe.formats.axon module
------------------------------
-
-.. automodule:: bluepyefe.formats.axon
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-bluepyefe.formats.csv\_lccr module
-----------------------------------
-
-.. automodule:: bluepyefe.formats.csv_lccr
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-bluepyefe.formats.ibf\_json module
-----------------------------------
-
-.. automodule:: bluepyefe.formats.ibf_json
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-bluepyefe.formats.igor module
------------------------------
-
-.. automodule:: bluepyefe.formats.igor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: bluepyefe.formats
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/bluepyefe.rst b/docs/source/bluepyefe.rst
deleted file mode 100644
index f9e62cb..0000000
--- a/docs/source/bluepyefe.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-bluepyefe package
-=================
-
-Subpackages
------------
-
-.. toctree::
-
-   bluepyefe.formats
-   bluepyefe.tools
-
-Submodules
-----------
-
-bluepyefe.extra module
-----------------------
-
-.. automodule:: bluepyefe.extra
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-bluepyefe.extractor module
---------------------------
-
-.. automodule:: bluepyefe.extractor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-bluepyefe.plottools module
---------------------------
-
-.. automodule:: bluepyefe.plottools
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: bluepyefe
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/bluepyefe.tools.rst b/docs/source/bluepyefe.tools.rst
deleted file mode 100644
index 940e371..0000000
--- a/docs/source/bluepyefe.tools.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-bluepyefe.tools package
-=======================
-
-Submodules
-----------
-
-bluepyefe.tools.tools module
-----------------------------
-
-.. automodule:: bluepyefe.tools.tools
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: bluepyefe.tools
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/cell.rst b/docs/source/cell.rst
new file mode 100644
index 0000000..c29cb0a
--- /dev/null
+++ b/docs/source/cell.rst
@@ -0,0 +1,8 @@
+Cell API
+==================
+
+.. autosummary::
+    :toctree: cell
+    :template: module.rst
+
+    bluepyefe.cell
\ No newline at end of file
diff --git a/docs/source/ecodes.rst b/docs/source/ecodes.rst
new file mode 100644
index 0000000..2e4373b
--- /dev/null
+++ b/docs/source/ecodes.rst
@@ -0,0 +1,18 @@
+E-Codes API
+==================
+
+.. autosummary::
+    :toctree: ecode
+    :template: module.rst
+
+    bluepyefe.ecode
+    bluepyefe.ecode.DeHyperPol
+    bluepyefe.ecode.HyperDePol
+    bluepyefe.ecode.negCheops
+    bluepyefe.ecode.posCheops
+    bluepyefe.ecode.ramp
+    bluepyefe.ecode.sAHP
+    bluepyefe.ecode.sineSpec
+    bluepyefe.ecode.SpikeRec
+    bluepyefe.ecode.step
+    bluepyefe.ecode.tools
\ No newline at end of file
diff --git a/docs/source/extract.rst b/docs/source/extract.rst
new file mode 100644
index 0000000..c6876a1
--- /dev/null
+++ b/docs/source/extract.rst
@@ -0,0 +1,8 @@
+Extraction API
+==================
+
+.. autosummary::
+    :toctree: extract
+    :template: module.rst
+
+    bluepyefe.extract
\ No newline at end of file
diff --git a/docs/source/protocol.rst b/docs/source/protocol.rst
new file mode 100644
index 0000000..867bc66
--- /dev/null
+++ b/docs/source/protocol.rst
@@ -0,0 +1,8 @@
+Protocols API
+==================
+
+.. autosummary::
+    :toctree: protocol
+    :template: module.rst
+
+    bluepyefe.protocol
\ No newline at end of file
diff --git a/docs/source/recording.rst b/docs/source/recording.rst
new file mode 100644
index 0000000..1f7e284
--- /dev/null
+++ b/docs/source/recording.rst
@@ -0,0 +1,8 @@
+Recording API
+==================
+
+.. autosummary::
+    :toctree: recording
+    :template: module.rst
+
+    bluepyefe.recording
\ No newline at end of file