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/contrib/src/ba.cpp

@@ -40,7 +40,7 @@
 //M*/
 
 #include "precomp.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
 #include <iostream>
 
 using namespace cv;

modules/contrib/src/chamfermatching.cpp

@@ -46,7 +46,7 @@
 #include "precomp.hpp"
 #include "opencv2/opencv_modules.hpp"
 #ifdef HAVE_OPENCV_HIGHGUI
-#  include "opencv2/highgui/highgui.hpp"
+#  include "opencv2/highgui.hpp"
 #endif
 #include <iostream>
 #include <queue>

modules/contrib/src/featuretracker.cpp

@@ -42,7 +42,7 @@
 #include "precomp.hpp"
 #include <stdio.h>
 #include <iostream>
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
 #include "opencv2/contrib/hybridtracker.hpp"
 
 using namespace cv;

modules/contrib/src/gencolors.cpp

@@ -39,7 +39,6 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "opencv2/core/core.hpp"
 #include "precomp.hpp"
 
 #include <iostream>

modules/contrib/src/inputoutput.cpp

@@ -1,5 +1,5 @@
 
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
 
 #ifdef WIN32
     #include <windows.h>

modules/contrib/src/precomp.hpp

@@ -47,10 +47,10 @@
 #include "cvconfig.h"
 #endif
 
-#include "opencv2/contrib/contrib.hpp"
-#include "opencv2/features2d/features2d.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/contrib.hpp"
+#include "opencv2/features2d.hpp"
+#include "opencv2/objdetect.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"
 

modules/contrib/src/rgbdodometry.cpp

@@ -44,11 +44,11 @@
 
 #define SHOW_DEBUG_IMAGES 0
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/calib3d.hpp"
 
 #if SHOW_DEBUG_IMAGES
-#  include "opencv2/highgui/highgui.hpp"
+#  include "opencv2/highgui.hpp"
 #endif
 
 #include <iostream>