diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 489f0e1..9840f1a 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -7,28 +7,8 @@ set (APPS_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
 set (APPS_SHARE_DIR "${CMAKE_CURRENT_BINARY_DIR}/share")
 
-option (WITH_FUNCTION_TEST_SUITE "Include function test suite" OFF)
-option (WITH_LOAD_FW "Include loading firmware example" OFF)
-
 add_subdirectory (machine)
 add_subdirectory (system)
-if (WITH_LINUXREMOTE)
-  add_subdirectory (linux_firmware_remoteproc_slave)
-endif (WITH_LINUXREMOTE)
-
-add_subdirectory (echo_test)
-add_subdirectory (matrix_multiply)
-if (WITH_LOAD_FW)
-  add_subdirectory (load_fw)
-endif (WITH_LOAD_FW)
-if (WITH_PROXY_APPS)
-if (NOT WITH_REMOTEPROC_MASTER)
-add_subdirectory (rpc_demo)
-endif (NOT WITH_REMOTEPROC_MASTER)
-endif (WITH_PROXY_APPS)
-
-if (WITH_FUNCTION_TEST_SUITE)
-  add_subdirectory (func_test_suite)
-endif (WITH_FUNCTION_TEST_SUITE)
-
+add_subdirectory (tests)
+add_subdirectory (examples)
 
diff --git a/apps/examples/CMakeLists.txt b/apps/examples/CMakeLists.txt
new file mode 100644
index 0000000..ad47273
--- /dev/null
+++ b/apps/examples/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+option (WITH_LOAD_FW "Include loading firmware example" OFF)
+
+add_subdirectory (matrix_multiply)
+if (WITH_LOAD_FW)
+  add_subdirectory (load_fw)
+endif (WITH_LOAD_FW)
+if (WITH_PROXY_APPS)
+if (NOT WITH_REMOTEPROC_MASTER)
+add_subdirectory (rpc_demo)
+endif (NOT WITH_REMOTEPROC_MASTER)
+endif (WITH_PROXY_APPS)
diff --git a/apps/load_fw/CMakeLists.txt b/apps/examples/load_fw/CMakeLists.txt
similarity index 100%
rename from apps/load_fw/CMakeLists.txt
rename to apps/examples/load_fw/CMakeLists.txt
diff --git a/apps/load_fw/load_fw.c b/apps/examples/load_fw/load_fw.c
similarity index 100%
rename from apps/load_fw/load_fw.c
rename to apps/examples/load_fw/load_fw.c
diff --git a/apps/load_fw/lscript.ld b/apps/examples/load_fw/lscript.ld
similarity index 100%
rename from apps/load_fw/lscript.ld
rename to apps/examples/load_fw/lscript.ld
diff --git a/apps/load_fw/xil_sd.c b/apps/examples/load_fw/xil_sd.c
similarity index 100%
rename from apps/load_fw/xil_sd.c
rename to apps/examples/load_fw/xil_sd.c
diff --git a/apps/load_fw/xil_sd.h b/apps/examples/load_fw/xil_sd.h
similarity index 100%
rename from apps/load_fw/xil_sd.h
rename to apps/examples/load_fw/xil_sd.h
diff --git a/apps/matrix_multiply/CMakeLists.txt b/apps/examples/matrix_multiply/CMakeLists.txt
similarity index 100%
rename from apps/matrix_multiply/CMakeLists.txt
rename to apps/examples/matrix_multiply/CMakeLists.txt
diff --git a/apps/matrix_multiply/matrix_multiply.c b/apps/examples/matrix_multiply/matrix_multiply.c
similarity index 100%
rename from apps/matrix_multiply/matrix_multiply.c
rename to apps/examples/matrix_multiply/matrix_multiply.c
diff --git a/apps/matrix_multiply/matrix_multiplyd.c b/apps/examples/matrix_multiply/matrix_multiplyd.c
similarity index 100%
rename from apps/matrix_multiply/matrix_multiplyd.c
rename to apps/examples/matrix_multiply/matrix_multiplyd.c
diff --git a/apps/rpc_demo/CMakeLists.txt b/apps/examples/rpc_demo/CMakeLists.txt
similarity index 100%
rename from apps/rpc_demo/CMakeLists.txt
rename to apps/examples/rpc_demo/CMakeLists.txt
diff --git a/apps/rpc_demo/rpc_demo.c b/apps/examples/rpc_demo/rpc_demo.c
similarity index 100%
rename from apps/rpc_demo/rpc_demo.c
rename to apps/examples/rpc_demo/rpc_demo.c
diff --git a/apps/rpc_demo/rpc_demod.c b/apps/examples/rpc_demo/rpc_demod.c
similarity index 100%
rename from apps/rpc_demo/rpc_demod.c
rename to apps/examples/rpc_demo/rpc_demod.c
diff --git a/apps/tests/CMakeLists.txt b/apps/tests/CMakeLists.txt
new file mode 100644
index 0000000..72f7bd8
--- /dev/null
+++ b/apps/tests/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+option (WITH_FUNCTION_TEST_SUITE "Include function test suite" OFF)
+
+add_subdirectory (echo_test)
+if (WITH_FUNCTION_TEST_SUITE)
+  add_subdirectory (func_test_suite)
+endif (WITH_FUNCTION_TEST_SUITE)
diff --git a/apps/echo_test/CMakeLists.txt b/apps/tests/echo_test/CMakeLists.txt
similarity index 100%
rename from apps/echo_test/CMakeLists.txt
rename to apps/tests/echo_test/CMakeLists.txt
diff --git a/apps/echo_test/echo_test.c b/apps/tests/echo_test/echo_test.c
similarity index 100%
rename from apps/echo_test/echo_test.c
rename to apps/tests/echo_test/echo_test.c
diff --git a/apps/echo_test/echo_testd.c b/apps/tests/echo_test/echo_testd.c
similarity index 100%
rename from apps/echo_test/echo_testd.c
rename to apps/tests/echo_test/echo_testd.c
diff --git a/apps/func_test_suite/CMakeLists.txt b/apps/tests/func_test_suite/CMakeLists.txt
similarity index 100%
rename from apps/func_test_suite/CMakeLists.txt
rename to apps/tests/func_test_suite/CMakeLists.txt
diff --git a/apps/func_test_suite/func_test_suite.c b/apps/tests/func_test_suite/func_test_suite.c
similarity index 100%
rename from apps/func_test_suite/func_test_suite.c
rename to apps/tests/func_test_suite/func_test_suite.c
diff --git a/apps/func_test_suite/func_test_suite_remoteproc_master.c b/apps/tests/func_test_suite/func_test_suite_remoteproc_master.c
similarity index 100%
rename from apps/func_test_suite/func_test_suite_remoteproc_master.c
rename to apps/tests/func_test_suite/func_test_suite_remoteproc_master.c
diff --git a/apps/func_test_suite/test_suite.h b/apps/tests/func_test_suite/test_suite.h
similarity index 100%
rename from apps/func_test_suite/test_suite.h
rename to apps/tests/func_test_suite/test_suite.h