diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
index 2bcc397bfe..aa2d7883a8 100644
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -7,7 +7,7 @@ endif()
 
 set(the_description "The java bindings")
 ocv_add_module(java BINDINGS opencv_core opencv_imgproc OPTIONAL opencv_objdetect opencv_features2d opencv_video opencv_highgui opencv_ml opencv_calib3d opencv_photo opencv_nonfree)
-ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/cpp")
+ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp")
 
 # get list of modules to wrap
 string(REPLACE "opencv_" "" OPENCV_JAVA_MODULES "${OPENCV_MODULE_${the_module}_REQ_DEPS};${OPENCV_MODULE_${the_module}_OPT_DEPS}")
@@ -17,10 +17,10 @@ foreach(module ${OPENCV_JAVA_MODULES})
   endif()
 endforeach()
 
-set(GEN_JAVA "${CMAKE_CURRENT_SOURCE_DIR}/gen_java.py")
+set(GEN_JAVA "${CMAKE_CURRENT_SOURCE_DIR}/generator/gen_java.py")
 set(HDR_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/../python/src2/hdr_parser.py")
-set(GEN_JAVADOC "${CMAKE_CURRENT_SOURCE_DIR}/gen_javadoc.py")
-set(RST_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/rst_parser.py")
+set(GEN_JAVADOC "${CMAKE_CURRENT_SOURCE_DIR}/generator/gen_javadoc.py")
+set(RST_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/generator/rst_parser.py")
 
 # add dependencies to cmake (we should rerun cmake if any of these scripts is modified)
 configure_file("${GEN_JAVA}" "${OpenCV_BINARY_DIR}/junk/gen_java.junk" COPYONLY)
@@ -33,8 +33,8 @@ set(generated_java_sources "")
 # setup raw java and cpp files generation (without javadoc and at temporary location)
 foreach(module ${OPENCV_JAVA_MODULES})
   # get list of module headers
-  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/config/${module}.filelist")
-    file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/config/${module}.filelist" module_headers)
+  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/generator/config/${module}.filelist")
+    file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/generator/config/${module}.filelist" module_headers)
     ocv_list_add_prefix(module_headers "${OPENCV_MODULE_opencv_${module}_LOCATION}/")
   else()
     set(module_headers "${OPENCV_MODULE_opencv_${module}_HEADERS}")
@@ -78,9 +78,10 @@ foreach(module ${OPENCV_JAVA_MODULES})
 endforeach()
 
 # get handwritten files used for wrappers generation
-file(GLOB handwrittren_h_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.hpp")
-file(GLOB handwrittren_cpp_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.cpp")
-file(GLOB handwrittren_java_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/java/*.java")
+file(GLOB handwrittren_h_sources "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp/*.hpp")
+file(GLOB handwrittren_cpp_sources "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp/*.cpp")
+file(GLOB handwrittren_java_sources "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/java/*.java")
+file(GLOB handwrittren_aidl_sources  "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/java/*.aidl")
 
 # remove handwritten java files for disabled modules
 foreach(jfile ${handwrittren_java_sources})
@@ -92,7 +93,7 @@ endforeach()
 
 # remove VideoCapture wrapper if highgui is disabled
 if(NOT HAVE_opencv_highgui)
-  list(REMOVE_ITEM handwrittren_cpp_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/VideoCapture.cpp")
+  list(REMOVE_ITEM handwrittren_cpp_sources "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp/VideoCapture.cpp")
 endif()
 
 # create list of javadoc documented files
@@ -110,7 +111,7 @@ set(java_documented_headers_deps ${handwrittren_java_sources} ${generated_java_s
 #TODO: pass list of modules
 add_custom_command(
     OUTPUT ${documented_java_files}
-    COMMAND ${PYTHON_EXECUTABLE} "${GEN_JAVADOC}" "${CMAKE_CURRENT_SOURCE_DIR}/src/java" "${CMAKE_CURRENT_BINARY_DIR}" 2>"${CMAKE_CURRENT_BINARY_DIR}/get_javadoc_errors.log"
+    COMMAND ${PYTHON_EXECUTABLE} "${GEN_JAVADOC}" "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/java" "${CMAKE_CURRENT_BINARY_DIR}" 2>"${CMAKE_CURRENT_BINARY_DIR}/get_javadoc_errors.log"
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${java_documented_headers_deps}
 )
@@ -184,14 +185,14 @@ if(ANDROID)
   set(lib_proj_files "")
 
   # manifest, jni, Eclipse project
-  file(GLOB_RECURSE android_lib_project_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/android/" "${CMAKE_CURRENT_SOURCE_DIR}/android/*")
+  file(GLOB_RECURSE android_lib_project_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/" "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/*")
   list(REMOVE_ITEM android_lib_project_files "${ANDROID_MANIFEST_FILE}")
   foreach(f ${android_lib_project_files})
     if(NOT f MATCHES "\\.svn")
       add_custom_command(
                 OUTPUT "${OpenCV_BINARY_DIR}/${f}"
-                COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android/${f}" "${OpenCV_BINARY_DIR}/${f}"
-                MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/android/${f}"
+                COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${f}" "${OpenCV_BINARY_DIR}/${f}"
+                MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${f}"
                 COMMENT "Generating ${f}"
                 )
 
@@ -227,10 +228,10 @@ if(ANDROID)
     add_custom_command(
         OUTPUT ${lib_target_files} "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}"
         COMMAND ${CMAKE_COMMAND} -E remove ${lib_target_files}
-        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}"
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}"
         COMMAND ${ANDROID_EXECUTABLE} --silent create lib-project --path \"${OpenCV_BINARY_DIR}\" --target \"${lib_target_sdk_target}\" --name OpenCV --package org.opencv 2>\"${CMAKE_CURRENT_BINARY_DIR}/create_lib_project.log\"
-        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}"
-        MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/android/${ANDROID_MANIFEST_FILE}"
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}"
+        MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${ANDROID_MANIFEST_FILE}"
         DEPENDS ${lib_proj_files}
         COMMENT "Generating OpenCV Android library project. SDK target: ${lib_target_sdk_target}"
         )
diff --git a/modules/java/android/.classpath b/modules/java/android_lib/.classpath
similarity index 100%
rename from modules/java/android/.classpath
rename to modules/java/android_lib/.classpath
diff --git a/modules/java/android/.project b/modules/java/android_lib/.project
similarity index 100%
rename from modules/java/android/.project
rename to modules/java/android_lib/.project
diff --git a/modules/java/android_lib/.settings/org.eclipse.jdt.core.prefs b/modules/java/android_lib/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..d995784334
--- /dev/null
+++ b/modules/java/android_lib/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Wed Jun 29 04:36:40 MSD 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/modules/java/android/AndroidManifest.xml b/modules/java/android_lib/AndroidManifest.xml
similarity index 100%
rename from modules/java/android/AndroidManifest.xml
rename to modules/java/android_lib/AndroidManifest.xml
diff --git a/modules/java/android/jni/Android.mk b/modules/java/android_lib/jni/Android.mk
similarity index 100%
rename from modules/java/android/jni/Android.mk
rename to modules/java/android_lib/jni/Android.mk
diff --git a/modules/java/android/jni/Application.mk b/modules/java/android_lib/jni/Application.mk
similarity index 100%
rename from modules/java/android/jni/Application.mk
rename to modules/java/android_lib/jni/Application.mk
diff --git a/modules/java/config/core.filelist b/modules/java/config/core.filelist
deleted file mode 100644
index 8072361184..0000000000
--- a/modules/java/config/core.filelist
+++ /dev/null
@@ -1,2 +0,0 @@
-include/opencv2/core/core.hpp
-../java/src/cpp/core_manual.hpp
diff --git a/modules/java/config/features2d.filelist b/modules/java/config/features2d.filelist
deleted file mode 100644
index 6b8da3a616..0000000000
--- a/modules/java/config/features2d.filelist
+++ /dev/null
@@ -1 +0,0 @@
-../java/src/cpp/features2d_manual.hpp
diff --git a/modules/java/generator/config/core.filelist b/modules/java/generator/config/core.filelist
new file mode 100644
index 0000000000..1bdc030877
--- /dev/null
+++ b/modules/java/generator/config/core.filelist
@@ -0,0 +1,2 @@
+include/opencv2/core/core.hpp
+../java/generator/src/cpp/core_manual.hpp
diff --git a/modules/java/generator/config/features2d.filelist b/modules/java/generator/config/features2d.filelist
new file mode 100644
index 0000000000..b1c84efc7d
--- /dev/null
+++ b/modules/java/generator/config/features2d.filelist
@@ -0,0 +1 @@
+../java/generator/src/cpp/features2d_manual.hpp
diff --git a/modules/java/config/nonfree.filelist b/modules/java/generator/config/nonfree.filelist
similarity index 100%
rename from modules/java/config/nonfree.filelist
rename to modules/java/generator/config/nonfree.filelist
diff --git a/modules/java/gen_java.py b/modules/java/generator/gen_java.py
similarity index 100%
rename from modules/java/gen_java.py
rename to modules/java/generator/gen_java.py
diff --git a/modules/java/gen_javadoc.py b/modules/java/generator/gen_javadoc.py
similarity index 99%
rename from modules/java/gen_javadoc.py
rename to modules/java/generator/gen_javadoc.py
index 92dd0e2c69..887f4798d8 100644
--- a/modules/java/gen_javadoc.py
+++ b/modules/java/generator/gen_javadoc.py
@@ -238,7 +238,7 @@ if __name__ == "__main__":
         exit(0)
    
     selfpath = os.path.dirname(os.path.abspath(sys.argv[0]))
-    hdr_parser_path = os.path.join(selfpath, "../python/src2")
+    hdr_parser_path = os.path.join(selfpath, "../../python/src2")
     
     sys.path.append(selfpath)
     sys.path.append(hdr_parser_path)
diff --git a/modules/java/rst_parser.py b/modules/java/generator/rst_parser.py
similarity index 100%
rename from modules/java/rst_parser.py
rename to modules/java/generator/rst_parser.py
diff --git a/modules/java/src/cpp/Mat.cpp b/modules/java/generator/src/cpp/Mat.cpp
similarity index 100%
rename from modules/java/src/cpp/Mat.cpp
rename to modules/java/generator/src/cpp/Mat.cpp
diff --git a/modules/java/src/cpp/VideoCapture.cpp b/modules/java/generator/src/cpp/VideoCapture.cpp
similarity index 100%
rename from modules/java/src/cpp/VideoCapture.cpp
rename to modules/java/generator/src/cpp/VideoCapture.cpp
diff --git a/modules/java/src/cpp/converters.cpp b/modules/java/generator/src/cpp/converters.cpp
similarity index 100%
rename from modules/java/src/cpp/converters.cpp
rename to modules/java/generator/src/cpp/converters.cpp
diff --git a/modules/java/src/cpp/converters.h b/modules/java/generator/src/cpp/converters.h
similarity index 100%
rename from modules/java/src/cpp/converters.h
rename to modules/java/generator/src/cpp/converters.h
diff --git a/modules/java/src/cpp/core_manual.hpp b/modules/java/generator/src/cpp/core_manual.hpp
similarity index 100%
rename from modules/java/src/cpp/core_manual.hpp
rename to modules/java/generator/src/cpp/core_manual.hpp
diff --git a/modules/java/src/cpp/features2d_manual.hpp b/modules/java/generator/src/cpp/features2d_manual.hpp
similarity index 100%
rename from modules/java/src/cpp/features2d_manual.hpp
rename to modules/java/generator/src/cpp/features2d_manual.hpp
diff --git a/modules/java/src/cpp/jni_part.cpp b/modules/java/generator/src/cpp/jni_part.cpp
similarity index 100%
rename from modules/java/src/cpp/jni_part.cpp
rename to modules/java/generator/src/cpp/jni_part.cpp
diff --git a/modules/java/src/cpp/utils.cpp b/modules/java/generator/src/cpp/utils.cpp
similarity index 100%
rename from modules/java/src/cpp/utils.cpp
rename to modules/java/generator/src/cpp/utils.cpp
diff --git a/modules/java/src/java/android+Utils.java b/modules/java/generator/src/java/android+Utils.java
similarity index 100%
rename from modules/java/src/java/android+Utils.java
rename to modules/java/generator/src/java/android+Utils.java
diff --git a/modules/java/src/java/core+CvException.java b/modules/java/generator/src/java/core+CvException.java
similarity index 100%
rename from modules/java/src/java/core+CvException.java
rename to modules/java/generator/src/java/core+CvException.java
diff --git a/modules/java/src/java/core+CvType.java b/modules/java/generator/src/java/core+CvType.java
similarity index 100%
rename from modules/java/src/java/core+CvType.java
rename to modules/java/generator/src/java/core+CvType.java
diff --git a/modules/java/src/java/core+Mat.java b/modules/java/generator/src/java/core+Mat.java
similarity index 100%
rename from modules/java/src/java/core+Mat.java
rename to modules/java/generator/src/java/core+Mat.java
diff --git a/modules/java/src/java/core+MatOfByte.java b/modules/java/generator/src/java/core+MatOfByte.java
similarity index 100%
rename from modules/java/src/java/core+MatOfByte.java
rename to modules/java/generator/src/java/core+MatOfByte.java
diff --git a/modules/java/src/java/core+MatOfDMatch.java b/modules/java/generator/src/java/core+MatOfDMatch.java
similarity index 100%
rename from modules/java/src/java/core+MatOfDMatch.java
rename to modules/java/generator/src/java/core+MatOfDMatch.java
diff --git a/modules/java/src/java/core+MatOfDouble.java b/modules/java/generator/src/java/core+MatOfDouble.java
similarity index 100%
rename from modules/java/src/java/core+MatOfDouble.java
rename to modules/java/generator/src/java/core+MatOfDouble.java
diff --git a/modules/java/src/java/core+MatOfFloat.java b/modules/java/generator/src/java/core+MatOfFloat.java
similarity index 100%
rename from modules/java/src/java/core+MatOfFloat.java
rename to modules/java/generator/src/java/core+MatOfFloat.java
diff --git a/modules/java/src/java/core+MatOfFloat4.java b/modules/java/generator/src/java/core+MatOfFloat4.java
similarity index 100%
rename from modules/java/src/java/core+MatOfFloat4.java
rename to modules/java/generator/src/java/core+MatOfFloat4.java
diff --git a/modules/java/src/java/core+MatOfFloat6.java b/modules/java/generator/src/java/core+MatOfFloat6.java
similarity index 100%
rename from modules/java/src/java/core+MatOfFloat6.java
rename to modules/java/generator/src/java/core+MatOfFloat6.java
diff --git a/modules/java/src/java/core+MatOfInt.java b/modules/java/generator/src/java/core+MatOfInt.java
similarity index 100%
rename from modules/java/src/java/core+MatOfInt.java
rename to modules/java/generator/src/java/core+MatOfInt.java
diff --git a/modules/java/src/java/core+MatOfInt4.java b/modules/java/generator/src/java/core+MatOfInt4.java
similarity index 100%
rename from modules/java/src/java/core+MatOfInt4.java
rename to modules/java/generator/src/java/core+MatOfInt4.java
diff --git a/modules/java/src/java/core+MatOfKeyPoint.java b/modules/java/generator/src/java/core+MatOfKeyPoint.java
similarity index 100%
rename from modules/java/src/java/core+MatOfKeyPoint.java
rename to modules/java/generator/src/java/core+MatOfKeyPoint.java
diff --git a/modules/java/src/java/core+MatOfPoint.java b/modules/java/generator/src/java/core+MatOfPoint.java
similarity index 100%
rename from modules/java/src/java/core+MatOfPoint.java
rename to modules/java/generator/src/java/core+MatOfPoint.java
diff --git a/modules/java/src/java/core+MatOfPoint2f.java b/modules/java/generator/src/java/core+MatOfPoint2f.java
similarity index 100%
rename from modules/java/src/java/core+MatOfPoint2f.java
rename to modules/java/generator/src/java/core+MatOfPoint2f.java
diff --git a/modules/java/src/java/core+MatOfPoint3.java b/modules/java/generator/src/java/core+MatOfPoint3.java
similarity index 100%
rename from modules/java/src/java/core+MatOfPoint3.java
rename to modules/java/generator/src/java/core+MatOfPoint3.java
diff --git a/modules/java/src/java/core+MatOfPoint3f.java b/modules/java/generator/src/java/core+MatOfPoint3f.java
similarity index 100%
rename from modules/java/src/java/core+MatOfPoint3f.java
rename to modules/java/generator/src/java/core+MatOfPoint3f.java
diff --git a/modules/java/src/java/core+MatOfRect.java b/modules/java/generator/src/java/core+MatOfRect.java
similarity index 100%
rename from modules/java/src/java/core+MatOfRect.java
rename to modules/java/generator/src/java/core+MatOfRect.java
diff --git a/modules/java/src/java/core+Point.java b/modules/java/generator/src/java/core+Point.java
similarity index 100%
rename from modules/java/src/java/core+Point.java
rename to modules/java/generator/src/java/core+Point.java
diff --git a/modules/java/src/java/core+Point3.java b/modules/java/generator/src/java/core+Point3.java
similarity index 100%
rename from modules/java/src/java/core+Point3.java
rename to modules/java/generator/src/java/core+Point3.java
diff --git a/modules/java/src/java/core+Range.java b/modules/java/generator/src/java/core+Range.java
similarity index 100%
rename from modules/java/src/java/core+Range.java
rename to modules/java/generator/src/java/core+Range.java
diff --git a/modules/java/src/java/core+Rect.java b/modules/java/generator/src/java/core+Rect.java
similarity index 100%
rename from modules/java/src/java/core+Rect.java
rename to modules/java/generator/src/java/core+Rect.java
diff --git a/modules/java/src/java/core+RotatedRect.java b/modules/java/generator/src/java/core+RotatedRect.java
similarity index 100%
rename from modules/java/src/java/core+RotatedRect.java
rename to modules/java/generator/src/java/core+RotatedRect.java
diff --git a/modules/java/src/java/core+Scalar.java b/modules/java/generator/src/java/core+Scalar.java
similarity index 100%
rename from modules/java/src/java/core+Scalar.java
rename to modules/java/generator/src/java/core+Scalar.java
diff --git a/modules/java/src/java/core+Size.java b/modules/java/generator/src/java/core+Size.java
similarity index 100%
rename from modules/java/src/java/core+Size.java
rename to modules/java/generator/src/java/core+Size.java
diff --git a/modules/java/src/java/core+TermCriteria.java b/modules/java/generator/src/java/core+TermCriteria.java
similarity index 100%
rename from modules/java/src/java/core+TermCriteria.java
rename to modules/java/generator/src/java/core+TermCriteria.java
diff --git a/modules/java/src/java/features2d+DMatch.java b/modules/java/generator/src/java/features2d+DMatch.java
similarity index 100%
rename from modules/java/src/java/features2d+DMatch.java
rename to modules/java/generator/src/java/features2d+DMatch.java
diff --git a/modules/java/src/java/features2d+KeyPoint.java b/modules/java/generator/src/java/features2d+KeyPoint.java
similarity index 100%
rename from modules/java/src/java/features2d+KeyPoint.java
rename to modules/java/generator/src/java/features2d+KeyPoint.java
diff --git a/modules/java/src/java/highgui+VideoCapture.java b/modules/java/generator/src/java/highgui+VideoCapture.java
similarity index 100%
rename from modules/java/src/java/highgui+VideoCapture.java
rename to modules/java/generator/src/java/highgui+VideoCapture.java
diff --git a/modules/java/src/java/utils+Converters.java b/modules/java/generator/src/java/utils+Converters.java
similarity index 100%
rename from modules/java/src/java/utils+Converters.java
rename to modules/java/generator/src/java/utils+Converters.java