diff --git a/android/scripts/package.sh b/android/scripts/package.sh
index 087b4b7fc3708bdf5bd13d92e1e9bac517a9b965..c2593936e0a301e2599bf9216c9f194e1644d67f 100644
--- a/android/scripts/package.sh
+++ b/android/scripts/package.sh
@@ -79,7 +79,7 @@ do
   fi
 done
 
-echo "OPENCV_MK_PATH:=../../opencv$CV_VERSION/share/OpenCV/OpenCV.mk" > includeOpenCV.mk
+echo "OPENCV_MK_PATH:=../../$OPENCV_NAME/share/OpenCV/OpenCV.mk" > includeOpenCV.mk
 
 
 #clean samples
diff --git a/modules/java/android/.project b/modules/java/android/.project
index 61ce0dfa31743a0ae1d12e21caa5bd5e3768c803..97b71b63abb2211eeb2907e9ba618f8f5cdeb3ac 100644
--- a/modules/java/android/.project
+++ b/modules/java/android/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>opencv2.3.1</name>
+	<name>OpenCV-2.3.1</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/modules/java/android/AndroidManifest.xml b/modules/java/android/AndroidManifest.xml
index 8e50bf1589d16df920040e8333b0b113239690fa..acef991ee941d123901a959e962bb80f435f1c91 100644
--- a/modules/java/android/AndroidManifest.xml
+++ b/modules/java/android/AndroidManifest.xml
@@ -3,9 +3,9 @@
       package="org.opencv"
       android:versionCode="1"
       android:versionName="1.0">
-    <application android:label="opencv2.3.1">
-        <activity android:name="opencv2.3.1"
-                  android:label="opencv2.3.1">
+    <application android:label="OpenCV-2.3.1">
+        <activity android:name="OpenCV-2.3.1"
+                  android:label="OpenCV-2.3.1">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/samples/android/0-base/res/values/strings.xml b/samples/android/0-base/res/values/strings.xml
deleted file mode 100644
index 772538e141276554861e004af8a34a05c20f53db..0000000000000000000000000000000000000000
--- a/samples/android/0-base/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Sample 0: base</string>
-</resources>
diff --git a/samples/android/1-java/res/values/strings.xml b/samples/android/1-java/res/values/strings.xml
deleted file mode 100644
index 32aa7c31ca25308ae7d697f77bdefe4d06d4526d..0000000000000000000000000000000000000000
--- a/samples/android/1-java/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Sample 1: Java API</string>
-</resources>
diff --git a/samples/android/4-mixed/.classpath b/samples/android/4-mixed/.classpath
deleted file mode 100644
index da04f5de0f7b196dc7980488fb61c373e8db519b..0000000000000000000000000000000000000000
--- a/samples/android/4-mixed/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="src" path="opencv2.3.1_src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt
index 699c5446b31467799a32a6041b874d4e7a2604ec..9a389cfb86b33c39fd49b58ae037a03ef8456e5a 100644
--- a/samples/android/CMakeLists.txt
+++ b/samples/android/CMakeLists.txt
@@ -40,7 +40,7 @@ if (BUILD_ANDROID_EXAMPLES)
 
         file(RELATIVE_PATH OPENCV_REFERENCE_PATH "${sample_dir}" "${CMAKE_BINARY_DIR}")
 
-        if(NOT ("${sample}" STREQUAL "0-base" OR "${sample}" STREQUAL "2-native"))
+        if(NOT ("${sample}" MATCHES "tutorial-[03].*"))
             SET(opencv_reference --library \"${OPENCV_REFERENCE_PATH}\")
         else()
             SET(opencv_reference)
diff --git a/samples/android/0-base/.classpath b/samples/android/tutorial-0-androidcamera/.classpath
similarity index 100%
rename from samples/android/0-base/.classpath
rename to samples/android/tutorial-0-androidcamera/.classpath
diff --git a/samples/android/0-base/.project b/samples/android/tutorial-0-androidcamera/.project
similarity index 90%
rename from samples/android/0-base/.project
rename to samples/android/tutorial-0-androidcamera/.project
index d828d75c042043b41baddcb483fca5e597fd646c..61dd3d526498e8e4b5094c9b01b9aab7d4dd5310 100644
--- a/samples/android/0-base/.project
+++ b/samples/android/tutorial-0-androidcamera/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Sample 0 base</name>
+	<name>Tutorial 1 Basic - 0. Android Camera</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/samples/android/0-base/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from samples/android/0-base/.settings/org.eclipse.jdt.core.prefs
rename to samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs
diff --git a/samples/android/0-base/AndroidManifest.xml b/samples/android/tutorial-0-androidcamera/AndroidManifest.xml
similarity index 96%
rename from samples/android/0-base/AndroidManifest.xml
rename to samples/android/tutorial-0-androidcamera/AndroidManifest.xml
index 3e07ce585926eb46646b971407db0cba0ed18c34..ddfcd5a616b8767845da5b1dc943ab7f43558834 100644
--- a/samples/android/0-base/AndroidManifest.xml
+++ b/samples/android/tutorial-0-androidcamera/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.s0"
+      package="org.opencv.samples.tutorial0"
       android:versionCode="1"
       android:versionName="1.0">
 
diff --git a/samples/android/0-base/default.properties b/samples/android/tutorial-0-androidcamera/default.properties
similarity index 100%
rename from samples/android/0-base/default.properties
rename to samples/android/tutorial-0-androidcamera/default.properties
diff --git a/samples/android/0-base/res/drawable/icon.png b/samples/android/tutorial-0-androidcamera/res/drawable/icon.png
similarity index 100%
rename from samples/android/0-base/res/drawable/icon.png
rename to samples/android/tutorial-0-androidcamera/res/drawable/icon.png
diff --git a/samples/android/tutorial-0-androidcamera/res/values/strings.xml b/samples/android/tutorial-0-androidcamera/res/values/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0423b8c67d5bc95d2413d2eb42fc77912b56703c
--- /dev/null
+++ b/samples/android/tutorial-0-androidcamera/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Tutorial 1 Basic - 0. Android Camera</string>
+</resources>
diff --git a/samples/android/0-base/src/org/opencv/samples/s0/Sample0Base.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java
similarity index 97%
rename from samples/android/0-base/src/org/opencv/samples/s0/Sample0Base.java
rename to samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java
index 7aebe3e20d5e024a4b857f42446f88749aaa6aec..f49b3587d55ac5f77d1a882538adf8dbb3595817 100644
--- a/samples/android/0-base/src/org/opencv/samples/s0/Sample0Base.java
+++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java
@@ -1,4 +1,4 @@
-package org.opencv.samples.s0;
+package org.opencv.samples.tutorial0;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/samples/android/0-base/src/org/opencv/samples/s0/Sample0View.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java
similarity index 98%
rename from samples/android/0-base/src/org/opencv/samples/s0/Sample0View.java
rename to samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java
index 165a61a80fa56fbea07f2f1a958b46be98956d52..b167230160a95d67f3f6b2e44e481016a6c6a9d8 100644
--- a/samples/android/0-base/src/org/opencv/samples/s0/Sample0View.java
+++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java
@@ -1,4 +1,4 @@
-package org.opencv.samples.s0;
+package org.opencv.samples.tutorial0;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/samples/android/1-java/src/org/opencv/samples/s1/SampleViewBase.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java
similarity index 98%
rename from samples/android/1-java/src/org/opencv/samples/s1/SampleViewBase.java
rename to samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java
index 5671f029d45f3be64cefd3067297fb3784fe4bcd..837f9f118fb3f95ad0cf037b029f97698fc686ec 100644
--- a/samples/android/1-java/src/org/opencv/samples/s1/SampleViewBase.java
+++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java
@@ -1,4 +1,4 @@
-package org.opencv.samples.s1;
+package org.opencv.samples.tutorial0;
 
 import java.util.List;
 
diff --git a/samples/android/3-nativecamera/.classpath b/samples/android/tutorial-1-addopencv/.classpath
similarity index 83%
rename from samples/android/3-nativecamera/.classpath
rename to samples/android/tutorial-1-addopencv/.classpath
index da04f5de0f7b196dc7980488fb61c373e8db519b..a0a90f9b1c53ba01b70d66f1178a57fba86e1ba6 100644
--- a/samples/android/3-nativecamera/.classpath
+++ b/samples/android/tutorial-1-addopencv/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="src" path="opencv2.3.1_src"/>
+	<classpathentry kind="src" path="OpenCV-2.3.1_src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/samples/android/1-java/.project b/samples/android/tutorial-1-addopencv/.project
similarity index 85%
rename from samples/android/1-java/.project
rename to samples/android/tutorial-1-addopencv/.project
index 45ba1a67c41973a4448e345faf6ed8d19e60ced4..47f794738f317977157a761b6159aef6c2807c60 100644
--- a/samples/android/1-java/.project
+++ b/samples/android/tutorial-1-addopencv/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Sample 1 Java API</name>
+	<name>Tutorial 1 Basic - 1. Add OpenCV</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -32,9 +32,9 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>opencv2.3.1_src</name>
+			<name>OpenCV-2.3.1_src</name>
 			<type>2</type>
-			<locationURI>_android_opencv2_3_1_d2471b5d/src</locationURI>
+			<locationURI>_android_OpenCV-2_3_1_d2471b5d/src</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/samples/android/1-java/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from samples/android/1-java/.settings/org.eclipse.jdt.core.prefs
rename to samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs
diff --git a/samples/android/1-java/AndroidManifest.xml b/samples/android/tutorial-1-addopencv/AndroidManifest.xml
similarity index 96%
rename from samples/android/1-java/AndroidManifest.xml
rename to samples/android/tutorial-1-addopencv/AndroidManifest.xml
index b0ccc99906419f741f00950f0750aebdc0821e6a..438f096243819ca7d5c861919c7724791fc77e15 100644
--- a/samples/android/1-java/AndroidManifest.xml
+++ b/samples/android/tutorial-1-addopencv/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.s1"
+      package="org.opencv.samples.tutorial1"
       android:versionCode="1"
       android:versionName="1.0">
 
diff --git a/samples/android/1-java/default.properties b/samples/android/tutorial-1-addopencv/default.properties
similarity index 100%
rename from samples/android/1-java/default.properties
rename to samples/android/tutorial-1-addopencv/default.properties
diff --git a/samples/android/1-java/res/drawable/icon.png b/samples/android/tutorial-1-addopencv/res/drawable/icon.png
similarity index 100%
rename from samples/android/1-java/res/drawable/icon.png
rename to samples/android/tutorial-1-addopencv/res/drawable/icon.png
diff --git a/samples/android/tutorial-1-addopencv/res/values/strings.xml b/samples/android/tutorial-1-addopencv/res/values/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04fe435d12bb70c24f8c95aeb2185ac2583e0ac5
--- /dev/null
+++ b/samples/android/tutorial-1-addopencv/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Tutorial 1 Basic - 1. Add OpenCV</string>
+</resources>
diff --git a/samples/android/1-java/src/org/opencv/samples/s1/Sample1Java.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java
similarity index 98%
rename from samples/android/1-java/src/org/opencv/samples/s1/Sample1Java.java
rename to samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java
index 67862b75df44faec33ab7d87388169e21c1ee375..2cf830008c141c1f36d17c8ebbffc0dea1c247a4 100644
--- a/samples/android/1-java/src/org/opencv/samples/s1/Sample1Java.java
+++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java
@@ -1,4 +1,4 @@
-package org.opencv.samples.s1;
+package org.opencv.samples.tutorial1;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java
similarity index 98%
rename from samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java
rename to samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java
index 191aa6a9bd4c55cf1f691eea638ec85f97fbad58..8420e8925279d2a4290197398f83ecc62c3823d5 100644
--- a/samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java
+++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java
@@ -1,4 +1,4 @@
-package org.opencv.samples.s1;
+package org.opencv.samples.tutorial1;
 
 import org.opencv.*;
 
diff --git a/samples/android/0-base/src/org/opencv/samples/s0/SampleViewBase.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java
similarity index 98%
rename from samples/android/0-base/src/org/opencv/samples/s0/SampleViewBase.java
rename to samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java
index 8830e3662a9b3ba1e4ec705c0910e747159097fe..e424859e96d6f9820b1c1a20d469ca1eaef62870 100644
--- a/samples/android/0-base/src/org/opencv/samples/s0/SampleViewBase.java
+++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java
@@ -1,4 +1,4 @@
-package org.opencv.samples.s0;
+package org.opencv.samples.tutorial1;
 
 import java.util.List;
 
diff --git a/samples/android/tutorial-2-opencvcamera/.classpath b/samples/android/tutorial-2-opencvcamera/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..a0a90f9b1c53ba01b70d66f1178a57fba86e1ba6
--- /dev/null
+++ b/samples/android/tutorial-2-opencvcamera/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="src" path="OpenCV-2.3.1_src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/samples/android/3-nativecamera/.project b/samples/android/tutorial-2-opencvcamera/.project
similarity index 100%
rename from samples/android/3-nativecamera/.project
rename to samples/android/tutorial-2-opencvcamera/.project
diff --git a/samples/android/2-native/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from samples/android/2-native/.settings/org.eclipse.jdt.core.prefs
rename to samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs
diff --git a/samples/android/3-nativecamera/AndroidManifest.xml b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
similarity index 100%
rename from samples/android/3-nativecamera/AndroidManifest.xml
rename to samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
diff --git a/samples/android/3-nativecamera/default.properties b/samples/android/tutorial-2-opencvcamera/default.properties
similarity index 100%
rename from samples/android/3-nativecamera/default.properties
rename to samples/android/tutorial-2-opencvcamera/default.properties
diff --git a/samples/android/2-native/res/drawable/icon.png b/samples/android/tutorial-2-opencvcamera/res/drawable/icon.png
similarity index 100%
rename from samples/android/2-native/res/drawable/icon.png
rename to samples/android/tutorial-2-opencvcamera/res/drawable/icon.png
diff --git a/samples/android/3-nativecamera/res/values/strings.xml b/samples/android/tutorial-2-opencvcamera/res/values/strings.xml
similarity index 100%
rename from samples/android/3-nativecamera/res/values/strings.xml
rename to samples/android/tutorial-2-opencvcamera/res/values/strings.xml
diff --git a/samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java
similarity index 100%
rename from samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3NativeCamera.java
rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java
diff --git a/samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3View.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java
similarity index 100%
rename from samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3View.java
rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java
diff --git a/samples/android/3-nativecamera/src/org/opencv/samples/s3/SampleViewBase.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java
similarity index 100%
rename from samples/android/3-nativecamera/src/org/opencv/samples/s3/SampleViewBase.java
rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java
diff --git a/samples/android/2-native/.classpath b/samples/android/tutorial-3-native/.classpath
similarity index 100%
rename from samples/android/2-native/.classpath
rename to samples/android/tutorial-3-native/.classpath
diff --git a/samples/android/2-native/.project b/samples/android/tutorial-3-native/.project
similarity index 100%
rename from samples/android/2-native/.project
rename to samples/android/tutorial-3-native/.project
diff --git a/samples/android/3-nativecamera/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from samples/android/3-nativecamera/.settings/org.eclipse.jdt.core.prefs
rename to samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs
diff --git a/samples/android/2-native/AndroidManifest.xml b/samples/android/tutorial-3-native/AndroidManifest.xml
similarity index 100%
rename from samples/android/2-native/AndroidManifest.xml
rename to samples/android/tutorial-3-native/AndroidManifest.xml
diff --git a/samples/android/2-native/default.properties b/samples/android/tutorial-3-native/default.properties
similarity index 100%
rename from samples/android/2-native/default.properties
rename to samples/android/tutorial-3-native/default.properties
diff --git a/samples/android/2-native/jni/Android.mk b/samples/android/tutorial-3-native/jni/Android.mk
similarity index 100%
rename from samples/android/2-native/jni/Android.mk
rename to samples/android/tutorial-3-native/jni/Android.mk
diff --git a/samples/android/2-native/jni/Application.mk b/samples/android/tutorial-3-native/jni/Application.mk
similarity index 100%
rename from samples/android/2-native/jni/Application.mk
rename to samples/android/tutorial-3-native/jni/Application.mk
diff --git a/samples/android/2-native/jni/jni_part.cpp b/samples/android/tutorial-3-native/jni/jni_part.cpp
similarity index 100%
rename from samples/android/2-native/jni/jni_part.cpp
rename to samples/android/tutorial-3-native/jni/jni_part.cpp
diff --git a/samples/android/3-nativecamera/res/drawable/icon.png b/samples/android/tutorial-3-native/res/drawable/icon.png
similarity index 100%
rename from samples/android/3-nativecamera/res/drawable/icon.png
rename to samples/android/tutorial-3-native/res/drawable/icon.png
diff --git a/samples/android/2-native/res/values/strings.xml b/samples/android/tutorial-3-native/res/values/strings.xml
similarity index 100%
rename from samples/android/2-native/res/values/strings.xml
rename to samples/android/tutorial-3-native/res/values/strings.xml
diff --git a/samples/android/2-native/src/org/opencv/samples/s2/Sample2Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java
similarity index 100%
rename from samples/android/2-native/src/org/opencv/samples/s2/Sample2Native.java
rename to samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java
diff --git a/samples/android/2-native/src/org/opencv/samples/s2/Sample2View.java b/samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java
similarity index 100%
rename from samples/android/2-native/src/org/opencv/samples/s2/Sample2View.java
rename to samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java
diff --git a/samples/android/2-native/src/org/opencv/samples/s2/SampleViewBase.java b/samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java
similarity index 100%
rename from samples/android/2-native/src/org/opencv/samples/s2/SampleViewBase.java
rename to samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java
diff --git a/samples/android/1-java/.classpath b/samples/android/tutorial-4-mixed/.classpath
similarity index 100%
rename from samples/android/1-java/.classpath
rename to samples/android/tutorial-4-mixed/.classpath
diff --git a/samples/android/4-mixed/.project b/samples/android/tutorial-4-mixed/.project
similarity index 100%
rename from samples/android/4-mixed/.project
rename to samples/android/tutorial-4-mixed/.project
diff --git a/samples/android/4-mixed/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from samples/android/4-mixed/.settings/org.eclipse.jdt.core.prefs
rename to samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs
diff --git a/samples/android/4-mixed/AndroidManifest.xml b/samples/android/tutorial-4-mixed/AndroidManifest.xml
similarity index 100%
rename from samples/android/4-mixed/AndroidManifest.xml
rename to samples/android/tutorial-4-mixed/AndroidManifest.xml
diff --git a/samples/android/4-mixed/default.properties b/samples/android/tutorial-4-mixed/default.properties
similarity index 100%
rename from samples/android/4-mixed/default.properties
rename to samples/android/tutorial-4-mixed/default.properties
diff --git a/samples/android/4-mixed/jni/Android.mk b/samples/android/tutorial-4-mixed/jni/Android.mk
similarity index 100%
rename from samples/android/4-mixed/jni/Android.mk
rename to samples/android/tutorial-4-mixed/jni/Android.mk
diff --git a/samples/android/4-mixed/jni/Application.mk b/samples/android/tutorial-4-mixed/jni/Application.mk
similarity index 100%
rename from samples/android/4-mixed/jni/Application.mk
rename to samples/android/tutorial-4-mixed/jni/Application.mk
diff --git a/samples/android/4-mixed/jni/jni_part.cpp b/samples/android/tutorial-4-mixed/jni/jni_part.cpp
similarity index 100%
rename from samples/android/4-mixed/jni/jni_part.cpp
rename to samples/android/tutorial-4-mixed/jni/jni_part.cpp
diff --git a/samples/android/4-mixed/res/drawable/icon.png b/samples/android/tutorial-4-mixed/res/drawable/icon.png
similarity index 100%
rename from samples/android/4-mixed/res/drawable/icon.png
rename to samples/android/tutorial-4-mixed/res/drawable/icon.png
diff --git a/samples/android/4-mixed/res/values/strings.xml b/samples/android/tutorial-4-mixed/res/values/strings.xml
similarity index 100%
rename from samples/android/4-mixed/res/values/strings.xml
rename to samples/android/tutorial-4-mixed/res/values/strings.xml
diff --git a/samples/android/4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java
similarity index 100%
rename from samples/android/4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java
rename to samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java
diff --git a/samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java
similarity index 100%
rename from samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java
rename to samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java
diff --git a/samples/android/4-mixed/src/org/opencv/samples/s4/SampleViewBase.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java
similarity index 100%
rename from samples/android/4-mixed/src/org/opencv/samples/s4/SampleViewBase.java
rename to samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java