diff --git a/README.developer.md b/README.developer.md
index 54a22b0fc6..690b9d324b 100644
--- a/README.developer.md
+++ b/README.developer.md
@@ -290,8 +290,8 @@ The newly built `bluechictl` can be used via:
 
 Files for documentation of this project are located in the [doc](./doc/) directory comprising:
 
-- [api examples](./doc/api-examples/): directory containing python files that use the D-Bus API of BlueChi, e.g. for starting
-a systemd unit
+- [api examples](./doc/api-examples/): directory containing source files for different programming languages that use
+the D-Bus API of BlueChi, e.g. for starting a systemd unit
 - [man](./doc/man/): directory containing the markdown files for generating the man pages
 (see [Building MAN pages](#building-man-pages) for more information)
 - readthedocs files for building the documentation website of BlueChi (see [the README](./doc/README.md) for further information)
diff --git a/doc/api-examples/enable-unit.py b/doc/api-examples/python/enable-unit.py
similarity index 100%
rename from doc/api-examples/enable-unit.py
rename to doc/api-examples/python/enable-unit.py
diff --git a/doc/api-examples/get-cpuweight.py b/doc/api-examples/python/get-cpuweight.py
similarity index 100%
rename from doc/api-examples/get-cpuweight.py
rename to doc/api-examples/python/get-cpuweight.py
diff --git a/doc/api-examples/get-unit-properties.py b/doc/api-examples/python/get-unit-properties.py
similarity index 100%
rename from doc/api-examples/get-unit-properties.py
rename to doc/api-examples/python/get-unit-properties.py
diff --git a/doc/api-examples/get-unit-property.py b/doc/api-examples/python/get-unit-property.py
similarity index 100%
rename from doc/api-examples/get-unit-property.py
rename to doc/api-examples/python/get-unit-property.py
diff --git a/doc/api-examples/list-active-services.py b/doc/api-examples/python/list-active-services.py
similarity index 100%
rename from doc/api-examples/list-active-services.py
rename to doc/api-examples/python/list-active-services.py
diff --git a/doc/api-examples/list-node-units.py b/doc/api-examples/python/list-node-units.py
similarity index 100%
rename from doc/api-examples/list-node-units.py
rename to doc/api-examples/python/list-node-units.py
diff --git a/doc/api-examples/list-nodes.py b/doc/api-examples/python/list-nodes.py
similarity index 100%
rename from doc/api-examples/list-nodes.py
rename to doc/api-examples/python/list-nodes.py
diff --git a/doc/api-examples/monitor-unit.py b/doc/api-examples/python/monitor-unit.py
similarity index 100%
rename from doc/api-examples/monitor-unit.py
rename to doc/api-examples/python/monitor-unit.py
diff --git a/doc/api-examples/set-cpuweight.py b/doc/api-examples/python/set-cpuweight.py
similarity index 100%
rename from doc/api-examples/set-cpuweight.py
rename to doc/api-examples/python/set-cpuweight.py
diff --git a/doc/api-examples/start-unit.py b/doc/api-examples/python/start-unit.py
similarity index 100%
rename from doc/api-examples/start-unit.py
rename to doc/api-examples/python/start-unit.py