diff --git a/examples/tutorials/android-tutorial-1/AndroidManifest.xml b/examples/tutorials/android/android-tutorial-1/AndroidManifest.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-1/AndroidManifest.xml
rename to examples/tutorials/android/android-tutorial-1/AndroidManifest.xml
diff --git a/examples/tutorials/android-tutorial-1/jni/Android.mk b/examples/tutorials/android/android-tutorial-1/jni/Android.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-1/jni/Android.mk
rename to examples/tutorials/android/android-tutorial-1/jni/Android.mk
diff --git a/examples/tutorials/android-tutorial-1/jni/Application.mk b/examples/tutorials/android/android-tutorial-1/jni/Application.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-1/jni/Application.mk
rename to examples/tutorials/android/android-tutorial-1/jni/Application.mk
diff --git a/examples/tutorials/android-tutorial-1/jni/tutorial-1.c b/examples/tutorials/android/android-tutorial-1/jni/tutorial-1.c
similarity index 100%
rename from examples/tutorials/android-tutorial-1/jni/tutorial-1.c
rename to examples/tutorials/android/android-tutorial-1/jni/tutorial-1.c
diff --git a/examples/tutorials/android-tutorial-1/res/drawable-hdpi/gstreamer_logo_1.png b/examples/tutorials/android/android-tutorial-1/res/drawable-hdpi/gstreamer_logo_1.png
similarity index 100%
rename from examples/tutorials/android-tutorial-1/res/drawable-hdpi/gstreamer_logo_1.png
rename to examples/tutorials/android/android-tutorial-1/res/drawable-hdpi/gstreamer_logo_1.png
diff --git a/examples/tutorials/android-tutorial-1/res/drawable-ldpi/gstreamer_logo_1.png b/examples/tutorials/android/android-tutorial-1/res/drawable-ldpi/gstreamer_logo_1.png
similarity index 100%
rename from examples/tutorials/android-tutorial-1/res/drawable-ldpi/gstreamer_logo_1.png
rename to examples/tutorials/android/android-tutorial-1/res/drawable-ldpi/gstreamer_logo_1.png
diff --git a/examples/tutorials/android-tutorial-1/res/drawable-mdpi/gstreamer_logo_1.png b/examples/tutorials/android/android-tutorial-1/res/drawable-mdpi/gstreamer_logo_1.png
similarity index 100%
rename from examples/tutorials/android-tutorial-1/res/drawable-mdpi/gstreamer_logo_1.png
rename to examples/tutorials/android/android-tutorial-1/res/drawable-mdpi/gstreamer_logo_1.png
diff --git a/examples/tutorials/android-tutorial-1/res/drawable-xhdpi/gstreamer_logo_1.png b/examples/tutorials/android/android-tutorial-1/res/drawable-xhdpi/gstreamer_logo_1.png
similarity index 100%
rename from examples/tutorials/android-tutorial-1/res/drawable-xhdpi/gstreamer_logo_1.png
rename to examples/tutorials/android/android-tutorial-1/res/drawable-xhdpi/gstreamer_logo_1.png
diff --git a/examples/tutorials/android-tutorial-1/res/drawable-xxhdpi/gstreamer_logo_1.png b/examples/tutorials/android/android-tutorial-1/res/drawable-xxhdpi/gstreamer_logo_1.png
similarity index 100%
rename from examples/tutorials/android-tutorial-1/res/drawable-xxhdpi/gstreamer_logo_1.png
rename to examples/tutorials/android/android-tutorial-1/res/drawable-xxhdpi/gstreamer_logo_1.png
diff --git a/examples/tutorials/android-tutorial-1/res/drawable-xxxhdpi/gstreamer_logo_1.png b/examples/tutorials/android/android-tutorial-1/res/drawable-xxxhdpi/gstreamer_logo_1.png
similarity index 100%
rename from examples/tutorials/android-tutorial-1/res/drawable-xxxhdpi/gstreamer_logo_1.png
rename to examples/tutorials/android/android-tutorial-1/res/drawable-xxxhdpi/gstreamer_logo_1.png
diff --git a/examples/tutorials/android-tutorial-1/res/layout/main.xml b/examples/tutorials/android/android-tutorial-1/res/layout/main.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-1/res/layout/main.xml
rename to examples/tutorials/android/android-tutorial-1/res/layout/main.xml
diff --git a/examples/tutorials/android-tutorial-1/res/values/strings.xml b/examples/tutorials/android/android-tutorial-1/res/values/strings.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-1/res/values/strings.xml
rename to examples/tutorials/android/android-tutorial-1/res/values/strings.xml
diff --git a/examples/tutorials/android-tutorial-1/src/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java b/examples/tutorials/android/android-tutorial-1/src/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java
similarity index 100%
rename from examples/tutorials/android-tutorial-1/src/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java
rename to examples/tutorials/android/android-tutorial-1/src/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java
diff --git a/examples/tutorials/android-tutorial-2/AndroidManifest.xml b/examples/tutorials/android/android-tutorial-2/AndroidManifest.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-2/AndroidManifest.xml
rename to examples/tutorials/android/android-tutorial-2/AndroidManifest.xml
diff --git a/examples/tutorials/android-tutorial-2/jni/Android.mk b/examples/tutorials/android/android-tutorial-2/jni/Android.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-2/jni/Android.mk
rename to examples/tutorials/android/android-tutorial-2/jni/Android.mk
diff --git a/examples/tutorials/android-tutorial-2/jni/Application.mk b/examples/tutorials/android/android-tutorial-2/jni/Application.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-2/jni/Application.mk
rename to examples/tutorials/android/android-tutorial-2/jni/Application.mk
diff --git a/examples/tutorials/android-tutorial-2/jni/tutorial-2.c b/examples/tutorials/android/android-tutorial-2/jni/tutorial-2.c
similarity index 100%
rename from examples/tutorials/android-tutorial-2/jni/tutorial-2.c
rename to examples/tutorials/android/android-tutorial-2/jni/tutorial-2.c
diff --git a/examples/tutorials/android-tutorial-2/res/drawable-hdpi/gstreamer_logo_2.png b/examples/tutorials/android/android-tutorial-2/res/drawable-hdpi/gstreamer_logo_2.png
similarity index 100%
rename from examples/tutorials/android-tutorial-2/res/drawable-hdpi/gstreamer_logo_2.png
rename to examples/tutorials/android/android-tutorial-2/res/drawable-hdpi/gstreamer_logo_2.png
diff --git a/examples/tutorials/android-tutorial-2/res/drawable-ldpi/gstreamer_logo_2.png b/examples/tutorials/android/android-tutorial-2/res/drawable-ldpi/gstreamer_logo_2.png
similarity index 100%
rename from examples/tutorials/android-tutorial-2/res/drawable-ldpi/gstreamer_logo_2.png
rename to examples/tutorials/android/android-tutorial-2/res/drawable-ldpi/gstreamer_logo_2.png
diff --git a/examples/tutorials/android-tutorial-2/res/drawable-mdpi/gstreamer_logo_2.png b/examples/tutorials/android/android-tutorial-2/res/drawable-mdpi/gstreamer_logo_2.png
similarity index 100%
rename from examples/tutorials/android-tutorial-2/res/drawable-mdpi/gstreamer_logo_2.png
rename to examples/tutorials/android/android-tutorial-2/res/drawable-mdpi/gstreamer_logo_2.png
diff --git a/examples/tutorials/android-tutorial-2/res/drawable-xhdpi/gstreamer_logo_2.png b/examples/tutorials/android/android-tutorial-2/res/drawable-xhdpi/gstreamer_logo_2.png
similarity index 100%
rename from examples/tutorials/android-tutorial-2/res/drawable-xhdpi/gstreamer_logo_2.png
rename to examples/tutorials/android/android-tutorial-2/res/drawable-xhdpi/gstreamer_logo_2.png
diff --git a/examples/tutorials/android-tutorial-2/res/drawable-xxhdpi/gstreamer_logo_2.png b/examples/tutorials/android/android-tutorial-2/res/drawable-xxhdpi/gstreamer_logo_2.png
similarity index 100%
rename from examples/tutorials/android-tutorial-2/res/drawable-xxhdpi/gstreamer_logo_2.png
rename to examples/tutorials/android/android-tutorial-2/res/drawable-xxhdpi/gstreamer_logo_2.png
diff --git a/examples/tutorials/android-tutorial-2/res/drawable-xxxhdpi/gstreamer_logo_2.png b/examples/tutorials/android/android-tutorial-2/res/drawable-xxxhdpi/gstreamer_logo_2.png
similarity index 100%
rename from examples/tutorials/android-tutorial-2/res/drawable-xxxhdpi/gstreamer_logo_2.png
rename to examples/tutorials/android/android-tutorial-2/res/drawable-xxxhdpi/gstreamer_logo_2.png
diff --git a/examples/tutorials/android-tutorial-2/res/layout/main.xml b/examples/tutorials/android/android-tutorial-2/res/layout/main.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-2/res/layout/main.xml
rename to examples/tutorials/android/android-tutorial-2/res/layout/main.xml
diff --git a/examples/tutorials/android-tutorial-2/res/values/strings.xml b/examples/tutorials/android/android-tutorial-2/res/values/strings.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-2/res/values/strings.xml
rename to examples/tutorials/android/android-tutorial-2/res/values/strings.xml
diff --git a/examples/tutorials/android-tutorial-2/src/org/freedesktop/gstreamer/tutorials/tutorial_2/Tutorial2.java b/examples/tutorials/android/android-tutorial-2/src/org/freedesktop/gstreamer/tutorials/tutorial_2/Tutorial2.java
similarity index 100%
rename from examples/tutorials/android-tutorial-2/src/org/freedesktop/gstreamer/tutorials/tutorial_2/Tutorial2.java
rename to examples/tutorials/android/android-tutorial-2/src/org/freedesktop/gstreamer/tutorials/tutorial_2/Tutorial2.java
diff --git a/examples/tutorials/android-tutorial-3/AndroidManifest.xml b/examples/tutorials/android/android-tutorial-3/AndroidManifest.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-3/AndroidManifest.xml
rename to examples/tutorials/android/android-tutorial-3/AndroidManifest.xml
diff --git a/examples/tutorials/android-tutorial-3/jni/Android.mk b/examples/tutorials/android/android-tutorial-3/jni/Android.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-3/jni/Android.mk
rename to examples/tutorials/android/android-tutorial-3/jni/Android.mk
diff --git a/examples/tutorials/android-tutorial-3/jni/Application.mk b/examples/tutorials/android/android-tutorial-3/jni/Application.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-3/jni/Application.mk
rename to examples/tutorials/android/android-tutorial-3/jni/Application.mk
diff --git a/examples/tutorials/android-tutorial-3/jni/tutorial-3.c b/examples/tutorials/android/android-tutorial-3/jni/tutorial-3.c
similarity index 100%
rename from examples/tutorials/android-tutorial-3/jni/tutorial-3.c
rename to examples/tutorials/android/android-tutorial-3/jni/tutorial-3.c
diff --git a/examples/tutorials/android-tutorial-3/res/drawable-hdpi/gstreamer_logo_3.png b/examples/tutorials/android/android-tutorial-3/res/drawable-hdpi/gstreamer_logo_3.png
similarity index 100%
rename from examples/tutorials/android-tutorial-3/res/drawable-hdpi/gstreamer_logo_3.png
rename to examples/tutorials/android/android-tutorial-3/res/drawable-hdpi/gstreamer_logo_3.png
diff --git a/examples/tutorials/android-tutorial-3/res/drawable-ldpi/gstreamer_logo_3.png b/examples/tutorials/android/android-tutorial-3/res/drawable-ldpi/gstreamer_logo_3.png
similarity index 100%
rename from examples/tutorials/android-tutorial-3/res/drawable-ldpi/gstreamer_logo_3.png
rename to examples/tutorials/android/android-tutorial-3/res/drawable-ldpi/gstreamer_logo_3.png
diff --git a/examples/tutorials/android-tutorial-3/res/drawable-mdpi/gstreamer_logo_3.png b/examples/tutorials/android/android-tutorial-3/res/drawable-mdpi/gstreamer_logo_3.png
similarity index 100%
rename from examples/tutorials/android-tutorial-3/res/drawable-mdpi/gstreamer_logo_3.png
rename to examples/tutorials/android/android-tutorial-3/res/drawable-mdpi/gstreamer_logo_3.png
diff --git a/examples/tutorials/android-tutorial-3/res/drawable-xhdpi/gstreamer_logo_3.png b/examples/tutorials/android/android-tutorial-3/res/drawable-xhdpi/gstreamer_logo_3.png
similarity index 100%
rename from examples/tutorials/android-tutorial-3/res/drawable-xhdpi/gstreamer_logo_3.png
rename to examples/tutorials/android/android-tutorial-3/res/drawable-xhdpi/gstreamer_logo_3.png
diff --git a/examples/tutorials/android-tutorial-3/res/drawable-xxhdpi/gstreamer_logo_3.png b/examples/tutorials/android/android-tutorial-3/res/drawable-xxhdpi/gstreamer_logo_3.png
similarity index 100%
rename from examples/tutorials/android-tutorial-3/res/drawable-xxhdpi/gstreamer_logo_3.png
rename to examples/tutorials/android/android-tutorial-3/res/drawable-xxhdpi/gstreamer_logo_3.png
diff --git a/examples/tutorials/android-tutorial-3/res/drawable-xxxhdpi/gstreamer_logo_3.png b/examples/tutorials/android/android-tutorial-3/res/drawable-xxxhdpi/gstreamer_logo_3.png
similarity index 100%
rename from examples/tutorials/android-tutorial-3/res/drawable-xxxhdpi/gstreamer_logo_3.png
rename to examples/tutorials/android/android-tutorial-3/res/drawable-xxxhdpi/gstreamer_logo_3.png
diff --git a/examples/tutorials/android-tutorial-3/res/layout/main.xml b/examples/tutorials/android/android-tutorial-3/res/layout/main.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-3/res/layout/main.xml
rename to examples/tutorials/android/android-tutorial-3/res/layout/main.xml
diff --git a/examples/tutorials/android-tutorial-3/res/values/strings.xml b/examples/tutorials/android/android-tutorial-3/res/values/strings.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-3/res/values/strings.xml
rename to examples/tutorials/android/android-tutorial-3/res/values/strings.xml
diff --git a/examples/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/GStreamerSurfaceView.java b/examples/tutorials/android/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/GStreamerSurfaceView.java
similarity index 100%
rename from examples/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/GStreamerSurfaceView.java
rename to examples/tutorials/android/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/GStreamerSurfaceView.java
diff --git a/examples/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/Tutorial3.java b/examples/tutorials/android/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/Tutorial3.java
similarity index 100%
rename from examples/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/Tutorial3.java
rename to examples/tutorials/android/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/Tutorial3.java
diff --git a/examples/tutorials/android-tutorial-4/AndroidManifest.xml b/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-4/AndroidManifest.xml
rename to examples/tutorials/android/android-tutorial-4/AndroidManifest.xml
diff --git a/examples/tutorials/android-tutorial-4/jni/Android.mk b/examples/tutorials/android/android-tutorial-4/jni/Android.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-4/jni/Android.mk
rename to examples/tutorials/android/android-tutorial-4/jni/Android.mk
diff --git a/examples/tutorials/android-tutorial-4/jni/Application.mk b/examples/tutorials/android/android-tutorial-4/jni/Application.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-4/jni/Application.mk
rename to examples/tutorials/android/android-tutorial-4/jni/Application.mk
diff --git a/examples/tutorials/android-tutorial-4/jni/tutorial-4.c b/examples/tutorials/android/android-tutorial-4/jni/tutorial-4.c
similarity index 100%
rename from examples/tutorials/android-tutorial-4/jni/tutorial-4.c
rename to examples/tutorials/android/android-tutorial-4/jni/tutorial-4.c
diff --git a/examples/tutorials/android-tutorial-4/res/drawable-hdpi/gstreamer_logo_4.png b/examples/tutorials/android/android-tutorial-4/res/drawable-hdpi/gstreamer_logo_4.png
similarity index 100%
rename from examples/tutorials/android-tutorial-4/res/drawable-hdpi/gstreamer_logo_4.png
rename to examples/tutorials/android/android-tutorial-4/res/drawable-hdpi/gstreamer_logo_4.png
diff --git a/examples/tutorials/android-tutorial-4/res/drawable-ldpi/gstreamer_logo_4.png b/examples/tutorials/android/android-tutorial-4/res/drawable-ldpi/gstreamer_logo_4.png
similarity index 100%
rename from examples/tutorials/android-tutorial-4/res/drawable-ldpi/gstreamer_logo_4.png
rename to examples/tutorials/android/android-tutorial-4/res/drawable-ldpi/gstreamer_logo_4.png
diff --git a/examples/tutorials/android-tutorial-4/res/drawable-mdpi/gstreamer_logo_4.png b/examples/tutorials/android/android-tutorial-4/res/drawable-mdpi/gstreamer_logo_4.png
similarity index 100%
rename from examples/tutorials/android-tutorial-4/res/drawable-mdpi/gstreamer_logo_4.png
rename to examples/tutorials/android/android-tutorial-4/res/drawable-mdpi/gstreamer_logo_4.png
diff --git a/examples/tutorials/android-tutorial-4/res/drawable-xhdpi/gstreamer_logo_4.png b/examples/tutorials/android/android-tutorial-4/res/drawable-xhdpi/gstreamer_logo_4.png
similarity index 100%
rename from examples/tutorials/android-tutorial-4/res/drawable-xhdpi/gstreamer_logo_4.png
rename to examples/tutorials/android/android-tutorial-4/res/drawable-xhdpi/gstreamer_logo_4.png
diff --git a/examples/tutorials/android-tutorial-4/res/drawable-xxhdpi/gstreamer_logo_4.png b/examples/tutorials/android/android-tutorial-4/res/drawable-xxhdpi/gstreamer_logo_4.png
similarity index 100%
rename from examples/tutorials/android-tutorial-4/res/drawable-xxhdpi/gstreamer_logo_4.png
rename to examples/tutorials/android/android-tutorial-4/res/drawable-xxhdpi/gstreamer_logo_4.png
diff --git a/examples/tutorials/android-tutorial-4/res/drawable-xxxhdpi/gstreamer_logo_4.png b/examples/tutorials/android/android-tutorial-4/res/drawable-xxxhdpi/gstreamer_logo_4.png
similarity index 100%
rename from examples/tutorials/android-tutorial-4/res/drawable-xxxhdpi/gstreamer_logo_4.png
rename to examples/tutorials/android/android-tutorial-4/res/drawable-xxxhdpi/gstreamer_logo_4.png
diff --git a/examples/tutorials/android-tutorial-4/res/layout/main.xml b/examples/tutorials/android/android-tutorial-4/res/layout/main.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-4/res/layout/main.xml
rename to examples/tutorials/android/android-tutorial-4/res/layout/main.xml
diff --git a/examples/tutorials/android-tutorial-4/res/values/strings.xml b/examples/tutorials/android/android-tutorial-4/res/values/strings.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-4/res/values/strings.xml
rename to examples/tutorials/android/android-tutorial-4/res/values/strings.xml
diff --git a/examples/tutorials/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/GStreamerSurfaceView.java b/examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/GStreamerSurfaceView.java
similarity index 100%
rename from examples/tutorials/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/GStreamerSurfaceView.java
rename to examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/GStreamerSurfaceView.java
diff --git a/examples/tutorials/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java b/examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java
similarity index 100%
rename from examples/tutorials/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java
rename to examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java
diff --git a/examples/tutorials/android-tutorial-5/AndroidManifest.xml b/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-5/AndroidManifest.xml
rename to examples/tutorials/android/android-tutorial-5/AndroidManifest.xml
diff --git a/examples/tutorials/android-tutorial-5/jni/Android.mk b/examples/tutorials/android/android-tutorial-5/jni/Android.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-5/jni/Android.mk
rename to examples/tutorials/android/android-tutorial-5/jni/Android.mk
diff --git a/examples/tutorials/android-tutorial-5/jni/Application.mk b/examples/tutorials/android/android-tutorial-5/jni/Application.mk
similarity index 100%
rename from examples/tutorials/android-tutorial-5/jni/Application.mk
rename to examples/tutorials/android/android-tutorial-5/jni/Application.mk
diff --git a/examples/tutorials/android-tutorial-5/jni/tutorial-5.c b/examples/tutorials/android/android-tutorial-5/jni/tutorial-5.c
similarity index 100%
rename from examples/tutorials/android-tutorial-5/jni/tutorial-5.c
rename to examples/tutorials/android/android-tutorial-5/jni/tutorial-5.c
diff --git a/examples/tutorials/android-tutorial-5/res/drawable-ldpi/file.png b/examples/tutorials/android/android-tutorial-5/res/drawable-ldpi/file.png
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/drawable-ldpi/file.png
rename to examples/tutorials/android/android-tutorial-5/res/drawable-ldpi/file.png
diff --git a/examples/tutorials/android-tutorial-5/res/drawable-ldpi/folder.png b/examples/tutorials/android/android-tutorial-5/res/drawable-ldpi/folder.png
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/drawable-ldpi/folder.png
rename to examples/tutorials/android/android-tutorial-5/res/drawable-ldpi/folder.png
diff --git a/examples/tutorials/android-tutorial-5/res/drawable-ldpi/gstreamer_logo_5.png b/examples/tutorials/android/android-tutorial-5/res/drawable-ldpi/gstreamer_logo_5.png
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/drawable-ldpi/gstreamer_logo_5.png
rename to examples/tutorials/android/android-tutorial-5/res/drawable-ldpi/gstreamer_logo_5.png
diff --git a/examples/tutorials/android-tutorial-5/res/drawable-mdpi/gstreamer_logo_5.png b/examples/tutorials/android/android-tutorial-5/res/drawable-mdpi/gstreamer_logo_5.png
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/drawable-mdpi/gstreamer_logo_5.png
rename to examples/tutorials/android/android-tutorial-5/res/drawable-mdpi/gstreamer_logo_5.png
diff --git a/examples/tutorials/android-tutorial-5/res/drawable-xhdpi/gstreamer_logo_5.png b/examples/tutorials/android/android-tutorial-5/res/drawable-xhdpi/gstreamer_logo_5.png
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/drawable-xhdpi/gstreamer_logo_5.png
rename to examples/tutorials/android/android-tutorial-5/res/drawable-xhdpi/gstreamer_logo_5.png
diff --git a/examples/tutorials/android-tutorial-5/res/drawable-xxhdpi/gstreamer_logo_5.png b/examples/tutorials/android/android-tutorial-5/res/drawable-xxhdpi/gstreamer_logo_5.png
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/drawable-xxhdpi/gstreamer_logo_5.png
rename to examples/tutorials/android/android-tutorial-5/res/drawable-xxhdpi/gstreamer_logo_5.png
diff --git a/examples/tutorials/android-tutorial-5/res/drawable-xxxhdpi/gstreamer_logo_5.png b/examples/tutorials/android/android-tutorial-5/res/drawable-xxxhdpi/gstreamer_logo_5.png
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/drawable-xxxhdpi/gstreamer_logo_5.png
rename to examples/tutorials/android/android-tutorial-5/res/drawable-xxxhdpi/gstreamer_logo_5.png
diff --git a/examples/tutorials/android-tutorial-5/res/layout/file_dialog_main.xml b/examples/tutorials/android/android-tutorial-5/res/layout/file_dialog_main.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/layout/file_dialog_main.xml
rename to examples/tutorials/android/android-tutorial-5/res/layout/file_dialog_main.xml
diff --git a/examples/tutorials/android-tutorial-5/res/layout/file_dialog_row.xml b/examples/tutorials/android/android-tutorial-5/res/layout/file_dialog_row.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/layout/file_dialog_row.xml
rename to examples/tutorials/android/android-tutorial-5/res/layout/file_dialog_row.xml
diff --git a/examples/tutorials/android-tutorial-5/res/layout/main.xml b/examples/tutorials/android/android-tutorial-5/res/layout/main.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/layout/main.xml
rename to examples/tutorials/android/android-tutorial-5/res/layout/main.xml
diff --git a/examples/tutorials/android-tutorial-5/res/values/strings.xml b/examples/tutorials/android/android-tutorial-5/res/values/strings.xml
similarity index 100%
rename from examples/tutorials/android-tutorial-5/res/values/strings.xml
rename to examples/tutorials/android/android-tutorial-5/res/values/strings.xml
diff --git a/examples/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/GStreamerSurfaceView.java b/examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/GStreamerSurfaceView.java
similarity index 100%
rename from examples/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/GStreamerSurfaceView.java
rename to examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/GStreamerSurfaceView.java
diff --git a/examples/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java b/examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
similarity index 100%
rename from examples/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
rename to examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
diff --git a/examples/tutorials/android-tutorial-5/src/com/lamerman/FileDialog.java b/examples/tutorials/android/android-tutorial-5/src/com/lamerman/FileDialog.java
similarity index 100%
rename from examples/tutorials/android-tutorial-5/src/com/lamerman/FileDialog.java
rename to examples/tutorials/android/android-tutorial-5/src/com/lamerman/FileDialog.java