diff --git a/configure.ac b/configure.ac
index 2fcbce6bc2..be15f7986a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -767,6 +767,8 @@ NetworkManager.pc
 examples/Makefile
 examples/shell/Makefile
 examples/python/Makefile
+examples/python/dbus/Makefile
+examples/python/gi/Makefile
 examples/ruby/Makefile
 examples/C/Makefile
 examples/C/glib/Makefile
diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am
index ade9497814..3b6a41f494 100644
--- a/examples/python/Makefile.am
+++ b/examples/python/Makefile.am
@@ -1,14 +1,2 @@
-EXTRA_DIST = \
-	nm-state.py \
-	add-connection.py \
-	add-system-wifi-connection.py
-	vpn.py \
-	update-secrets.py \
-	list-connections.py \
-	show-bssids.py \
-	disconnect-device.py \
-	get-active-connection-uuids.py \
-	list-devices.py \
-	goi-list-connections.py \
-	goi-device-state-ip4config.py \
-	goi-firewall-zone.py
+SUBDIRS= dbus gi
+
diff --git a/examples/python/dbus/Makefile.am b/examples/python/dbus/Makefile.am
new file mode 100644
index 0000000000..a54997d75d
--- /dev/null
+++ b/examples/python/dbus/Makefile.am
@@ -0,0 +1,11 @@
+EXTRA_DIST = \
+	nm-state.py \
+	add-connection.py \
+	add-system-wifi-connection.py
+	vpn.py \
+	update-secrets.py \
+	list-connections.py \
+	show-bssids.py \
+	disconnect-device.py \
+	get-active-connection-uuids.py \
+	list-devices.py
diff --git a/examples/python/add-connection.py b/examples/python/dbus/add-connection.py
similarity index 100%
rename from examples/python/add-connection.py
rename to examples/python/dbus/add-connection.py
diff --git a/examples/python/add-system-wifi-connection.py b/examples/python/dbus/add-system-wifi-connection.py
similarity index 100%
rename from examples/python/add-system-wifi-connection.py
rename to examples/python/dbus/add-system-wifi-connection.py
diff --git a/examples/python/disconnect-device.py b/examples/python/dbus/disconnect-device.py
similarity index 100%
rename from examples/python/disconnect-device.py
rename to examples/python/dbus/disconnect-device.py
diff --git a/examples/python/get-active-connection-uuids.py b/examples/python/dbus/get-active-connection-uuids.py
similarity index 100%
rename from examples/python/get-active-connection-uuids.py
rename to examples/python/dbus/get-active-connection-uuids.py
diff --git a/examples/python/list-connections.py b/examples/python/dbus/list-connections.py
similarity index 100%
rename from examples/python/list-connections.py
rename to examples/python/dbus/list-connections.py
diff --git a/examples/python/list-devices.py b/examples/python/dbus/list-devices.py
similarity index 100%
rename from examples/python/list-devices.py
rename to examples/python/dbus/list-devices.py
diff --git a/examples/python/nm-state.py b/examples/python/dbus/nm-state.py
similarity index 100%
rename from examples/python/nm-state.py
rename to examples/python/dbus/nm-state.py
diff --git a/examples/python/show-bssids.py b/examples/python/dbus/show-bssids.py
similarity index 100%
rename from examples/python/show-bssids.py
rename to examples/python/dbus/show-bssids.py
diff --git a/examples/python/update-secrets.py b/examples/python/dbus/update-secrets.py
similarity index 100%
rename from examples/python/update-secrets.py
rename to examples/python/dbus/update-secrets.py
diff --git a/examples/python/vpn.py b/examples/python/dbus/vpn.py
similarity index 100%
rename from examples/python/vpn.py
rename to examples/python/dbus/vpn.py
diff --git a/examples/python/gi/Makefile.am b/examples/python/gi/Makefile.am
new file mode 100644
index 0000000000..23152c3c13
--- /dev/null
+++ b/examples/python/gi/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+	list-connections.py \
+	device-state-ip4config.py \
+	firewall-zone.py
diff --git a/examples/python/goi-device-state-ip4config.py b/examples/python/gi/device-state-ip4config.py
similarity index 100%
rename from examples/python/goi-device-state-ip4config.py
rename to examples/python/gi/device-state-ip4config.py
diff --git a/examples/python/goi-firewall-zone.py b/examples/python/gi/firewall-zone.py
similarity index 100%
rename from examples/python/goi-firewall-zone.py
rename to examples/python/gi/firewall-zone.py
diff --git a/examples/python/goi-list-connections.py b/examples/python/gi/list-connections.py
similarity index 100%
rename from examples/python/goi-list-connections.py
rename to examples/python/gi/list-connections.py