diff --git a/DOCS/client_api_examples/cocoabasic.m b/DOCS/client_api_examples/cocoa/cocoabasic.m
similarity index 95%
rename from DOCS/client_api_examples/cocoabasic.m
rename to DOCS/client_api_examples/cocoa/cocoabasic.m
index 9c3d23ef57..74f8f2e864 100644
--- a/DOCS/client_api_examples/cocoabasic.m
+++ b/DOCS/client_api_examples/cocoa/cocoabasic.m
@@ -3,8 +3,18 @@
 // but that's not quite ready yet.
 // You may need a basic Info.plist and MainMenu.xib to make this work.
 
-#include "../../libmpv/client.h"
-#include "shared.h"
+#include "libmpv/client.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+static inline void check_error(int status)
+{
+    if (status < 0) {
+        printf("mpv API error: %s\n", mpv_error_string(status));
+        exit(1);
+    }
+}
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/DOCS/client_api_examples/qtexample.cpp b/DOCS/client_api_examples/qt/qtexample.cpp
similarity index 100%
rename from DOCS/client_api_examples/qtexample.cpp
rename to DOCS/client_api_examples/qt/qtexample.cpp
diff --git a/DOCS/client_api_examples/qtexample.h b/DOCS/client_api_examples/qt/qtexample.h
similarity index 100%
rename from DOCS/client_api_examples/qtexample.h
rename to DOCS/client_api_examples/qt/qtexample.h
diff --git a/DOCS/client_api_examples/qtexample.pro b/DOCS/client_api_examples/qt/qtexample.pro
similarity index 100%
rename from DOCS/client_api_examples/qtexample.pro
rename to DOCS/client_api_examples/qt/qtexample.pro
diff --git a/DOCS/client_api_examples/shared.h b/DOCS/client_api_examples/shared.h
deleted file mode 100644
index 027c03f1e9..0000000000
--- a/DOCS/client_api_examples/shared.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-static inline void check_error(int status)
-{
-    if (status < 0) {
-        printf("mpv API error: %s\n", mpv_error_string(status));
-        exit(1);
-    }
-}
diff --git a/DOCS/client_api_examples/simple.c b/DOCS/client_api_examples/simple/simple.c
similarity index 88%
rename from DOCS/client_api_examples/simple.c
rename to DOCS/client_api_examples/simple/simple.c
index 6dbc40506a..62fc9e8061 100644
--- a/DOCS/client_api_examples/simple.c
+++ b/DOCS/client_api_examples/simple/simple.c
@@ -3,7 +3,14 @@
 #include <stdlib.h>
 
 #include "libmpv/client.h"
-#include "shared.h"
+
+static inline void check_error(int status)
+{
+    if (status < 0) {
+        printf("mpv API error: %s\n", mpv_error_string(status));
+        exit(1);
+    }
+}
 
 int main(int argc, char *argv[])
 {
diff --git a/wscript_build.py b/wscript_build.py
index 1791dacbae..694a65b038 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -524,8 +524,8 @@ def build(ctx):
     if ctx.dependency_satisfied('client-api-examples'):
         # This assumes all examples are single-file (as examples should be)
         examples_sources = [
-            ( "simple.c" ),
-            ( "cocoabasic.m", "cocoa" ),
+            ( "simple/simple.c" ),
+            ( "cocoa/cocoabasic.m", "cocoa" ),
         ]
 
         for source in ctx.filtered_sources(examples_sources):