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>

apps/sft/dataset.cpp

@@ -41,7 +41,7 @@
 //M*/
 
 #include <sft/dataset.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/highgui.hpp>
 
 #include <iostream>
 #include <queue>
@@ -74,4 +74,4 @@ int sft::ScaledDataset::available(SampleType type) const
     return (int)((type == POSITIVE)? pos.size():neg.size());
 }
 
-sft::ScaledDataset::~ScaledDataset(){}
+sft::ScaledDataset::~ScaledDataset(){}