diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93549c9430..e9aa14fc7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -456,15 +456,15 @@ if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
 endif()
 
 if(ANDROID)
-  add_subdirectory(android/service)
+  add_subdirectory(platforms/android/service)
 endif()
 
 if(BUILD_ANDROID_PACKAGE)
-  add_subdirectory(android/package)
+  add_subdirectory(platforms/android/package)
 endif()
 
 if (ANDROID)
-  add_subdirectory(android/libinfo)
+  add_subdirectory(platforms/android/libinfo)
 endif()
 
 # ----------------------------------------------------------------------------
diff --git a/android/refman.rst b/android/refman.rst
deleted file mode 100644
index 12d7ea6ec0..0000000000
--- a/android/refman.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-############################
-OpenCV4Android Reference
-############################
-
-.. toctree::
-   :maxdepth: 2
-
-   service/doc/index.rst
-   java.rst
\ No newline at end of file
diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
index 705ccc8df1..c99cae7883 100644
--- a/cmake/OpenCVGenConfig.cmake
+++ b/cmake/OpenCVGenConfig.cmake
@@ -162,7 +162,7 @@ if(UNIX)
 endif()
 
 if(ANDROID)
-  install(FILES "${OpenCV_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION ${OPENCV_CONFIG_INSTALL_PATH}/)
+  install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION ${OPENCV_CONFIG_INSTALL_PATH}/)
 endif()
 
 # --------------------------------------------------------------------------------------------
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 0f2695fc9a..70f4809d22 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -53,8 +53,8 @@ if(BUILD_DOCS AND HAVE_SPHINX)
     endif()
   endforeach()
 
-  file(GLOB_RECURSE _OPENCV_FILES_REF "${OpenCV_SOURCE_DIR}/android/service/doc/*.rst")
-  file(GLOB_RECURSE _OPENCV_FILES_REF_PICT "${OpenCV_SOURCE_DIR}/android/service/doc/*.png" "${OpenCV_SOURCE_DIR}/android/service/doc/*.jpg")
+  file(GLOB_RECURSE _OPENCV_FILES_REF "${OpenCV_SOURCE_DIR}/platforms/android/service/doc/*.rst")
+  file(GLOB_RECURSE _OPENCV_FILES_REF_PICT "${OpenCV_SOURCE_DIR}/platforms/android/service/doc/*.png" "${OpenCV_SOURCE_DIR}/platforms/android/service/doc/*.jpg")
   list(APPEND OPENCV_FILES_REF ${_OPENCV_FILES_REF})
   list(APPEND OPENCV_FILES_REF_PICT ${_OPENCV_FILES_REF_PICT})
 
diff --git a/doc/conf.py b/doc/conf.py
index 4c7a15c891..f3f7aec58a 100755
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -239,7 +239,7 @@ latex_documents = [
    u'', 'manual'),
   ('doc/tutorials/tutorials', 'opencv_tutorials.tex', u'The OpenCV Tutorials',
    u'', 'manual'),
-  ('android/refman', 'opencv2manager.tex', u'The OpenCV Manager Manual',
+  ('platforms/android/refman', 'opencv2manager.tex', u'The OpenCV Manager Manual',
    u'', 'manual'),
 ]
 
diff --git a/index.rst b/index.rst
index 909bf908b8..5f50b66d0f 100644
--- a/index.rst
+++ b/index.rst
@@ -10,7 +10,7 @@ Welcome to opencv documentation!
    :maxdepth: 2
 
    modules/refman.rst
-   android/refman.rst
+   platforms/android/refman.rst
    doc/user_guide/user_guide.rst
    doc/tutorials/tutorials.rst
 
diff --git a/modules/androidcamera/CMakeLists.txt b/modules/androidcamera/CMakeLists.txt
index d54dd5d208..8ac8ced88e 100644
--- a/modules/androidcamera/CMakeLists.txt
+++ b/modules/androidcamera/CMakeLists.txt
@@ -6,7 +6,7 @@ set(the_description "Auxiliary module for Android native camera support")
 set(OPENCV_MODULE_TYPE STATIC)
 
 ocv_define_module(androidcamera INTERNAL opencv_core log dl)
-ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/camera_wrapper" "${OpenCV_SOURCE_DIR}/android/service/engine/jni/include")
+ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/camera_wrapper" "${OpenCV_SOURCE_DIR}/platforms/android/service/engine/jni/include")
 
 # Android source tree for native camera
 SET (ANDROID_SOURCE_TREE "ANDROID_SOURCE_TREE-NOTFOUND" CACHE PATH
diff --git a/android/README.android b/platforms/android/README.android
similarity index 100%
rename from android/README.android
rename to platforms/android/README.android
diff --git a/android/android.toolchain.cmake b/platforms/android/android.toolchain.cmake
similarity index 100%
rename from android/android.toolchain.cmake
rename to platforms/android/android.toolchain.cmake
diff --git a/android/java.rst b/platforms/android/java.rst
similarity index 100%
rename from android/java.rst
rename to platforms/android/java.rst
diff --git a/android/libinfo/CMakeLists.txt b/platforms/android/libinfo/CMakeLists.txt
similarity index 100%
rename from android/libinfo/CMakeLists.txt
rename to platforms/android/libinfo/CMakeLists.txt
diff --git a/android/libinfo/info.c b/platforms/android/libinfo/info.c
similarity index 100%
rename from android/libinfo/info.c
rename to platforms/android/libinfo/info.c
diff --git a/android/package/AndroidManifest.xml b/platforms/android/package/AndroidManifest.xml
similarity index 100%
rename from android/package/AndroidManifest.xml
rename to platforms/android/package/AndroidManifest.xml
diff --git a/android/package/CMakeLists.txt b/platforms/android/package/CMakeLists.txt
similarity index 100%
rename from android/package/CMakeLists.txt
rename to platforms/android/package/CMakeLists.txt
diff --git a/android/package/res/drawable/icon.png b/platforms/android/package/res/drawable/icon.png
similarity index 100%
rename from android/package/res/drawable/icon.png
rename to platforms/android/package/res/drawable/icon.png
diff --git a/android/package/res/values/strings.xml b/platforms/android/package/res/values/strings.xml
similarity index 100%
rename from android/package/res/values/strings.xml
rename to platforms/android/package/res/values/strings.xml
diff --git a/android/scripts/ABI_compat_generator.py b/platforms/android/scripts/ABI_compat_generator.py
similarity index 100%
rename from android/scripts/ABI_compat_generator.py
rename to platforms/android/scripts/ABI_compat_generator.py
diff --git a/android/scripts/build.cmd b/platforms/android/scripts/build.cmd
similarity index 100%
rename from android/scripts/build.cmd
rename to platforms/android/scripts/build.cmd
diff --git a/android/scripts/camera_build.conf b/platforms/android/scripts/camera_build.conf
similarity index 100%
rename from android/scripts/camera_build.conf
rename to platforms/android/scripts/camera_build.conf
diff --git a/android/scripts/cmake_android.cmd b/platforms/android/scripts/cmake_android.cmd
similarity index 100%
rename from android/scripts/cmake_android.cmd
rename to platforms/android/scripts/cmake_android.cmd
diff --git a/android/scripts/cmake_android.sh b/platforms/android/scripts/cmake_android.sh
similarity index 75%
rename from android/scripts/cmake_android.sh
rename to platforms/android/scripts/cmake_android.sh
index 101ba3cee8..941a665b80 100755
--- a/android/scripts/cmake_android.sh
+++ b/platforms/android/scripts/cmake_android.sh
@@ -4,5 +4,5 @@ cd `dirname $0`/..
 mkdir -p build
 cd build
 
-cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../..
+cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../../..
 
diff --git a/android/scripts/cmake_android_all_cameras.py b/platforms/android/scripts/cmake_android_all_cameras.py
similarity index 92%
rename from android/scripts/cmake_android_all_cameras.py
rename to platforms/android/scripts/cmake_android_all_cameras.py
index afcab63a75..59418944ce 100755
--- a/android/scripts/cmake_android_all_cameras.py
+++ b/platforms/android/scripts/cmake_android_all_cameras.py
@@ -49,7 +49,7 @@ for s in ConfFile.readlines():
 
     os.chdir(BuildDir)
     BuildLog = os.path.join(BuildDir, "build.log")
-    CmakeCmdLine = "cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_SOURCE_TREE=\"%s\" -DANDROID_NATIVE_API_LEVEL=\"%s\" -DANDROID_ABI=\"%s\" -DANDROID_STL=stlport_static ../../ > \"%s\" 2>&1" % (AndroidTreeRoot, NativeApiLevel, Arch, BuildLog)
+    CmakeCmdLine = "cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_SOURCE_TREE=\"%s\" -DANDROID_NATIVE_API_LEVEL=\"%s\" -DANDROID_ABI=\"%s\" -DANDROID_STL=stlport_static ../../../ > \"%s\" 2>&1" % (AndroidTreeRoot, NativeApiLevel, Arch, BuildLog)
     MakeCmdLine = "make %s >> \"%s\" 2>&1" % (MakeTarget, BuildLog);
     #print(CmakeCmdLine)
     os.system(CmakeCmdLine)
@@ -59,7 +59,7 @@ for s in ConfFile.readlines():
     CameraLib = os.path.join(BuildDir, "lib", Arch, "lib" + MakeTarget + ".so")
     if (os.path.exists(CameraLib)):
         try:
-            shutil.copyfile(CameraLib, os.path.join("..", "3rdparty", "lib", Arch, "lib" + MakeTarget + ".so"))
+            shutil.copyfile(CameraLib, os.path.join("..", "..", "3rdparty", "lib", Arch, "lib" + MakeTarget + ".so"))
             print("Building %s for %s\t[\033[92mOK\033[0m]" % (MakeTarget, Arch));
         except:
             print("Building %s for %s\t[\033[91mFAILED\033[0m]" % (MakeTarget, Arch));
diff --git a/android/scripts/cmake_android_armeabi.sh b/platforms/android/scripts/cmake_android_armeabi.sh
similarity index 83%
rename from android/scripts/cmake_android_armeabi.sh
rename to platforms/android/scripts/cmake_android_armeabi.sh
index 9c711d8855..dec0ce3429 100755
--- a/android/scripts/cmake_android_armeabi.sh
+++ b/platforms/android/scripts/cmake_android_armeabi.sh
@@ -4,5 +4,5 @@ cd `dirname $0`/..
 mkdir -p build_armeabi
 cd build_armeabi
 
-cmake -DANDROID_ABI=armeabi -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../..
+cmake -DANDROID_ABI=armeabi -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../../..
 
diff --git a/platforms/android/scripts/cmake_android_debug.sh b/platforms/android/scripts/cmake_android_debug.sh
new file mode 100755
index 0000000000..dc5a3a17f6
--- /dev/null
+++ b/platforms/android/scripts/cmake_android_debug.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd `dirname $0`/..
+
+mkdir -p build_debug
+cd build_debug
+
+cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../../..
+
diff --git a/android/scripts/cmake_android_mips.sh b/platforms/android/scripts/cmake_android_mips.sh
similarity index 84%
rename from android/scripts/cmake_android_mips.sh
rename to platforms/android/scripts/cmake_android_mips.sh
index 17d2ff937e..5c4195de59 100755
--- a/android/scripts/cmake_android_mips.sh
+++ b/platforms/android/scripts/cmake_android_mips.sh
@@ -4,5 +4,5 @@ cd `dirname $0`/..
 mkdir -p build_mips
 cd build_mips
 
-cmake -DANDROID_ABI=mips -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../..
+cmake -DANDROID_ABI=mips -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../../..
 
diff --git a/android/scripts/cmake_android_neon.sh b/platforms/android/scripts/cmake_android_neon.sh
similarity index 75%
rename from android/scripts/cmake_android_neon.sh
rename to platforms/android/scripts/cmake_android_neon.sh
index 5e85605b56..716809a0b3 100755
--- a/android/scripts/cmake_android_neon.sh
+++ b/platforms/android/scripts/cmake_android_neon.sh
@@ -4,5 +4,5 @@ cd `dirname $0`/..
 mkdir -p build_neon
 cd build_neon
 
-cmake -DANDROID_ABI="armeabi-v7a with NEON" -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../..
+cmake -DANDROID_ABI="armeabi-v7a with NEON" -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../../..
 
diff --git a/android/scripts/cmake_android_service.sh b/platforms/android/scripts/cmake_android_service.sh
similarity index 95%
rename from android/scripts/cmake_android_service.sh
rename to platforms/android/scripts/cmake_android_service.sh
index 0dbd482520..c702e65dfd 100755
--- a/android/scripts/cmake_android_service.sh
+++ b/platforms/android/scripts/cmake_android_service.sh
@@ -4,4 +4,4 @@ cd `dirname $0`/..
 mkdir -p build_service
 cd build_service
 
-cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME="arm-linux-androideabi-4.4.3" -DANDROID_STL=stlport_static -DANDROID_STL_FORCE_FEATURES=OFF -DBUILD_ANDROID_SERVICE=ON -DANDROID_SOURCE_TREE=~/Projects/AndroidSource/ServiceStub/ $@ ../..
+cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME="arm-linux-androideabi-4.4.3" -DANDROID_STL=stlport_static -DANDROID_STL_FORCE_FEATURES=OFF -DBUILD_ANDROID_SERVICE=ON -DANDROID_SOURCE_TREE=~/Projects/AndroidSource/ServiceStub/ $@ ../../..
diff --git a/platforms/android/scripts/cmake_android_service_x86.sh b/platforms/android/scripts/cmake_android_service_x86.sh
new file mode 100755
index 0000000000..89b1f7eccb
--- /dev/null
+++ b/platforms/android/scripts/cmake_android_service_x86.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd `dirname $0`/..
+
+mkdir -p build_service_x86
+cd build_service_x86
+
+cmake -DANDROID_ABI=x86 -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME="x86-4.4.3" -DANDROID_STL=stlport_static -DANDROID_STL_FORCE_FEATURES=OFF -DBUILD_ANDROID_SERVICE=ON -DANDROID_SOURCE_TREE=~/Projects/AndroidSource/ServiceStub/ $@ ../../..
+
diff --git a/android/scripts/cmake_android_x86.sh b/platforms/android/scripts/cmake_android_x86.sh
similarity index 85%
rename from android/scripts/cmake_android_x86.sh
rename to platforms/android/scripts/cmake_android_x86.sh
index a01df2e668..539060083d 100755
--- a/android/scripts/cmake_android_x86.sh
+++ b/platforms/android/scripts/cmake_android_x86.sh
@@ -5,5 +5,5 @@ cd `dirname $0`/..
 mkdir -p build_x86
 cd build_x86
 
-cmake -DANDROID_ABI=x86 -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../..
+cmake -DANDROID_ABI=x86 -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake $@ ../../..
 
diff --git a/android/scripts/wincfg.cmd.tmpl b/platforms/android/scripts/wincfg.cmd.tmpl
similarity index 100%
rename from android/scripts/wincfg.cmd.tmpl
rename to platforms/android/scripts/wincfg.cmd.tmpl
diff --git a/android/service/CMakeLists.txt b/platforms/android/service/CMakeLists.txt
similarity index 100%
rename from android/service/CMakeLists.txt
rename to platforms/android/service/CMakeLists.txt
diff --git a/android/service/all.py b/platforms/android/service/all.py
similarity index 100%
rename from android/service/all.py
rename to platforms/android/service/all.py
diff --git a/android/service/device.conf b/platforms/android/service/device.conf
similarity index 100%
rename from android/service/device.conf
rename to platforms/android/service/device.conf
diff --git a/android/service/doc/AndroidAppUsageModel.dia b/platforms/android/service/doc/AndroidAppUsageModel.dia
similarity index 100%
rename from android/service/doc/AndroidAppUsageModel.dia
rename to platforms/android/service/doc/AndroidAppUsageModel.dia
diff --git a/android/service/doc/BaseLoaderCallback.rst b/platforms/android/service/doc/BaseLoaderCallback.rst
similarity index 100%
rename from android/service/doc/BaseLoaderCallback.rst
rename to platforms/android/service/doc/BaseLoaderCallback.rst
diff --git a/android/service/doc/InstallCallbackInterface.rst b/platforms/android/service/doc/InstallCallbackInterface.rst
similarity index 100%
rename from android/service/doc/InstallCallbackInterface.rst
rename to platforms/android/service/doc/InstallCallbackInterface.rst
diff --git a/android/service/doc/Intro.rst b/platforms/android/service/doc/Intro.rst
similarity index 100%
rename from android/service/doc/Intro.rst
rename to platforms/android/service/doc/Intro.rst
diff --git a/android/service/doc/JavaHelper.rst b/platforms/android/service/doc/JavaHelper.rst
similarity index 100%
rename from android/service/doc/JavaHelper.rst
rename to platforms/android/service/doc/JavaHelper.rst
diff --git a/android/service/doc/LibInstallAproved.dia b/platforms/android/service/doc/LibInstallAproved.dia
similarity index 100%
rename from android/service/doc/LibInstallAproved.dia
rename to platforms/android/service/doc/LibInstallAproved.dia
diff --git a/android/service/doc/LibInstallCanceled.dia b/platforms/android/service/doc/LibInstallCanceled.dia
similarity index 100%
rename from android/service/doc/LibInstallCanceled.dia
rename to platforms/android/service/doc/LibInstallCanceled.dia
diff --git a/android/service/doc/LibInstalled.dia b/platforms/android/service/doc/LibInstalled.dia
similarity index 100%
rename from android/service/doc/LibInstalled.dia
rename to platforms/android/service/doc/LibInstalled.dia
diff --git a/android/service/doc/LoaderCallbackInterface.rst b/platforms/android/service/doc/LoaderCallbackInterface.rst
similarity index 100%
rename from android/service/doc/LoaderCallbackInterface.rst
rename to platforms/android/service/doc/LoaderCallbackInterface.rst
diff --git a/android/service/doc/Makefile b/platforms/android/service/doc/Makefile
similarity index 100%
rename from android/service/doc/Makefile
rename to platforms/android/service/doc/Makefile
diff --git a/android/service/doc/NoService.dia b/platforms/android/service/doc/NoService.dia
similarity index 100%
rename from android/service/doc/NoService.dia
rename to platforms/android/service/doc/NoService.dia
diff --git a/android/service/doc/Structure.dia b/platforms/android/service/doc/Structure.dia
similarity index 100%
rename from android/service/doc/Structure.dia
rename to platforms/android/service/doc/Structure.dia
diff --git a/android/service/doc/UseCases.rst b/platforms/android/service/doc/UseCases.rst
similarity index 100%
rename from android/service/doc/UseCases.rst
rename to platforms/android/service/doc/UseCases.rst
diff --git a/android/service/doc/build_uml.py b/platforms/android/service/doc/build_uml.py
similarity index 100%
rename from android/service/doc/build_uml.py
rename to platforms/android/service/doc/build_uml.py
diff --git a/android/service/doc/img/AndroidAppUsageModel.png b/platforms/android/service/doc/img/AndroidAppUsageModel.png
similarity index 100%
rename from android/service/doc/img/AndroidAppUsageModel.png
rename to platforms/android/service/doc/img/AndroidAppUsageModel.png
diff --git a/android/service/doc/img/LibInstallAproved.png b/platforms/android/service/doc/img/LibInstallAproved.png
similarity index 100%
rename from android/service/doc/img/LibInstallAproved.png
rename to platforms/android/service/doc/img/LibInstallAproved.png
diff --git a/android/service/doc/img/LibInstallCanceled.png b/platforms/android/service/doc/img/LibInstallCanceled.png
similarity index 100%
rename from android/service/doc/img/LibInstallCanceled.png
rename to platforms/android/service/doc/img/LibInstallCanceled.png
diff --git a/android/service/doc/img/LibInstalled.png b/platforms/android/service/doc/img/LibInstalled.png
similarity index 100%
rename from android/service/doc/img/LibInstalled.png
rename to platforms/android/service/doc/img/LibInstalled.png
diff --git a/android/service/doc/img/NoService.png b/platforms/android/service/doc/img/NoService.png
similarity index 100%
rename from android/service/doc/img/NoService.png
rename to platforms/android/service/doc/img/NoService.png
diff --git a/android/service/doc/img/Structure.png b/platforms/android/service/doc/img/Structure.png
similarity index 100%
rename from android/service/doc/img/Structure.png
rename to platforms/android/service/doc/img/Structure.png
diff --git a/android/service/doc/index.rst b/platforms/android/service/doc/index.rst
similarity index 100%
rename from android/service/doc/index.rst
rename to platforms/android/service/doc/index.rst
diff --git a/android/service/engine/.classpath b/platforms/android/service/engine/.classpath
similarity index 100%
rename from android/service/engine/.classpath
rename to platforms/android/service/engine/.classpath
diff --git a/android/service/engine/.project b/platforms/android/service/engine/.project
similarity index 100%
rename from android/service/engine/.project
rename to platforms/android/service/engine/.project
diff --git a/android/service/engine/AndroidManifest.xml b/platforms/android/service/engine/AndroidManifest.xml
similarity index 100%
rename from android/service/engine/AndroidManifest.xml
rename to platforms/android/service/engine/AndroidManifest.xml
diff --git a/android/service/engine/CMakeLists.txt b/platforms/android/service/engine/CMakeLists.txt
similarity index 97%
rename from android/service/engine/CMakeLists.txt
rename to platforms/android/service/engine/CMakeLists.txt
index 8b88393942..793c433480 100644
--- a/android/service/engine/CMakeLists.txt
+++ b/platforms/android/service/engine/CMakeLists.txt
@@ -24,7 +24,7 @@ else()
   message(WARNING "Can not automatically determine the value for ANDROID_PLATFORM_VERSION_CODE")
 endif()
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/android/service/engine/.build/${ANDROID_MANIFEST_FILE}"  @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/platforms/android/service/engine/.build/${ANDROID_MANIFEST_FILE}"  @ONLY)
 
 link_directories("${ANDROID_SOURCE_TREE}/out/target/product/generic/system/lib" "${ANDROID_SOURCE_TREE}/out/target/product/${ANDROID_PRODUCT}/system/lib" "${ANDROID_SOURCE_TREE}/bin/${ANDROID_ARCH_NAME}")
 
diff --git a/android/service/engine/build.xml b/platforms/android/service/engine/build.xml
similarity index 100%
rename from android/service/engine/build.xml
rename to platforms/android/service/engine/build.xml
diff --git a/android/service/engine/jni/Android.mk b/platforms/android/service/engine/jni/Android.mk
similarity index 100%
rename from android/service/engine/jni/Android.mk
rename to platforms/android/service/engine/jni/Android.mk
diff --git a/android/service/engine/jni/Application.mk b/platforms/android/service/engine/jni/Application.mk
similarity index 100%
rename from android/service/engine/jni/Application.mk
rename to platforms/android/service/engine/jni/Application.mk
diff --git a/android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp b/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp
similarity index 100%
rename from android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp
rename to platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp
diff --git a/android/service/engine/jni/BinderComponent/BnOpenCVEngine.h b/platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.h
similarity index 100%
rename from android/service/engine/jni/BinderComponent/BnOpenCVEngine.h
rename to platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.h
diff --git a/android/service/engine/jni/BinderComponent/BpOpenCVEngine.cpp b/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.cpp
similarity index 100%
rename from android/service/engine/jni/BinderComponent/BpOpenCVEngine.cpp
rename to platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.cpp
diff --git a/android/service/engine/jni/BinderComponent/BpOpenCVEngine.h b/platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.h
similarity index 100%
rename from android/service/engine/jni/BinderComponent/BpOpenCVEngine.h
rename to platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.h
diff --git a/android/service/engine/jni/BinderComponent/HardwareDetector.cpp b/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.cpp
similarity index 100%
rename from android/service/engine/jni/BinderComponent/HardwareDetector.cpp
rename to platforms/android/service/engine/jni/BinderComponent/HardwareDetector.cpp
diff --git a/android/service/engine/jni/BinderComponent/HardwareDetector.h b/platforms/android/service/engine/jni/BinderComponent/HardwareDetector.h
similarity index 100%
rename from android/service/engine/jni/BinderComponent/HardwareDetector.h
rename to platforms/android/service/engine/jni/BinderComponent/HardwareDetector.h
diff --git a/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp b/platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
similarity index 100%
rename from android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
rename to platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
diff --git a/android/service/engine/jni/BinderComponent/OpenCVEngine.h b/platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.h
similarity index 100%
rename from android/service/engine/jni/BinderComponent/OpenCVEngine.h
rename to platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.h
diff --git a/android/service/engine/jni/BinderComponent/ProcReader.cpp b/platforms/android/service/engine/jni/BinderComponent/ProcReader.cpp
similarity index 100%
rename from android/service/engine/jni/BinderComponent/ProcReader.cpp
rename to platforms/android/service/engine/jni/BinderComponent/ProcReader.cpp
diff --git a/android/service/engine/jni/BinderComponent/ProcReader.h b/platforms/android/service/engine/jni/BinderComponent/ProcReader.h
similarity index 100%
rename from android/service/engine/jni/BinderComponent/ProcReader.h
rename to platforms/android/service/engine/jni/BinderComponent/ProcReader.h
diff --git a/android/service/engine/jni/BinderComponent/StringUtils.cpp b/platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp
similarity index 100%
rename from android/service/engine/jni/BinderComponent/StringUtils.cpp
rename to platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp
diff --git a/android/service/engine/jni/BinderComponent/StringUtils.h b/platforms/android/service/engine/jni/BinderComponent/StringUtils.h
similarity index 100%
rename from android/service/engine/jni/BinderComponent/StringUtils.h
rename to platforms/android/service/engine/jni/BinderComponent/StringUtils.h
diff --git a/android/service/engine/jni/BinderComponent/TegraDetector.cpp b/platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp
similarity index 100%
rename from android/service/engine/jni/BinderComponent/TegraDetector.cpp
rename to platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp
diff --git a/android/service/engine/jni/BinderComponent/TegraDetector.h b/platforms/android/service/engine/jni/BinderComponent/TegraDetector.h
similarity index 100%
rename from android/service/engine/jni/BinderComponent/TegraDetector.h
rename to platforms/android/service/engine/jni/BinderComponent/TegraDetector.h
diff --git a/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp b/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp
similarity index 100%
rename from android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp
rename to platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp
diff --git a/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.h b/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.h
similarity index 100%
rename from android/service/engine/jni/JNIWrapper/HardwareDetector_jni.h
rename to platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.h
diff --git a/android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.cpp b/platforms/android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.cpp
similarity index 100%
rename from android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.cpp
rename to platforms/android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.cpp
diff --git a/android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.h b/platforms/android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.h
similarity index 100%
rename from android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.h
rename to platforms/android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.h
diff --git a/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp b/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp
similarity index 100%
rename from android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp
rename to platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp
diff --git a/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.h b/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.h
similarity index 100%
rename from android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.h
rename to platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.h
diff --git a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp b/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
similarity index 100%
rename from android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
rename to platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
diff --git a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h b/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
similarity index 100%
rename from android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
rename to platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
diff --git a/android/service/engine/jni/NativeClient/ClientMain.cpp b/platforms/android/service/engine/jni/NativeClient/ClientMain.cpp
similarity index 100%
rename from android/service/engine/jni/NativeClient/ClientMain.cpp
rename to platforms/android/service/engine/jni/NativeClient/ClientMain.cpp
diff --git a/android/service/engine/jni/NativeService/CommonPackageManager.cpp b/platforms/android/service/engine/jni/NativeService/CommonPackageManager.cpp
similarity index 100%
rename from android/service/engine/jni/NativeService/CommonPackageManager.cpp
rename to platforms/android/service/engine/jni/NativeService/CommonPackageManager.cpp
diff --git a/android/service/engine/jni/NativeService/CommonPackageManager.h b/platforms/android/service/engine/jni/NativeService/CommonPackageManager.h
similarity index 100%
rename from android/service/engine/jni/NativeService/CommonPackageManager.h
rename to platforms/android/service/engine/jni/NativeService/CommonPackageManager.h
diff --git a/android/service/engine/jni/NativeService/NativePackageManager.cpp b/platforms/android/service/engine/jni/NativeService/NativePackageManager.cpp
similarity index 100%
rename from android/service/engine/jni/NativeService/NativePackageManager.cpp
rename to platforms/android/service/engine/jni/NativeService/NativePackageManager.cpp
diff --git a/android/service/engine/jni/NativeService/NativePackageManager.h b/platforms/android/service/engine/jni/NativeService/NativePackageManager.h
similarity index 100%
rename from android/service/engine/jni/NativeService/NativePackageManager.h
rename to platforms/android/service/engine/jni/NativeService/NativePackageManager.h
diff --git a/android/service/engine/jni/NativeService/PackageInfo.cpp b/platforms/android/service/engine/jni/NativeService/PackageInfo.cpp
similarity index 100%
rename from android/service/engine/jni/NativeService/PackageInfo.cpp
rename to platforms/android/service/engine/jni/NativeService/PackageInfo.cpp
diff --git a/android/service/engine/jni/NativeService/PackageInfo.h b/platforms/android/service/engine/jni/NativeService/PackageInfo.h
similarity index 100%
rename from android/service/engine/jni/NativeService/PackageInfo.h
rename to platforms/android/service/engine/jni/NativeService/PackageInfo.h
diff --git a/android/service/engine/jni/NativeService/ServiceMain.cpp b/platforms/android/service/engine/jni/NativeService/ServiceMain.cpp
similarity index 100%
rename from android/service/engine/jni/NativeService/ServiceMain.cpp
rename to platforms/android/service/engine/jni/NativeService/ServiceMain.cpp
diff --git a/android/service/engine/jni/Tests/HardwareDetectionTest.cpp b/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp
similarity index 100%
rename from android/service/engine/jni/Tests/HardwareDetectionTest.cpp
rename to platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp
diff --git a/android/service/engine/jni/Tests/OpenCVEngineTest.cpp b/platforms/android/service/engine/jni/Tests/OpenCVEngineTest.cpp
similarity index 100%
rename from android/service/engine/jni/Tests/OpenCVEngineTest.cpp
rename to platforms/android/service/engine/jni/Tests/OpenCVEngineTest.cpp
diff --git a/android/service/engine/jni/Tests/PackageInfoTest.cpp b/platforms/android/service/engine/jni/Tests/PackageInfoTest.cpp
similarity index 100%
rename from android/service/engine/jni/Tests/PackageInfoTest.cpp
rename to platforms/android/service/engine/jni/Tests/PackageInfoTest.cpp
diff --git a/android/service/engine/jni/Tests/PackageManagerStub.cpp b/platforms/android/service/engine/jni/Tests/PackageManagerStub.cpp
similarity index 100%
rename from android/service/engine/jni/Tests/PackageManagerStub.cpp
rename to platforms/android/service/engine/jni/Tests/PackageManagerStub.cpp
diff --git a/android/service/engine/jni/Tests/PackageManagerStub.h b/platforms/android/service/engine/jni/Tests/PackageManagerStub.h
similarity index 100%
rename from android/service/engine/jni/Tests/PackageManagerStub.h
rename to platforms/android/service/engine/jni/Tests/PackageManagerStub.h
diff --git a/android/service/engine/jni/Tests/PackageManagmentTest.cpp b/platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp
similarity index 100%
rename from android/service/engine/jni/Tests/PackageManagmentTest.cpp
rename to platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp
diff --git a/android/service/engine/jni/Tests/TestMain.cpp b/platforms/android/service/engine/jni/Tests/TestMain.cpp
similarity index 100%
rename from android/service/engine/jni/Tests/TestMain.cpp
rename to platforms/android/service/engine/jni/Tests/TestMain.cpp
diff --git a/android/service/engine/jni/Tests/Tests.mk b/platforms/android/service/engine/jni/Tests/Tests.mk
similarity index 100%
rename from android/service/engine/jni/Tests/Tests.mk
rename to platforms/android/service/engine/jni/Tests/Tests.mk
diff --git a/android/service/engine/jni/Tests/gtest/gtest-all.cpp b/platforms/android/service/engine/jni/Tests/gtest/gtest-all.cpp
similarity index 100%
rename from android/service/engine/jni/Tests/gtest/gtest-all.cpp
rename to platforms/android/service/engine/jni/Tests/gtest/gtest-all.cpp
diff --git a/android/service/engine/jni/Tests/gtest/gtest.h b/platforms/android/service/engine/jni/Tests/gtest/gtest.h
similarity index 100%
rename from android/service/engine/jni/Tests/gtest/gtest.h
rename to platforms/android/service/engine/jni/Tests/gtest/gtest.h
diff --git a/android/service/engine/jni/include/EngineCommon.h b/platforms/android/service/engine/jni/include/EngineCommon.h
similarity index 100%
rename from android/service/engine/jni/include/EngineCommon.h
rename to platforms/android/service/engine/jni/include/EngineCommon.h
diff --git a/android/service/engine/jni/include/IOpenCVEngine.h b/platforms/android/service/engine/jni/include/IOpenCVEngine.h
similarity index 100%
rename from android/service/engine/jni/include/IOpenCVEngine.h
rename to platforms/android/service/engine/jni/include/IOpenCVEngine.h
diff --git a/android/service/engine/jni/include/IPackageManager.h b/platforms/android/service/engine/jni/include/IPackageManager.h
similarity index 100%
rename from android/service/engine/jni/include/IPackageManager.h
rename to platforms/android/service/engine/jni/include/IPackageManager.h
diff --git a/android/service/engine/jni/include/OpenCVEngineHelper.h b/platforms/android/service/engine/jni/include/OpenCVEngineHelper.h
similarity index 100%
rename from android/service/engine/jni/include/OpenCVEngineHelper.h
rename to platforms/android/service/engine/jni/include/OpenCVEngineHelper.h
diff --git a/android/service/engine/project.properties b/platforms/android/service/engine/project.properties
similarity index 100%
rename from android/service/engine/project.properties
rename to platforms/android/service/engine/project.properties
diff --git a/android/service/engine/res/drawable/icon.png b/platforms/android/service/engine/res/drawable/icon.png
similarity index 100%
rename from android/service/engine/res/drawable/icon.png
rename to platforms/android/service/engine/res/drawable/icon.png
diff --git a/android/service/engine/res/layout-small/info.xml b/platforms/android/service/engine/res/layout-small/info.xml
similarity index 100%
rename from android/service/engine/res/layout-small/info.xml
rename to platforms/android/service/engine/res/layout-small/info.xml
diff --git a/android/service/engine/res/layout-small/main.xml b/platforms/android/service/engine/res/layout-small/main.xml
similarity index 100%
rename from android/service/engine/res/layout-small/main.xml
rename to platforms/android/service/engine/res/layout-small/main.xml
diff --git a/android/service/engine/res/layout/info.xml b/platforms/android/service/engine/res/layout/info.xml
similarity index 100%
rename from android/service/engine/res/layout/info.xml
rename to platforms/android/service/engine/res/layout/info.xml
diff --git a/android/service/engine/res/layout/main.xml b/platforms/android/service/engine/res/layout/main.xml
similarity index 100%
rename from android/service/engine/res/layout/main.xml
rename to platforms/android/service/engine/res/layout/main.xml
diff --git a/android/service/engine/res/values/strings.xml b/platforms/android/service/engine/res/values/strings.xml
similarity index 100%
rename from android/service/engine/res/values/strings.xml
rename to platforms/android/service/engine/res/values/strings.xml
diff --git a/android/service/engine/src/org/opencv/engine/BinderConnector.java b/platforms/android/service/engine/src/org/opencv/engine/BinderConnector.java
similarity index 100%
rename from android/service/engine/src/org/opencv/engine/BinderConnector.java
rename to platforms/android/service/engine/src/org/opencv/engine/BinderConnector.java
diff --git a/android/service/engine/src/org/opencv/engine/HardwareDetector.java b/platforms/android/service/engine/src/org/opencv/engine/HardwareDetector.java
similarity index 100%
rename from android/service/engine/src/org/opencv/engine/HardwareDetector.java
rename to platforms/android/service/engine/src/org/opencv/engine/HardwareDetector.java
diff --git a/android/service/engine/src/org/opencv/engine/MarketConnector.java b/platforms/android/service/engine/src/org/opencv/engine/MarketConnector.java
similarity index 100%
rename from android/service/engine/src/org/opencv/engine/MarketConnector.java
rename to platforms/android/service/engine/src/org/opencv/engine/MarketConnector.java
diff --git a/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl b/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl
similarity index 100%
rename from android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl
rename to platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl
diff --git a/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java b/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java
similarity index 100%
rename from android/service/engine/src/org/opencv/engine/OpenCVEngineService.java
rename to platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java
diff --git a/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java b/platforms/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
similarity index 100%
rename from android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
rename to platforms/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
diff --git a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java b/platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
similarity index 100%
rename from android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
rename to platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
diff --git a/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java b/platforms/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java
similarity index 100%
rename from android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java
rename to platforms/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java
diff --git a/android/service/engine_test/.classpath b/platforms/android/service/engine_test/.classpath
similarity index 100%
rename from android/service/engine_test/.classpath
rename to platforms/android/service/engine_test/.classpath
diff --git a/android/service/engine_test/.project b/platforms/android/service/engine_test/.project
similarity index 100%
rename from android/service/engine_test/.project
rename to platforms/android/service/engine_test/.project
diff --git a/android/service/engine_test/AndroidManifest.xml b/platforms/android/service/engine_test/AndroidManifest.xml
similarity index 100%
rename from android/service/engine_test/AndroidManifest.xml
rename to platforms/android/service/engine_test/AndroidManifest.xml
diff --git a/android/service/engine_test/build.xml b/platforms/android/service/engine_test/build.xml
similarity index 100%
rename from android/service/engine_test/build.xml
rename to platforms/android/service/engine_test/build.xml
diff --git a/android/service/engine_test/project.properties b/platforms/android/service/engine_test/project.properties
similarity index 100%
rename from android/service/engine_test/project.properties
rename to platforms/android/service/engine_test/project.properties
diff --git a/android/service/engine_test/res/drawable-hdpi/ic_launcher.png b/platforms/android/service/engine_test/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from android/service/engine_test/res/drawable-hdpi/ic_launcher.png
rename to platforms/android/service/engine_test/res/drawable-hdpi/ic_launcher.png
diff --git a/android/service/engine_test/res/drawable-ldpi/ic_launcher.png b/platforms/android/service/engine_test/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from android/service/engine_test/res/drawable-ldpi/ic_launcher.png
rename to platforms/android/service/engine_test/res/drawable-ldpi/ic_launcher.png
diff --git a/android/service/engine_test/res/drawable-mdpi/ic_launcher.png b/platforms/android/service/engine_test/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from android/service/engine_test/res/drawable-mdpi/ic_launcher.png
rename to platforms/android/service/engine_test/res/drawable-mdpi/ic_launcher.png
diff --git a/android/service/engine_test/res/layout/main.xml b/platforms/android/service/engine_test/res/layout/main.xml
similarity index 100%
rename from android/service/engine_test/res/layout/main.xml
rename to platforms/android/service/engine_test/res/layout/main.xml
diff --git a/android/service/engine_test/res/values/strings.xml b/platforms/android/service/engine_test/res/values/strings.xml
similarity index 100%
rename from android/service/engine_test/res/values/strings.xml
rename to platforms/android/service/engine_test/res/values/strings.xml
diff --git a/android/service/engine_test/src/org/opencv/engine/test/EngineInterfaceTest.java b/platforms/android/service/engine_test/src/org/opencv/engine/test/EngineInterfaceTest.java
similarity index 100%
rename from android/service/engine_test/src/org/opencv/engine/test/EngineInterfaceTest.java
rename to platforms/android/service/engine_test/src/org/opencv/engine/test/EngineInterfaceTest.java
diff --git a/android/service/push_native.py b/platforms/android/service/push_native.py
similarity index 100%
rename from android/service/push_native.py
rename to platforms/android/service/push_native.py
diff --git a/android/service/readme.txt b/platforms/android/service/readme.txt
similarity index 100%
rename from android/service/readme.txt
rename to platforms/android/service/readme.txt
diff --git a/android/service/test_native.py b/platforms/android/service/test_native.py
similarity index 100%
rename from android/service/test_native.py
rename to platforms/android/service/test_native.py