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>

samples/cpp/stitching.cpp

@@ -42,8 +42,8 @@
 
 #include <iostream>
 #include <fstream>
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/stitching/stitcher.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/stitching.hpp"
 
 using namespace std;
 using namespace cv;

samples/cpp/videostab.cpp

@@ -3,11 +3,11 @@
 #include <fstream>
 #include <sstream>
 #include <stdexcept>
-#include "opencv2/core/core.hpp"
-#include "opencv2/video/video.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/videostab/videostab.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/video.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/videostab.hpp"
 #include "opencv2/opencv_modules.hpp"
 
 #define arg(name) cmd.get<string>(name)

samples/gpu/alpha_comp.cpp

@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "opencv2/core/opengl_interop.hpp"
+#include "opencv2/core/opengl.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/gpu/gpu.hpp"
 

samples/gpu/opengl.cpp

@@ -24,7 +24,7 @@ int main()
 #endif
 
 #include "opencv2/core/core.hpp"
-#include "opencv2/core/opengl_interop.hpp"
+#include "opencv2/core/opengl.hpp"
 #include "opencv2/core/gpumat.hpp"
 #include "opencv2/highgui/highgui.hpp"
 

samples/gpu/video_reader.cpp

@@ -5,7 +5,7 @@
 #include <numeric>
 
 #include <opencv2/core/core.hpp>
-#include <opencv2/core/opengl_interop.hpp>
+#include <opencv2/core/opengl.hpp>
 #include <opencv2/gpu/gpu.hpp>
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/contrib/contrib.hpp>