Main module headers are moved 1 level up

e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>

modules/core/doc/basic_structures.rst

@@ -2425,7 +2425,7 @@ The class provides the following features for all derived classes:
 Here is example of SIFT use in your application via Algorithm interface: ::
 
     #include "opencv2/opencv.hpp"
-    #include "opencv2/nonfree/nonfree.hpp"
+    #include "opencv2/nonfree.hpp"
 
     ...
 

modules/core/doc/intro.rst

@@ -30,14 +30,14 @@ All the OpenCV classes and functions are placed into the ``cv`` namespace. There
 
 .. code-block:: c
 
-    #include "opencv2/core/core.hpp"
+    #include "opencv2/core.hpp"
     ...
     cv::Mat H = cv::findHomography(points1, points2, CV_RANSAC, 5);
     ...
 
 or ::
 
-    #include "opencv2/core/core.hpp"
+    #include "opencv2/core.hpp"
     using namespace cv;
     ...
     Mat H = findHomography(points1, points2, CV_RANSAC, 5 );

modules/core/include/opencv2/core.hpp

@@ -3143,8 +3143,8 @@ public:
     void deallocate();
     //! resizes the buffer and preserves the content
     void resize(size_t _size);
-	//! returns the current buffer size
-	size_t size() const;
+    //! returns the current buffer size
+    size_t size() const;
     //! returns pointer to the real buffer, stack-allocated or head-allocated
     operator _Tp* ();
     //! returns read-only pointer to the real buffer, stack-allocated or head-allocated

modules/core/include/opencv2/core/eigen.hpp

@@ -46,7 +46,7 @@
 #ifdef __cplusplus
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 
 #if defined _MSC_VER && _MSC_VER >= 1200
 #pragma warning( disable: 4714 ) //__forceinline is not inlined

modules/core/include/opencv2/core/gpumat.hpp

@@ -45,7 +45,7 @@
 
 #ifdef __cplusplus
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/cuda_devptrs.hpp"
 
 namespace cv { namespace gpu

modules/core/include/opencv2/core/opengl.hpp

@@ -45,7 +45,7 @@
 
 #ifdef __cplusplus
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 
 namespace cv { namespace ogl {
 

modules/core/perf/perf_precomp.hpp

@@ -9,7 +9,7 @@
 #ifndef __OPENCV_PERF_PRECOMP_HPP__
 #define __OPENCV_PERF_PRECOMP_HPP__
 
-#include "opencv2/ts/ts.hpp"
+#include "opencv2/ts.hpp"
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY
 #error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined

modules/core/src/gl_core_3_1.cpp

@@ -1,7 +1,7 @@
 #include <string>
 #include <sstream>
 #include "cvconfig.h"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "gl_core_3_1.hpp"
 
 #ifdef HAVE_OPENGL

modules/core/src/matrix.cpp

@@ -42,7 +42,7 @@
 
 #include "precomp.hpp"
 #include "opencv2/core/gpumat.hpp"
-#include "opencv2/core/opengl_interop.hpp"
+#include "opencv2/core/opengl.hpp"
 
 /****************************************************************************************\
 *                           [scaled] Identity matrix initialization                      *

modules/core/src/opengl_interop.cpp

@@ -41,7 +41,7 @@
 //M*/
 
 #include "precomp.hpp"
-#include "opencv2/core/opengl_interop.hpp"
+#include "opencv2/core/opengl.hpp"
 #include "opencv2/core/gpumat.hpp"
 
 #ifdef HAVE_OPENGL

modules/core/src/precomp.hpp

@@ -47,7 +47,7 @@
 #include "cvconfig.h"
 #endif
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/internal.hpp"
 

modules/core/test/test_precomp.hpp

@@ -9,7 +9,7 @@
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include "opencv2/ts/ts.hpp"
+#include "opencv2/ts.hpp"
 #include "opencv2/core/core_c.h"
 #include <iostream>