diff --git a/ndb/docs/Makefile.am b/ndb/docs/Makefile.am
index 6d4cdc12cf6..ca826d7e178 100644
--- a/ndb/docs/Makefile.am
+++ b/ndb/docs/Makefile.am
@@ -48,7 +48,7 @@ ndbapi.html: $(noinst_HEADERS)
 	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
 	mkdir -p $(DOXYTMP) $(DOXYOUT); \
 	@CP@ $(top_srcdir)/ndb/include/ndbapi/*  $(DOXYTMP); \
-	@CP@ $(top_srcdir)/ndb/examples/*/*.[ch]pp $(DOXYTMP); \
+	@CP@ $(top_srcdir)/ndb/ndbapi-examples/*/*.[ch]pp $(DOXYTMP); \
 	@PERL@ $(DOXYDIR)/predoxy.pl; \
 	mv footer.html $(DOXYTMP); \
 	(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.ndbapi); \
diff --git a/ndb/examples/configurations/demos.tar b/ndb/examples/configurations/demos.tar
deleted file mode 100644
index d8cae90ec5b..00000000000
Binary files a/ndb/examples/configurations/demos.tar and /dev/null differ
diff --git a/ndb/examples/Makefile b/ndb/ndbapi-examples/Makefile
similarity index 100%
rename from ndb/examples/Makefile
rename to ndb/ndbapi-examples/Makefile
diff --git a/ndb/examples/mgmapi_logevent_example/Makefile b/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
similarity index 100%
rename from ndb/examples/mgmapi_logevent_example/Makefile
rename to ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
diff --git a/ndb/examples/mgmapi_logevent_example/mgmapi_logevent.cpp b/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
similarity index 100%
rename from ndb/examples/mgmapi_logevent_example/mgmapi_logevent.cpp
rename to ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
diff --git a/ndb/examples/ndbapi_async_example/Makefile b/ndb/ndbapi-examples/ndbapi_async_example/Makefile
similarity index 100%
rename from ndb/examples/ndbapi_async_example/Makefile
rename to ndb/ndbapi-examples/ndbapi_async_example/Makefile
diff --git a/ndb/examples/ndbapi_async_example/ndbapi_async.cpp b/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
similarity index 100%
rename from ndb/examples/ndbapi_async_example/ndbapi_async.cpp
rename to ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
diff --git a/ndb/examples/ndbapi_async_example/readme.txt b/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
similarity index 100%
rename from ndb/examples/ndbapi_async_example/readme.txt
rename to ndb/ndbapi-examples/ndbapi_async_example/readme.txt
diff --git a/ndb/examples/ndbapi_async_example1/Makefile b/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
similarity index 100%
rename from ndb/examples/ndbapi_async_example1/Makefile
rename to ndb/ndbapi-examples/ndbapi_async_example1/Makefile
diff --git a/ndb/examples/ndbapi_async_example1/ndbapi_async1.cpp b/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
similarity index 100%
rename from ndb/examples/ndbapi_async_example1/ndbapi_async1.cpp
rename to ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
diff --git a/ndb/examples/ndbapi_event_example/Makefile b/ndb/ndbapi-examples/ndbapi_event_example/Makefile
similarity index 100%
rename from ndb/examples/ndbapi_event_example/Makefile
rename to ndb/ndbapi-examples/ndbapi_event_example/Makefile
diff --git a/ndb/examples/ndbapi_event_example/ndbapi_event.cpp b/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
similarity index 100%
rename from ndb/examples/ndbapi_event_example/ndbapi_event.cpp
rename to ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
diff --git a/ndb/examples/ndbapi_retries_example/Makefile b/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
similarity index 100%
rename from ndb/examples/ndbapi_retries_example/Makefile
rename to ndb/ndbapi-examples/ndbapi_retries_example/Makefile
diff --git a/ndb/examples/ndbapi_retries_example/ndbapi_retries.cpp b/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
similarity index 100%
rename from ndb/examples/ndbapi_retries_example/ndbapi_retries.cpp
rename to ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
diff --git a/ndb/examples/ndbapi_scan_example/Makefile b/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
similarity index 100%
rename from ndb/examples/ndbapi_scan_example/Makefile
rename to ndb/ndbapi-examples/ndbapi_scan_example/Makefile
diff --git a/ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp b/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
similarity index 100%
rename from ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp
rename to ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
diff --git a/ndb/examples/ndbapi_scan_example/readme.txt b/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
similarity index 100%
rename from ndb/examples/ndbapi_scan_example/readme.txt
rename to ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
diff --git a/ndb/examples/ndbapi_simple_example/Makefile b/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
similarity index 100%
rename from ndb/examples/ndbapi_simple_example/Makefile
rename to ndb/ndbapi-examples/ndbapi_simple_example/Makefile
diff --git a/ndb/examples/ndbapi_simple_example/ndbapi_simple.cpp b/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
similarity index 100%
rename from ndb/examples/ndbapi_simple_example/ndbapi_simple.cpp
rename to ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
diff --git a/ndb/examples/ndbapi_simple_index_example/Makefile b/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
similarity index 100%
rename from ndb/examples/ndbapi_simple_index_example/Makefile
rename to ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
diff --git a/ndb/examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp b/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
similarity index 100%
rename from ndb/examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
rename to ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp