diff --git a/.gitattributes b/.gitattributes
index 70056c817689ac61f86cfd2bbcd0d6b670db4d43..eb5196c6a7ada852843a481db63fa5dc05963cc0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 x64/Debug/opencv_world455d.dll filter=lfs diff=lfs merge=lfs -text
+x64/Debug/opencv_world455.dll filter=lfs diff=lfs merge=lfs -text
diff --git a/hooks/post-checkout b/hooks/post-checkout
new file mode 100644
index 0000000000000000000000000000000000000000..cab40f264952a8ff69e1b5f38fb18dd9f5f6f459
--- /dev/null
+++ b/hooks/post-checkout
@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-checkout.\n"; exit 2; }
+git lfs post-checkout "$@"
diff --git a/hooks/post-commit b/hooks/post-commit
new file mode 100644
index 0000000000000000000000000000000000000000..9443f4161aca8f1376f0530e5a5f93fa3de647f8
--- /dev/null
+++ b/hooks/post-commit
@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-commit.\n"; exit 2; }
+git lfs post-commit "$@"
diff --git a/hooks/post-merge b/hooks/post-merge
new file mode 100644
index 0000000000000000000000000000000000000000..828b70891eddd54826bdd7b81ddacbfd5f31bc34
--- /dev/null
+++ b/hooks/post-merge
@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-merge.\n"; exit 2; }
+git lfs post-merge "$@"
diff --git a/hooks/pre-push b/hooks/pre-push
new file mode 100644
index 0000000000000000000000000000000000000000..81a9cc6398ab4c0adcaa7f17e328371135add447
--- /dev/null
+++ b/hooks/pre-push
@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\n"; exit 2; }
+git lfs pre-push "$@"
diff --git a/lfs/objects/95/c9/95c909d2a741732cccdf64ca21b7fbcbc2ee6e2b4f5434912a61b50e12b96d74 b/lfs/objects/95/c9/95c909d2a741732cccdf64ca21b7fbcbc2ee6e2b4f5434912a61b50e12b96d74
new file mode 100644
index 0000000000000000000000000000000000000000..492909088bf5d739094aa04c70494616c11732a0
Binary files /dev/null and b/lfs/objects/95/c9/95c909d2a741732cccdf64ca21b7fbcbc2ee6e2b4f5434912a61b50e12b96d74 differ
diff --git a/libs/opencv/include/calib3d.hpp b/libs/opencv/include/opencv2/calib3d.hpp
similarity index 100%
rename from libs/opencv/include/calib3d.hpp
rename to libs/opencv/include/opencv2/calib3d.hpp
diff --git a/libs/opencv/include/calib3d/calib3d.hpp b/libs/opencv/include/opencv2/calib3d/calib3d.hpp
similarity index 100%
rename from libs/opencv/include/calib3d/calib3d.hpp
rename to libs/opencv/include/opencv2/calib3d/calib3d.hpp
diff --git a/libs/opencv/include/calib3d/calib3d_c.h b/libs/opencv/include/opencv2/calib3d/calib3d_c.h
similarity index 100%
rename from libs/opencv/include/calib3d/calib3d_c.h
rename to libs/opencv/include/opencv2/calib3d/calib3d_c.h
diff --git a/libs/opencv/include/core.hpp b/libs/opencv/include/opencv2/core.hpp
similarity index 100%
rename from libs/opencv/include/core.hpp
rename to libs/opencv/include/opencv2/core.hpp
diff --git a/libs/opencv/include/core/affine.hpp b/libs/opencv/include/opencv2/core/affine.hpp
similarity index 100%
rename from libs/opencv/include/core/affine.hpp
rename to libs/opencv/include/opencv2/core/affine.hpp
diff --git a/libs/opencv/include/core/async.hpp b/libs/opencv/include/opencv2/core/async.hpp
similarity index 100%
rename from libs/opencv/include/core/async.hpp
rename to libs/opencv/include/opencv2/core/async.hpp
diff --git a/libs/opencv/include/core/base.hpp b/libs/opencv/include/opencv2/core/base.hpp
similarity index 100%
rename from libs/opencv/include/core/base.hpp
rename to libs/opencv/include/opencv2/core/base.hpp
diff --git a/libs/opencv/include/core/bindings_utils.hpp b/libs/opencv/include/opencv2/core/bindings_utils.hpp
similarity index 100%
rename from libs/opencv/include/core/bindings_utils.hpp
rename to libs/opencv/include/opencv2/core/bindings_utils.hpp
diff --git a/libs/opencv/include/core/bufferpool.hpp b/libs/opencv/include/opencv2/core/bufferpool.hpp
similarity index 100%
rename from libs/opencv/include/core/bufferpool.hpp
rename to libs/opencv/include/opencv2/core/bufferpool.hpp
diff --git a/libs/opencv/include/core/check.hpp b/libs/opencv/include/opencv2/core/check.hpp
similarity index 100%
rename from libs/opencv/include/core/check.hpp
rename to libs/opencv/include/opencv2/core/check.hpp
diff --git a/libs/opencv/include/core/core.hpp b/libs/opencv/include/opencv2/core/core.hpp
similarity index 100%
rename from libs/opencv/include/core/core.hpp
rename to libs/opencv/include/opencv2/core/core.hpp
diff --git a/libs/opencv/include/core/core_c.h b/libs/opencv/include/opencv2/core/core_c.h
similarity index 100%
rename from libs/opencv/include/core/core_c.h
rename to libs/opencv/include/opencv2/core/core_c.h
diff --git a/libs/opencv/include/core/cuda.hpp b/libs/opencv/include/opencv2/core/cuda.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda.hpp
rename to libs/opencv/include/opencv2/core/cuda.hpp
diff --git a/libs/opencv/include/core/cuda.inl.hpp b/libs/opencv/include/opencv2/core/cuda.inl.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda.inl.hpp
rename to libs/opencv/include/opencv2/core/cuda.inl.hpp
diff --git a/libs/opencv/include/core/cuda/block.hpp b/libs/opencv/include/opencv2/core/cuda/block.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/block.hpp
rename to libs/opencv/include/opencv2/core/cuda/block.hpp
diff --git a/libs/opencv/include/core/cuda/border_interpolate.hpp b/libs/opencv/include/opencv2/core/cuda/border_interpolate.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/border_interpolate.hpp
rename to libs/opencv/include/opencv2/core/cuda/border_interpolate.hpp
diff --git a/libs/opencv/include/core/cuda/color.hpp b/libs/opencv/include/opencv2/core/cuda/color.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/color.hpp
rename to libs/opencv/include/opencv2/core/cuda/color.hpp
diff --git a/libs/opencv/include/core/cuda/common.hpp b/libs/opencv/include/opencv2/core/cuda/common.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/common.hpp
rename to libs/opencv/include/opencv2/core/cuda/common.hpp
diff --git a/libs/opencv/include/core/cuda/datamov_utils.hpp b/libs/opencv/include/opencv2/core/cuda/datamov_utils.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/datamov_utils.hpp
rename to libs/opencv/include/opencv2/core/cuda/datamov_utils.hpp
diff --git a/libs/opencv/include/core/cuda/detail/color_detail.hpp b/libs/opencv/include/opencv2/core/cuda/detail/color_detail.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/detail/color_detail.hpp
rename to libs/opencv/include/opencv2/core/cuda/detail/color_detail.hpp
diff --git a/libs/opencv/include/core/cuda/detail/reduce.hpp b/libs/opencv/include/opencv2/core/cuda/detail/reduce.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/detail/reduce.hpp
rename to libs/opencv/include/opencv2/core/cuda/detail/reduce.hpp
diff --git a/libs/opencv/include/core/cuda/detail/reduce_key_val.hpp b/libs/opencv/include/opencv2/core/cuda/detail/reduce_key_val.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/detail/reduce_key_val.hpp
rename to libs/opencv/include/opencv2/core/cuda/detail/reduce_key_val.hpp
diff --git a/libs/opencv/include/core/cuda/detail/transform_detail.hpp b/libs/opencv/include/opencv2/core/cuda/detail/transform_detail.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/detail/transform_detail.hpp
rename to libs/opencv/include/opencv2/core/cuda/detail/transform_detail.hpp
diff --git a/libs/opencv/include/core/cuda/detail/type_traits_detail.hpp b/libs/opencv/include/opencv2/core/cuda/detail/type_traits_detail.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/detail/type_traits_detail.hpp
rename to libs/opencv/include/opencv2/core/cuda/detail/type_traits_detail.hpp
diff --git a/libs/opencv/include/core/cuda/detail/vec_distance_detail.hpp b/libs/opencv/include/opencv2/core/cuda/detail/vec_distance_detail.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/detail/vec_distance_detail.hpp
rename to libs/opencv/include/opencv2/core/cuda/detail/vec_distance_detail.hpp
diff --git a/libs/opencv/include/core/cuda/dynamic_smem.hpp b/libs/opencv/include/opencv2/core/cuda/dynamic_smem.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/dynamic_smem.hpp
rename to libs/opencv/include/opencv2/core/cuda/dynamic_smem.hpp
diff --git a/libs/opencv/include/core/cuda/emulation.hpp b/libs/opencv/include/opencv2/core/cuda/emulation.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/emulation.hpp
rename to libs/opencv/include/opencv2/core/cuda/emulation.hpp
diff --git a/libs/opencv/include/core/cuda/filters.hpp b/libs/opencv/include/opencv2/core/cuda/filters.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/filters.hpp
rename to libs/opencv/include/opencv2/core/cuda/filters.hpp
diff --git a/libs/opencv/include/core/cuda/funcattrib.hpp b/libs/opencv/include/opencv2/core/cuda/funcattrib.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/funcattrib.hpp
rename to libs/opencv/include/opencv2/core/cuda/funcattrib.hpp
diff --git a/libs/opencv/include/core/cuda/functional.hpp b/libs/opencv/include/opencv2/core/cuda/functional.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/functional.hpp
rename to libs/opencv/include/opencv2/core/cuda/functional.hpp
diff --git a/libs/opencv/include/core/cuda/limits.hpp b/libs/opencv/include/opencv2/core/cuda/limits.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/limits.hpp
rename to libs/opencv/include/opencv2/core/cuda/limits.hpp
diff --git a/libs/opencv/include/core/cuda/reduce.hpp b/libs/opencv/include/opencv2/core/cuda/reduce.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/reduce.hpp
rename to libs/opencv/include/opencv2/core/cuda/reduce.hpp
diff --git a/libs/opencv/include/core/cuda/saturate_cast.hpp b/libs/opencv/include/opencv2/core/cuda/saturate_cast.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/saturate_cast.hpp
rename to libs/opencv/include/opencv2/core/cuda/saturate_cast.hpp
diff --git a/libs/opencv/include/core/cuda/scan.hpp b/libs/opencv/include/opencv2/core/cuda/scan.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/scan.hpp
rename to libs/opencv/include/opencv2/core/cuda/scan.hpp
diff --git a/libs/opencv/include/core/cuda/simd_functions.hpp b/libs/opencv/include/opencv2/core/cuda/simd_functions.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/simd_functions.hpp
rename to libs/opencv/include/opencv2/core/cuda/simd_functions.hpp
diff --git a/libs/opencv/include/core/cuda/transform.hpp b/libs/opencv/include/opencv2/core/cuda/transform.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/transform.hpp
rename to libs/opencv/include/opencv2/core/cuda/transform.hpp
diff --git a/libs/opencv/include/core/cuda/type_traits.hpp b/libs/opencv/include/opencv2/core/cuda/type_traits.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/type_traits.hpp
rename to libs/opencv/include/opencv2/core/cuda/type_traits.hpp
diff --git a/libs/opencv/include/core/cuda/utility.hpp b/libs/opencv/include/opencv2/core/cuda/utility.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/utility.hpp
rename to libs/opencv/include/opencv2/core/cuda/utility.hpp
diff --git a/libs/opencv/include/core/cuda/vec_distance.hpp b/libs/opencv/include/opencv2/core/cuda/vec_distance.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/vec_distance.hpp
rename to libs/opencv/include/opencv2/core/cuda/vec_distance.hpp
diff --git a/libs/opencv/include/core/cuda/vec_math.hpp b/libs/opencv/include/opencv2/core/cuda/vec_math.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/vec_math.hpp
rename to libs/opencv/include/opencv2/core/cuda/vec_math.hpp
diff --git a/libs/opencv/include/core/cuda/vec_traits.hpp b/libs/opencv/include/opencv2/core/cuda/vec_traits.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/vec_traits.hpp
rename to libs/opencv/include/opencv2/core/cuda/vec_traits.hpp
diff --git a/libs/opencv/include/core/cuda/warp.hpp b/libs/opencv/include/opencv2/core/cuda/warp.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/warp.hpp
rename to libs/opencv/include/opencv2/core/cuda/warp.hpp
diff --git a/libs/opencv/include/core/cuda/warp_reduce.hpp b/libs/opencv/include/opencv2/core/cuda/warp_reduce.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/warp_reduce.hpp
rename to libs/opencv/include/opencv2/core/cuda/warp_reduce.hpp
diff --git a/libs/opencv/include/core/cuda/warp_shuffle.hpp b/libs/opencv/include/opencv2/core/cuda/warp_shuffle.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda/warp_shuffle.hpp
rename to libs/opencv/include/opencv2/core/cuda/warp_shuffle.hpp
diff --git a/libs/opencv/include/core/cuda_stream_accessor.hpp b/libs/opencv/include/opencv2/core/cuda_stream_accessor.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda_stream_accessor.hpp
rename to libs/opencv/include/opencv2/core/cuda_stream_accessor.hpp
diff --git a/libs/opencv/include/core/cuda_types.hpp b/libs/opencv/include/opencv2/core/cuda_types.hpp
similarity index 100%
rename from libs/opencv/include/core/cuda_types.hpp
rename to libs/opencv/include/opencv2/core/cuda_types.hpp
diff --git a/libs/opencv/include/core/cv_cpu_dispatch.h b/libs/opencv/include/opencv2/core/cv_cpu_dispatch.h
similarity index 100%
rename from libs/opencv/include/core/cv_cpu_dispatch.h
rename to libs/opencv/include/opencv2/core/cv_cpu_dispatch.h
diff --git a/libs/opencv/include/core/cv_cpu_helper.h b/libs/opencv/include/opencv2/core/cv_cpu_helper.h
similarity index 100%
rename from libs/opencv/include/core/cv_cpu_helper.h
rename to libs/opencv/include/opencv2/core/cv_cpu_helper.h
diff --git a/libs/opencv/include/core/cvdef.h b/libs/opencv/include/opencv2/core/cvdef.h
similarity index 100%
rename from libs/opencv/include/core/cvdef.h
rename to libs/opencv/include/opencv2/core/cvdef.h
diff --git a/libs/opencv/include/core/cvstd.hpp b/libs/opencv/include/opencv2/core/cvstd.hpp
similarity index 100%
rename from libs/opencv/include/core/cvstd.hpp
rename to libs/opencv/include/opencv2/core/cvstd.hpp
diff --git a/libs/opencv/include/core/cvstd.inl.hpp b/libs/opencv/include/opencv2/core/cvstd.inl.hpp
similarity index 100%
rename from libs/opencv/include/core/cvstd.inl.hpp
rename to libs/opencv/include/opencv2/core/cvstd.inl.hpp
diff --git a/libs/opencv/include/core/cvstd_wrapper.hpp b/libs/opencv/include/opencv2/core/cvstd_wrapper.hpp
similarity index 100%
rename from libs/opencv/include/core/cvstd_wrapper.hpp
rename to libs/opencv/include/opencv2/core/cvstd_wrapper.hpp
diff --git a/libs/opencv/include/core/detail/async_promise.hpp b/libs/opencv/include/opencv2/core/detail/async_promise.hpp
similarity index 100%
rename from libs/opencv/include/core/detail/async_promise.hpp
rename to libs/opencv/include/opencv2/core/detail/async_promise.hpp
diff --git a/libs/opencv/include/core/detail/dispatch_helper.impl.hpp b/libs/opencv/include/opencv2/core/detail/dispatch_helper.impl.hpp
similarity index 100%
rename from libs/opencv/include/core/detail/dispatch_helper.impl.hpp
rename to libs/opencv/include/opencv2/core/detail/dispatch_helper.impl.hpp
diff --git a/libs/opencv/include/core/detail/exception_ptr.hpp b/libs/opencv/include/opencv2/core/detail/exception_ptr.hpp
similarity index 100%
rename from libs/opencv/include/core/detail/exception_ptr.hpp
rename to libs/opencv/include/opencv2/core/detail/exception_ptr.hpp
diff --git a/libs/opencv/include/core/directx.hpp b/libs/opencv/include/opencv2/core/directx.hpp
similarity index 100%
rename from libs/opencv/include/core/directx.hpp
rename to libs/opencv/include/opencv2/core/directx.hpp
diff --git a/libs/opencv/include/core/dualquaternion.hpp b/libs/opencv/include/opencv2/core/dualquaternion.hpp
similarity index 100%
rename from libs/opencv/include/core/dualquaternion.hpp
rename to libs/opencv/include/opencv2/core/dualquaternion.hpp
diff --git a/libs/opencv/include/core/dualquaternion.inl.hpp b/libs/opencv/include/opencv2/core/dualquaternion.inl.hpp
similarity index 100%
rename from libs/opencv/include/core/dualquaternion.inl.hpp
rename to libs/opencv/include/opencv2/core/dualquaternion.inl.hpp
diff --git a/libs/opencv/include/core/eigen.hpp b/libs/opencv/include/opencv2/core/eigen.hpp
similarity index 100%
rename from libs/opencv/include/core/eigen.hpp
rename to libs/opencv/include/opencv2/core/eigen.hpp
diff --git a/libs/opencv/include/core/fast_math.hpp b/libs/opencv/include/opencv2/core/fast_math.hpp
similarity index 100%
rename from libs/opencv/include/core/fast_math.hpp
rename to libs/opencv/include/opencv2/core/fast_math.hpp
diff --git a/libs/opencv/include/core/hal/hal.hpp b/libs/opencv/include/opencv2/core/hal/hal.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/hal.hpp
rename to libs/opencv/include/opencv2/core/hal/hal.hpp
diff --git a/libs/opencv/include/core/hal/interface.h b/libs/opencv/include/opencv2/core/hal/interface.h
similarity index 100%
rename from libs/opencv/include/core/hal/interface.h
rename to libs/opencv/include/opencv2/core/hal/interface.h
diff --git a/libs/opencv/include/core/hal/intrin.hpp b/libs/opencv/include/opencv2/core/hal/intrin.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin.hpp
diff --git a/libs/opencv/include/core/hal/intrin_avx.hpp b/libs/opencv/include/opencv2/core/hal/intrin_avx.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_avx.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_avx.hpp
diff --git a/libs/opencv/include/core/hal/intrin_avx512.hpp b/libs/opencv/include/opencv2/core/hal/intrin_avx512.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_avx512.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_avx512.hpp
diff --git a/libs/opencv/include/core/hal/intrin_cpp.hpp b/libs/opencv/include/opencv2/core/hal/intrin_cpp.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_cpp.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_cpp.hpp
diff --git a/libs/opencv/include/core/hal/intrin_forward.hpp b/libs/opencv/include/opencv2/core/hal/intrin_forward.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_forward.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_forward.hpp
diff --git a/libs/opencv/include/core/hal/intrin_msa.hpp b/libs/opencv/include/opencv2/core/hal/intrin_msa.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_msa.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_msa.hpp
diff --git a/libs/opencv/include/core/hal/intrin_neon.hpp b/libs/opencv/include/opencv2/core/hal/intrin_neon.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_neon.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_neon.hpp
diff --git a/libs/opencv/include/core/hal/intrin_rvv.hpp b/libs/opencv/include/opencv2/core/hal/intrin_rvv.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_rvv.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_rvv.hpp
diff --git a/libs/opencv/include/core/hal/intrin_rvv071.hpp b/libs/opencv/include/opencv2/core/hal/intrin_rvv071.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_rvv071.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_rvv071.hpp
diff --git a/libs/opencv/include/core/hal/intrin_sse.hpp b/libs/opencv/include/opencv2/core/hal/intrin_sse.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_sse.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_sse.hpp
diff --git a/libs/opencv/include/core/hal/intrin_sse_em.hpp b/libs/opencv/include/opencv2/core/hal/intrin_sse_em.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_sse_em.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_sse_em.hpp
diff --git a/libs/opencv/include/core/hal/intrin_vsx.hpp b/libs/opencv/include/opencv2/core/hal/intrin_vsx.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_vsx.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_vsx.hpp
diff --git a/libs/opencv/include/core/hal/intrin_wasm.hpp b/libs/opencv/include/opencv2/core/hal/intrin_wasm.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/intrin_wasm.hpp
rename to libs/opencv/include/opencv2/core/hal/intrin_wasm.hpp
diff --git a/libs/opencv/include/core/hal/msa_macros.h b/libs/opencv/include/opencv2/core/hal/msa_macros.h
similarity index 100%
rename from libs/opencv/include/core/hal/msa_macros.h
rename to libs/opencv/include/opencv2/core/hal/msa_macros.h
diff --git a/libs/opencv/include/core/hal/simd_utils.impl.hpp b/libs/opencv/include/opencv2/core/hal/simd_utils.impl.hpp
similarity index 100%
rename from libs/opencv/include/core/hal/simd_utils.impl.hpp
rename to libs/opencv/include/opencv2/core/hal/simd_utils.impl.hpp
diff --git a/libs/opencv/include/core/mat.hpp b/libs/opencv/include/opencv2/core/mat.hpp
similarity index 100%
rename from libs/opencv/include/core/mat.hpp
rename to libs/opencv/include/opencv2/core/mat.hpp
diff --git a/libs/opencv/include/core/mat.inl.hpp b/libs/opencv/include/opencv2/core/mat.inl.hpp
similarity index 100%
rename from libs/opencv/include/core/mat.inl.hpp
rename to libs/opencv/include/opencv2/core/mat.inl.hpp
diff --git a/libs/opencv/include/core/matx.hpp b/libs/opencv/include/opencv2/core/matx.hpp
similarity index 100%
rename from libs/opencv/include/core/matx.hpp
rename to libs/opencv/include/opencv2/core/matx.hpp
diff --git a/libs/opencv/include/core/neon_utils.hpp b/libs/opencv/include/opencv2/core/neon_utils.hpp
similarity index 100%
rename from libs/opencv/include/core/neon_utils.hpp
rename to libs/opencv/include/opencv2/core/neon_utils.hpp
diff --git a/libs/opencv/include/core/ocl.hpp b/libs/opencv/include/opencv2/core/ocl.hpp
similarity index 100%
rename from libs/opencv/include/core/ocl.hpp
rename to libs/opencv/include/opencv2/core/ocl.hpp
diff --git a/libs/opencv/include/core/ocl_genbase.hpp b/libs/opencv/include/opencv2/core/ocl_genbase.hpp
similarity index 100%
rename from libs/opencv/include/core/ocl_genbase.hpp
rename to libs/opencv/include/opencv2/core/ocl_genbase.hpp
diff --git a/libs/opencv/include/core/opencl/ocl_defs.hpp b/libs/opencv/include/opencv2/core/opencl/ocl_defs.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/ocl_defs.hpp
rename to libs/opencv/include/opencv2/core/opencl/ocl_defs.hpp
diff --git a/libs/opencv/include/core/opencl/opencl_info.hpp b/libs/opencv/include/opencv2/core/opencl/opencl_info.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/opencl_info.hpp
rename to libs/opencv/include/opencv2/core/opencl/opencl_info.hpp
diff --git a/libs/opencv/include/core/opencl/opencl_svm.hpp b/libs/opencv/include/opencv2/core/opencl/opencl_svm.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/opencl_svm.hpp
rename to libs/opencv/include/opencv2/core/opencl/opencl_svm.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/autogenerated/opencl_clblas.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/autogenerated/opencl_clblas.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/autogenerated/opencl_clfft.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/autogenerated/opencl_clfft.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/autogenerated/opencl_core.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/autogenerated/opencl_core.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/autogenerated/opencl_gl.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/autogenerated/opencl_gl.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/opencl_clblas.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/opencl_clblas.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/opencl_clblas.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/opencl_clblas.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/opencl_clfft.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/opencl_clfft.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/opencl_clfft.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/opencl_clfft.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/opencl_core.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/opencl_core.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/opencl_core.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/opencl_core.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/opencl_core_wrappers.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/opencl_core_wrappers.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/opencl_gl.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/opencl_gl.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/opencl_gl.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/opencl_gl.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/opencl_gl_wrappers.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/opencl_gl_wrappers.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/opencl_svm_20.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/opencl_svm_20.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/opencl_svm_definitions.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/opencl_svm_definitions.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
diff --git a/libs/opencv/include/core/opencl/runtime/opencl_svm_hsa_extension.hpp b/libs/opencv/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
similarity index 100%
rename from libs/opencv/include/core/opencl/runtime/opencl_svm_hsa_extension.hpp
rename to libs/opencv/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
diff --git a/libs/opencv/include/core/opengl.hpp b/libs/opencv/include/opencv2/core/opengl.hpp
similarity index 100%
rename from libs/opencv/include/core/opengl.hpp
rename to libs/opencv/include/opencv2/core/opengl.hpp
diff --git a/libs/opencv/include/core/operations.hpp b/libs/opencv/include/opencv2/core/operations.hpp
similarity index 100%
rename from libs/opencv/include/core/operations.hpp
rename to libs/opencv/include/opencv2/core/operations.hpp
diff --git a/libs/opencv/include/core/optim.hpp b/libs/opencv/include/opencv2/core/optim.hpp
similarity index 100%
rename from libs/opencv/include/core/optim.hpp
rename to libs/opencv/include/opencv2/core/optim.hpp
diff --git a/libs/opencv/include/core/ovx.hpp b/libs/opencv/include/opencv2/core/ovx.hpp
similarity index 100%
rename from libs/opencv/include/core/ovx.hpp
rename to libs/opencv/include/opencv2/core/ovx.hpp
diff --git a/libs/opencv/include/core/parallel/backend/parallel_for.openmp.hpp b/libs/opencv/include/opencv2/core/parallel/backend/parallel_for.openmp.hpp
similarity index 100%
rename from libs/opencv/include/core/parallel/backend/parallel_for.openmp.hpp
rename to libs/opencv/include/opencv2/core/parallel/backend/parallel_for.openmp.hpp
diff --git a/libs/opencv/include/core/parallel/backend/parallel_for.tbb.hpp b/libs/opencv/include/opencv2/core/parallel/backend/parallel_for.tbb.hpp
similarity index 100%
rename from libs/opencv/include/core/parallel/backend/parallel_for.tbb.hpp
rename to libs/opencv/include/opencv2/core/parallel/backend/parallel_for.tbb.hpp
diff --git a/libs/opencv/include/core/parallel/parallel_backend.hpp b/libs/opencv/include/opencv2/core/parallel/parallel_backend.hpp
similarity index 100%
rename from libs/opencv/include/core/parallel/parallel_backend.hpp
rename to libs/opencv/include/opencv2/core/parallel/parallel_backend.hpp
diff --git a/libs/opencv/include/core/persistence.hpp b/libs/opencv/include/opencv2/core/persistence.hpp
similarity index 100%
rename from libs/opencv/include/core/persistence.hpp
rename to libs/opencv/include/opencv2/core/persistence.hpp
diff --git a/libs/opencv/include/core/quaternion.hpp b/libs/opencv/include/opencv2/core/quaternion.hpp
similarity index 100%
rename from libs/opencv/include/core/quaternion.hpp
rename to libs/opencv/include/opencv2/core/quaternion.hpp
diff --git a/libs/opencv/include/core/quaternion.inl.hpp b/libs/opencv/include/opencv2/core/quaternion.inl.hpp
similarity index 100%
rename from libs/opencv/include/core/quaternion.inl.hpp
rename to libs/opencv/include/opencv2/core/quaternion.inl.hpp
diff --git a/libs/opencv/include/core/saturate.hpp b/libs/opencv/include/opencv2/core/saturate.hpp
similarity index 100%
rename from libs/opencv/include/core/saturate.hpp
rename to libs/opencv/include/opencv2/core/saturate.hpp
diff --git a/libs/opencv/include/core/simd_intrinsics.hpp b/libs/opencv/include/opencv2/core/simd_intrinsics.hpp
similarity index 100%
rename from libs/opencv/include/core/simd_intrinsics.hpp
rename to libs/opencv/include/opencv2/core/simd_intrinsics.hpp
diff --git a/libs/opencv/include/core/softfloat.hpp b/libs/opencv/include/opencv2/core/softfloat.hpp
similarity index 100%
rename from libs/opencv/include/core/softfloat.hpp
rename to libs/opencv/include/opencv2/core/softfloat.hpp
diff --git a/libs/opencv/include/core/sse_utils.hpp b/libs/opencv/include/opencv2/core/sse_utils.hpp
similarity index 100%
rename from libs/opencv/include/core/sse_utils.hpp
rename to libs/opencv/include/opencv2/core/sse_utils.hpp
diff --git a/libs/opencv/include/core/traits.hpp b/libs/opencv/include/opencv2/core/traits.hpp
similarity index 100%
rename from libs/opencv/include/core/traits.hpp
rename to libs/opencv/include/opencv2/core/traits.hpp
diff --git a/libs/opencv/include/core/types.hpp b/libs/opencv/include/opencv2/core/types.hpp
similarity index 100%
rename from libs/opencv/include/core/types.hpp
rename to libs/opencv/include/opencv2/core/types.hpp
diff --git a/libs/opencv/include/core/types_c.h b/libs/opencv/include/opencv2/core/types_c.h
similarity index 100%
rename from libs/opencv/include/core/types_c.h
rename to libs/opencv/include/opencv2/core/types_c.h
diff --git a/libs/opencv/include/core/utility.hpp b/libs/opencv/include/opencv2/core/utility.hpp
similarity index 100%
rename from libs/opencv/include/core/utility.hpp
rename to libs/opencv/include/opencv2/core/utility.hpp
diff --git a/libs/opencv/include/core/utils/allocator_stats.hpp b/libs/opencv/include/opencv2/core/utils/allocator_stats.hpp
similarity index 100%
rename from libs/opencv/include/core/utils/allocator_stats.hpp
rename to libs/opencv/include/opencv2/core/utils/allocator_stats.hpp
diff --git a/libs/opencv/include/core/utils/allocator_stats.impl.hpp b/libs/opencv/include/opencv2/core/utils/allocator_stats.impl.hpp
similarity index 100%
rename from libs/opencv/include/core/utils/allocator_stats.impl.hpp
rename to libs/opencv/include/opencv2/core/utils/allocator_stats.impl.hpp
diff --git a/libs/opencv/include/core/utils/filesystem.hpp b/libs/opencv/include/opencv2/core/utils/filesystem.hpp
similarity index 100%
rename from libs/opencv/include/core/utils/filesystem.hpp
rename to libs/opencv/include/opencv2/core/utils/filesystem.hpp
diff --git a/libs/opencv/include/core/utils/instrumentation.hpp b/libs/opencv/include/opencv2/core/utils/instrumentation.hpp
similarity index 100%
rename from libs/opencv/include/core/utils/instrumentation.hpp
rename to libs/opencv/include/opencv2/core/utils/instrumentation.hpp
diff --git a/libs/opencv/include/core/utils/logger.defines.hpp b/libs/opencv/include/opencv2/core/utils/logger.defines.hpp
similarity index 100%
rename from libs/opencv/include/core/utils/logger.defines.hpp
rename to libs/opencv/include/opencv2/core/utils/logger.defines.hpp
diff --git a/libs/opencv/include/core/utils/logger.hpp b/libs/opencv/include/opencv2/core/utils/logger.hpp
similarity index 100%
rename from libs/opencv/include/core/utils/logger.hpp
rename to libs/opencv/include/opencv2/core/utils/logger.hpp
diff --git a/libs/opencv/include/core/utils/logtag.hpp b/libs/opencv/include/opencv2/core/utils/logtag.hpp
similarity index 100%
rename from libs/opencv/include/core/utils/logtag.hpp
rename to libs/opencv/include/opencv2/core/utils/logtag.hpp
diff --git a/libs/opencv/include/core/utils/tls.hpp b/libs/opencv/include/opencv2/core/utils/tls.hpp
similarity index 100%
rename from libs/opencv/include/core/utils/tls.hpp
rename to libs/opencv/include/opencv2/core/utils/tls.hpp
diff --git a/libs/opencv/include/core/utils/trace.hpp b/libs/opencv/include/opencv2/core/utils/trace.hpp
similarity index 100%
rename from libs/opencv/include/core/utils/trace.hpp
rename to libs/opencv/include/opencv2/core/utils/trace.hpp
diff --git a/libs/opencv/include/core/va_intel.hpp b/libs/opencv/include/opencv2/core/va_intel.hpp
similarity index 100%
rename from libs/opencv/include/core/va_intel.hpp
rename to libs/opencv/include/opencv2/core/va_intel.hpp
diff --git a/libs/opencv/include/core/version.hpp b/libs/opencv/include/opencv2/core/version.hpp
similarity index 100%
rename from libs/opencv/include/core/version.hpp
rename to libs/opencv/include/opencv2/core/version.hpp
diff --git a/libs/opencv/include/core/vsx_utils.hpp b/libs/opencv/include/opencv2/core/vsx_utils.hpp
similarity index 100%
rename from libs/opencv/include/core/vsx_utils.hpp
rename to libs/opencv/include/opencv2/core/vsx_utils.hpp
diff --git a/libs/opencv/include/cvconfig.h b/libs/opencv/include/opencv2/cvconfig.h
similarity index 100%
rename from libs/opencv/include/cvconfig.h
rename to libs/opencv/include/opencv2/cvconfig.h
diff --git a/libs/opencv/include/dnn.hpp b/libs/opencv/include/opencv2/dnn.hpp
similarity index 100%
rename from libs/opencv/include/dnn.hpp
rename to libs/opencv/include/opencv2/dnn.hpp
diff --git a/libs/opencv/include/dnn/all_layers.hpp b/libs/opencv/include/opencv2/dnn/all_layers.hpp
similarity index 100%
rename from libs/opencv/include/dnn/all_layers.hpp
rename to libs/opencv/include/opencv2/dnn/all_layers.hpp
diff --git a/libs/opencv/include/dnn/dict.hpp b/libs/opencv/include/opencv2/dnn/dict.hpp
similarity index 100%
rename from libs/opencv/include/dnn/dict.hpp
rename to libs/opencv/include/opencv2/dnn/dict.hpp
diff --git a/libs/opencv/include/dnn/dnn.hpp b/libs/opencv/include/opencv2/dnn/dnn.hpp
similarity index 100%
rename from libs/opencv/include/dnn/dnn.hpp
rename to libs/opencv/include/opencv2/dnn/dnn.hpp
diff --git a/libs/opencv/include/dnn/dnn.inl.hpp b/libs/opencv/include/opencv2/dnn/dnn.inl.hpp
similarity index 100%
rename from libs/opencv/include/dnn/dnn.inl.hpp
rename to libs/opencv/include/opencv2/dnn/dnn.inl.hpp
diff --git a/libs/opencv/include/dnn/layer.details.hpp b/libs/opencv/include/opencv2/dnn/layer.details.hpp
similarity index 100%
rename from libs/opencv/include/dnn/layer.details.hpp
rename to libs/opencv/include/opencv2/dnn/layer.details.hpp
diff --git a/libs/opencv/include/dnn/layer.hpp b/libs/opencv/include/opencv2/dnn/layer.hpp
similarity index 100%
rename from libs/opencv/include/dnn/layer.hpp
rename to libs/opencv/include/opencv2/dnn/layer.hpp
diff --git a/libs/opencv/include/dnn/shape_utils.hpp b/libs/opencv/include/opencv2/dnn/shape_utils.hpp
similarity index 100%
rename from libs/opencv/include/dnn/shape_utils.hpp
rename to libs/opencv/include/opencv2/dnn/shape_utils.hpp
diff --git a/libs/opencv/include/dnn/utils/debug_utils.hpp b/libs/opencv/include/opencv2/dnn/utils/debug_utils.hpp
similarity index 100%
rename from libs/opencv/include/dnn/utils/debug_utils.hpp
rename to libs/opencv/include/opencv2/dnn/utils/debug_utils.hpp
diff --git a/libs/opencv/include/dnn/utils/inference_engine.hpp b/libs/opencv/include/opencv2/dnn/utils/inference_engine.hpp
similarity index 100%
rename from libs/opencv/include/dnn/utils/inference_engine.hpp
rename to libs/opencv/include/opencv2/dnn/utils/inference_engine.hpp
diff --git a/libs/opencv/include/dnn/version.hpp b/libs/opencv/include/opencv2/dnn/version.hpp
similarity index 100%
rename from libs/opencv/include/dnn/version.hpp
rename to libs/opencv/include/opencv2/dnn/version.hpp
diff --git a/libs/opencv/include/features2d.hpp b/libs/opencv/include/opencv2/features2d.hpp
similarity index 100%
rename from libs/opencv/include/features2d.hpp
rename to libs/opencv/include/opencv2/features2d.hpp
diff --git a/libs/opencv/include/features2d/features2d.hpp b/libs/opencv/include/opencv2/features2d/features2d.hpp
similarity index 100%
rename from libs/opencv/include/features2d/features2d.hpp
rename to libs/opencv/include/opencv2/features2d/features2d.hpp
diff --git a/libs/opencv/include/features2d/hal/interface.h b/libs/opencv/include/opencv2/features2d/hal/interface.h
similarity index 100%
rename from libs/opencv/include/features2d/hal/interface.h
rename to libs/opencv/include/opencv2/features2d/hal/interface.h
diff --git a/libs/opencv/include/flann.hpp b/libs/opencv/include/opencv2/flann.hpp
similarity index 100%
rename from libs/opencv/include/flann.hpp
rename to libs/opencv/include/opencv2/flann.hpp
diff --git a/libs/opencv/include/flann/all_indices.h b/libs/opencv/include/opencv2/flann/all_indices.h
similarity index 100%
rename from libs/opencv/include/flann/all_indices.h
rename to libs/opencv/include/opencv2/flann/all_indices.h
diff --git a/libs/opencv/include/flann/allocator.h b/libs/opencv/include/opencv2/flann/allocator.h
similarity index 100%
rename from libs/opencv/include/flann/allocator.h
rename to libs/opencv/include/opencv2/flann/allocator.h
diff --git a/libs/opencv/include/flann/any.h b/libs/opencv/include/opencv2/flann/any.h
similarity index 100%
rename from libs/opencv/include/flann/any.h
rename to libs/opencv/include/opencv2/flann/any.h
diff --git a/libs/opencv/include/flann/autotuned_index.h b/libs/opencv/include/opencv2/flann/autotuned_index.h
similarity index 100%
rename from libs/opencv/include/flann/autotuned_index.h
rename to libs/opencv/include/opencv2/flann/autotuned_index.h
diff --git a/libs/opencv/include/flann/composite_index.h b/libs/opencv/include/opencv2/flann/composite_index.h
similarity index 100%
rename from libs/opencv/include/flann/composite_index.h
rename to libs/opencv/include/opencv2/flann/composite_index.h
diff --git a/libs/opencv/include/flann/config.h b/libs/opencv/include/opencv2/flann/config.h
similarity index 100%
rename from libs/opencv/include/flann/config.h
rename to libs/opencv/include/opencv2/flann/config.h
diff --git a/libs/opencv/include/flann/defines.h b/libs/opencv/include/opencv2/flann/defines.h
similarity index 100%
rename from libs/opencv/include/flann/defines.h
rename to libs/opencv/include/opencv2/flann/defines.h
diff --git a/libs/opencv/include/flann/dist.h b/libs/opencv/include/opencv2/flann/dist.h
similarity index 100%
rename from libs/opencv/include/flann/dist.h
rename to libs/opencv/include/opencv2/flann/dist.h
diff --git a/libs/opencv/include/flann/dummy.h b/libs/opencv/include/opencv2/flann/dummy.h
similarity index 100%
rename from libs/opencv/include/flann/dummy.h
rename to libs/opencv/include/opencv2/flann/dummy.h
diff --git a/libs/opencv/include/flann/dynamic_bitset.h b/libs/opencv/include/opencv2/flann/dynamic_bitset.h
similarity index 100%
rename from libs/opencv/include/flann/dynamic_bitset.h
rename to libs/opencv/include/opencv2/flann/dynamic_bitset.h
diff --git a/libs/opencv/include/flann/flann.hpp b/libs/opencv/include/opencv2/flann/flann.hpp
similarity index 100%
rename from libs/opencv/include/flann/flann.hpp
rename to libs/opencv/include/opencv2/flann/flann.hpp
diff --git a/libs/opencv/include/flann/flann_base.hpp b/libs/opencv/include/opencv2/flann/flann_base.hpp
similarity index 100%
rename from libs/opencv/include/flann/flann_base.hpp
rename to libs/opencv/include/opencv2/flann/flann_base.hpp
diff --git a/libs/opencv/include/flann/general.h b/libs/opencv/include/opencv2/flann/general.h
similarity index 100%
rename from libs/opencv/include/flann/general.h
rename to libs/opencv/include/opencv2/flann/general.h
diff --git a/libs/opencv/include/flann/ground_truth.h b/libs/opencv/include/opencv2/flann/ground_truth.h
similarity index 100%
rename from libs/opencv/include/flann/ground_truth.h
rename to libs/opencv/include/opencv2/flann/ground_truth.h
diff --git a/libs/opencv/include/flann/hdf5.h b/libs/opencv/include/opencv2/flann/hdf5.h
similarity index 100%
rename from libs/opencv/include/flann/hdf5.h
rename to libs/opencv/include/opencv2/flann/hdf5.h
diff --git a/libs/opencv/include/flann/heap.h b/libs/opencv/include/opencv2/flann/heap.h
similarity index 100%
rename from libs/opencv/include/flann/heap.h
rename to libs/opencv/include/opencv2/flann/heap.h
diff --git a/libs/opencv/include/flann/hierarchical_clustering_index.h b/libs/opencv/include/opencv2/flann/hierarchical_clustering_index.h
similarity index 100%
rename from libs/opencv/include/flann/hierarchical_clustering_index.h
rename to libs/opencv/include/opencv2/flann/hierarchical_clustering_index.h
diff --git a/libs/opencv/include/flann/index_testing.h b/libs/opencv/include/opencv2/flann/index_testing.h
similarity index 100%
rename from libs/opencv/include/flann/index_testing.h
rename to libs/opencv/include/opencv2/flann/index_testing.h
diff --git a/libs/opencv/include/flann/kdtree_index.h b/libs/opencv/include/opencv2/flann/kdtree_index.h
similarity index 100%
rename from libs/opencv/include/flann/kdtree_index.h
rename to libs/opencv/include/opencv2/flann/kdtree_index.h
diff --git a/libs/opencv/include/flann/kdtree_single_index.h b/libs/opencv/include/opencv2/flann/kdtree_single_index.h
similarity index 100%
rename from libs/opencv/include/flann/kdtree_single_index.h
rename to libs/opencv/include/opencv2/flann/kdtree_single_index.h
diff --git a/libs/opencv/include/flann/kmeans_index.h b/libs/opencv/include/opencv2/flann/kmeans_index.h
similarity index 100%
rename from libs/opencv/include/flann/kmeans_index.h
rename to libs/opencv/include/opencv2/flann/kmeans_index.h
diff --git a/libs/opencv/include/flann/linear_index.h b/libs/opencv/include/opencv2/flann/linear_index.h
similarity index 100%
rename from libs/opencv/include/flann/linear_index.h
rename to libs/opencv/include/opencv2/flann/linear_index.h
diff --git a/libs/opencv/include/flann/logger.h b/libs/opencv/include/opencv2/flann/logger.h
similarity index 100%
rename from libs/opencv/include/flann/logger.h
rename to libs/opencv/include/opencv2/flann/logger.h
diff --git a/libs/opencv/include/flann/lsh_index.h b/libs/opencv/include/opencv2/flann/lsh_index.h
similarity index 100%
rename from libs/opencv/include/flann/lsh_index.h
rename to libs/opencv/include/opencv2/flann/lsh_index.h
diff --git a/libs/opencv/include/flann/lsh_table.h b/libs/opencv/include/opencv2/flann/lsh_table.h
similarity index 100%
rename from libs/opencv/include/flann/lsh_table.h
rename to libs/opencv/include/opencv2/flann/lsh_table.h
diff --git a/libs/opencv/include/flann/matrix.h b/libs/opencv/include/opencv2/flann/matrix.h
similarity index 100%
rename from libs/opencv/include/flann/matrix.h
rename to libs/opencv/include/opencv2/flann/matrix.h
diff --git a/libs/opencv/include/flann/miniflann.hpp b/libs/opencv/include/opencv2/flann/miniflann.hpp
similarity index 100%
rename from libs/opencv/include/flann/miniflann.hpp
rename to libs/opencv/include/opencv2/flann/miniflann.hpp
diff --git a/libs/opencv/include/flann/nn_index.h b/libs/opencv/include/opencv2/flann/nn_index.h
similarity index 100%
rename from libs/opencv/include/flann/nn_index.h
rename to libs/opencv/include/opencv2/flann/nn_index.h
diff --git a/libs/opencv/include/flann/object_factory.h b/libs/opencv/include/opencv2/flann/object_factory.h
similarity index 100%
rename from libs/opencv/include/flann/object_factory.h
rename to libs/opencv/include/opencv2/flann/object_factory.h
diff --git a/libs/opencv/include/flann/params.h b/libs/opencv/include/opencv2/flann/params.h
similarity index 100%
rename from libs/opencv/include/flann/params.h
rename to libs/opencv/include/opencv2/flann/params.h
diff --git a/libs/opencv/include/flann/random.h b/libs/opencv/include/opencv2/flann/random.h
similarity index 100%
rename from libs/opencv/include/flann/random.h
rename to libs/opencv/include/opencv2/flann/random.h
diff --git a/libs/opencv/include/flann/result_set.h b/libs/opencv/include/opencv2/flann/result_set.h
similarity index 100%
rename from libs/opencv/include/flann/result_set.h
rename to libs/opencv/include/opencv2/flann/result_set.h
diff --git a/libs/opencv/include/flann/sampling.h b/libs/opencv/include/opencv2/flann/sampling.h
similarity index 100%
rename from libs/opencv/include/flann/sampling.h
rename to libs/opencv/include/opencv2/flann/sampling.h
diff --git a/libs/opencv/include/flann/saving.h b/libs/opencv/include/opencv2/flann/saving.h
similarity index 100%
rename from libs/opencv/include/flann/saving.h
rename to libs/opencv/include/opencv2/flann/saving.h
diff --git a/libs/opencv/include/flann/simplex_downhill.h b/libs/opencv/include/opencv2/flann/simplex_downhill.h
similarity index 100%
rename from libs/opencv/include/flann/simplex_downhill.h
rename to libs/opencv/include/opencv2/flann/simplex_downhill.h
diff --git a/libs/opencv/include/flann/timer.h b/libs/opencv/include/opencv2/flann/timer.h
similarity index 100%
rename from libs/opencv/include/flann/timer.h
rename to libs/opencv/include/opencv2/flann/timer.h
diff --git a/libs/opencv/include/gapi.hpp b/libs/opencv/include/opencv2/gapi.hpp
similarity index 100%
rename from libs/opencv/include/gapi.hpp
rename to libs/opencv/include/opencv2/gapi.hpp
diff --git a/libs/opencv/include/gapi/core.hpp b/libs/opencv/include/opencv2/gapi/core.hpp
similarity index 100%
rename from libs/opencv/include/gapi/core.hpp
rename to libs/opencv/include/opencv2/gapi/core.hpp
diff --git a/libs/opencv/include/gapi/cpu/core.hpp b/libs/opencv/include/opencv2/gapi/cpu/core.hpp
similarity index 100%
rename from libs/opencv/include/gapi/cpu/core.hpp
rename to libs/opencv/include/opencv2/gapi/cpu/core.hpp
diff --git a/libs/opencv/include/gapi/cpu/gcpukernel.hpp b/libs/opencv/include/opencv2/gapi/cpu/gcpukernel.hpp
similarity index 100%
rename from libs/opencv/include/gapi/cpu/gcpukernel.hpp
rename to libs/opencv/include/opencv2/gapi/cpu/gcpukernel.hpp
diff --git a/libs/opencv/include/gapi/cpu/imgproc.hpp b/libs/opencv/include/opencv2/gapi/cpu/imgproc.hpp
similarity index 100%
rename from libs/opencv/include/gapi/cpu/imgproc.hpp
rename to libs/opencv/include/opencv2/gapi/cpu/imgproc.hpp
diff --git a/libs/opencv/include/gapi/cpu/stereo.hpp b/libs/opencv/include/opencv2/gapi/cpu/stereo.hpp
similarity index 100%
rename from libs/opencv/include/gapi/cpu/stereo.hpp
rename to libs/opencv/include/opencv2/gapi/cpu/stereo.hpp
diff --git a/libs/opencv/include/gapi/cpu/video.hpp b/libs/opencv/include/opencv2/gapi/cpu/video.hpp
similarity index 100%
rename from libs/opencv/include/gapi/cpu/video.hpp
rename to libs/opencv/include/opencv2/gapi/cpu/video.hpp
diff --git a/libs/opencv/include/gapi/fluid/core.hpp b/libs/opencv/include/opencv2/gapi/fluid/core.hpp
similarity index 100%
rename from libs/opencv/include/gapi/fluid/core.hpp
rename to libs/opencv/include/opencv2/gapi/fluid/core.hpp
diff --git a/libs/opencv/include/gapi/fluid/gfluidbuffer.hpp b/libs/opencv/include/opencv2/gapi/fluid/gfluidbuffer.hpp
similarity index 100%
rename from libs/opencv/include/gapi/fluid/gfluidbuffer.hpp
rename to libs/opencv/include/opencv2/gapi/fluid/gfluidbuffer.hpp
diff --git a/libs/opencv/include/gapi/fluid/gfluidkernel.hpp b/libs/opencv/include/opencv2/gapi/fluid/gfluidkernel.hpp
similarity index 100%
rename from libs/opencv/include/gapi/fluid/gfluidkernel.hpp
rename to libs/opencv/include/opencv2/gapi/fluid/gfluidkernel.hpp
diff --git a/libs/opencv/include/gapi/fluid/imgproc.hpp b/libs/opencv/include/opencv2/gapi/fluid/imgproc.hpp
similarity index 100%
rename from libs/opencv/include/gapi/fluid/imgproc.hpp
rename to libs/opencv/include/opencv2/gapi/fluid/imgproc.hpp
diff --git a/libs/opencv/include/gapi/garg.hpp b/libs/opencv/include/opencv2/gapi/garg.hpp
similarity index 100%
rename from libs/opencv/include/gapi/garg.hpp
rename to libs/opencv/include/opencv2/gapi/garg.hpp
diff --git a/libs/opencv/include/gapi/garray.hpp b/libs/opencv/include/opencv2/gapi/garray.hpp
similarity index 100%
rename from libs/opencv/include/gapi/garray.hpp
rename to libs/opencv/include/opencv2/gapi/garray.hpp
diff --git a/libs/opencv/include/gapi/gasync_context.hpp b/libs/opencv/include/opencv2/gapi/gasync_context.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gasync_context.hpp
rename to libs/opencv/include/opencv2/gapi/gasync_context.hpp
diff --git a/libs/opencv/include/gapi/gcall.hpp b/libs/opencv/include/opencv2/gapi/gcall.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gcall.hpp
rename to libs/opencv/include/opencv2/gapi/gcall.hpp
diff --git a/libs/opencv/include/gapi/gcommon.hpp b/libs/opencv/include/opencv2/gapi/gcommon.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gcommon.hpp
rename to libs/opencv/include/opencv2/gapi/gcommon.hpp
diff --git a/libs/opencv/include/gapi/gcompiled.hpp b/libs/opencv/include/opencv2/gapi/gcompiled.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gcompiled.hpp
rename to libs/opencv/include/opencv2/gapi/gcompiled.hpp
diff --git a/libs/opencv/include/gapi/gcompiled_async.hpp b/libs/opencv/include/opencv2/gapi/gcompiled_async.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gcompiled_async.hpp
rename to libs/opencv/include/opencv2/gapi/gcompiled_async.hpp
diff --git a/libs/opencv/include/gapi/gcompoundkernel.hpp b/libs/opencv/include/opencv2/gapi/gcompoundkernel.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gcompoundkernel.hpp
rename to libs/opencv/include/opencv2/gapi/gcompoundkernel.hpp
diff --git a/libs/opencv/include/gapi/gcomputation.hpp b/libs/opencv/include/opencv2/gapi/gcomputation.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gcomputation.hpp
rename to libs/opencv/include/opencv2/gapi/gcomputation.hpp
diff --git a/libs/opencv/include/gapi/gcomputation_async.hpp b/libs/opencv/include/opencv2/gapi/gcomputation_async.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gcomputation_async.hpp
rename to libs/opencv/include/opencv2/gapi/gcomputation_async.hpp
diff --git a/libs/opencv/include/gapi/gframe.hpp b/libs/opencv/include/opencv2/gapi/gframe.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gframe.hpp
rename to libs/opencv/include/opencv2/gapi/gframe.hpp
diff --git a/libs/opencv/include/gapi/gkernel.hpp b/libs/opencv/include/opencv2/gapi/gkernel.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gkernel.hpp
rename to libs/opencv/include/opencv2/gapi/gkernel.hpp
diff --git a/libs/opencv/include/gapi/gmat.hpp b/libs/opencv/include/opencv2/gapi/gmat.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gmat.hpp
rename to libs/opencv/include/opencv2/gapi/gmat.hpp
diff --git a/libs/opencv/include/gapi/gmetaarg.hpp b/libs/opencv/include/opencv2/gapi/gmetaarg.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gmetaarg.hpp
rename to libs/opencv/include/opencv2/gapi/gmetaarg.hpp
diff --git a/libs/opencv/include/gapi/gopaque.hpp b/libs/opencv/include/opencv2/gapi/gopaque.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gopaque.hpp
rename to libs/opencv/include/opencv2/gapi/gopaque.hpp
diff --git a/libs/opencv/include/gapi/gproto.hpp b/libs/opencv/include/opencv2/gapi/gproto.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gproto.hpp
rename to libs/opencv/include/opencv2/gapi/gproto.hpp
diff --git a/libs/opencv/include/gapi/gpu/core.hpp b/libs/opencv/include/opencv2/gapi/gpu/core.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gpu/core.hpp
rename to libs/opencv/include/opencv2/gapi/gpu/core.hpp
diff --git a/libs/opencv/include/gapi/gpu/ggpukernel.hpp b/libs/opencv/include/opencv2/gapi/gpu/ggpukernel.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gpu/ggpukernel.hpp
rename to libs/opencv/include/opencv2/gapi/gpu/ggpukernel.hpp
diff --git a/libs/opencv/include/gapi/gpu/imgproc.hpp b/libs/opencv/include/opencv2/gapi/gpu/imgproc.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gpu/imgproc.hpp
rename to libs/opencv/include/opencv2/gapi/gpu/imgproc.hpp
diff --git a/libs/opencv/include/gapi/gscalar.hpp b/libs/opencv/include/opencv2/gapi/gscalar.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gscalar.hpp
rename to libs/opencv/include/opencv2/gapi/gscalar.hpp
diff --git a/libs/opencv/include/gapi/gstreaming.hpp b/libs/opencv/include/opencv2/gapi/gstreaming.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gstreaming.hpp
rename to libs/opencv/include/opencv2/gapi/gstreaming.hpp
diff --git a/libs/opencv/include/gapi/gtransform.hpp b/libs/opencv/include/opencv2/gapi/gtransform.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gtransform.hpp
rename to libs/opencv/include/opencv2/gapi/gtransform.hpp
diff --git a/libs/opencv/include/gapi/gtype_traits.hpp b/libs/opencv/include/opencv2/gapi/gtype_traits.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gtype_traits.hpp
rename to libs/opencv/include/opencv2/gapi/gtype_traits.hpp
diff --git a/libs/opencv/include/gapi/gtyped.hpp b/libs/opencv/include/opencv2/gapi/gtyped.hpp
similarity index 100%
rename from libs/opencv/include/gapi/gtyped.hpp
rename to libs/opencv/include/opencv2/gapi/gtyped.hpp
diff --git a/libs/opencv/include/gapi/imgproc.hpp b/libs/opencv/include/opencv2/gapi/imgproc.hpp
similarity index 100%
rename from libs/opencv/include/gapi/imgproc.hpp
rename to libs/opencv/include/opencv2/gapi/imgproc.hpp
diff --git a/libs/opencv/include/gapi/infer.hpp b/libs/opencv/include/opencv2/gapi/infer.hpp
similarity index 100%
rename from libs/opencv/include/gapi/infer.hpp
rename to libs/opencv/include/opencv2/gapi/infer.hpp
diff --git a/libs/opencv/include/gapi/infer/bindings_ie.hpp b/libs/opencv/include/opencv2/gapi/infer/bindings_ie.hpp
similarity index 100%
rename from libs/opencv/include/gapi/infer/bindings_ie.hpp
rename to libs/opencv/include/opencv2/gapi/infer/bindings_ie.hpp
diff --git a/libs/opencv/include/gapi/infer/ie.hpp b/libs/opencv/include/opencv2/gapi/infer/ie.hpp
similarity index 100%
rename from libs/opencv/include/gapi/infer/ie.hpp
rename to libs/opencv/include/opencv2/gapi/infer/ie.hpp
diff --git a/libs/opencv/include/gapi/infer/onnx.hpp b/libs/opencv/include/opencv2/gapi/infer/onnx.hpp
similarity index 100%
rename from libs/opencv/include/gapi/infer/onnx.hpp
rename to libs/opencv/include/opencv2/gapi/infer/onnx.hpp
diff --git a/libs/opencv/include/gapi/infer/parsers.hpp b/libs/opencv/include/opencv2/gapi/infer/parsers.hpp
similarity index 100%
rename from libs/opencv/include/gapi/infer/parsers.hpp
rename to libs/opencv/include/opencv2/gapi/infer/parsers.hpp
diff --git a/libs/opencv/include/gapi/media.hpp b/libs/opencv/include/opencv2/gapi/media.hpp
similarity index 100%
rename from libs/opencv/include/gapi/media.hpp
rename to libs/opencv/include/opencv2/gapi/media.hpp
diff --git a/libs/opencv/include/gapi/ocl/core.hpp b/libs/opencv/include/opencv2/gapi/ocl/core.hpp
similarity index 100%
rename from libs/opencv/include/gapi/ocl/core.hpp
rename to libs/opencv/include/opencv2/gapi/ocl/core.hpp
diff --git a/libs/opencv/include/gapi/ocl/goclkernel.hpp b/libs/opencv/include/opencv2/gapi/ocl/goclkernel.hpp
similarity index 100%
rename from libs/opencv/include/gapi/ocl/goclkernel.hpp
rename to libs/opencv/include/opencv2/gapi/ocl/goclkernel.hpp
diff --git a/libs/opencv/include/gapi/ocl/imgproc.hpp b/libs/opencv/include/opencv2/gapi/ocl/imgproc.hpp
similarity index 100%
rename from libs/opencv/include/gapi/ocl/imgproc.hpp
rename to libs/opencv/include/opencv2/gapi/ocl/imgproc.hpp
diff --git a/libs/opencv/include/gapi/opencv_includes.hpp b/libs/opencv/include/opencv2/gapi/opencv_includes.hpp
similarity index 100%
rename from libs/opencv/include/gapi/opencv_includes.hpp
rename to libs/opencv/include/opencv2/gapi/opencv_includes.hpp
diff --git a/libs/opencv/include/gapi/operators.hpp b/libs/opencv/include/opencv2/gapi/operators.hpp
similarity index 100%
rename from libs/opencv/include/gapi/operators.hpp
rename to libs/opencv/include/opencv2/gapi/operators.hpp
diff --git a/libs/opencv/include/gapi/own/assert.hpp b/libs/opencv/include/opencv2/gapi/own/assert.hpp
similarity index 100%
rename from libs/opencv/include/gapi/own/assert.hpp
rename to libs/opencv/include/opencv2/gapi/own/assert.hpp
diff --git a/libs/opencv/include/gapi/own/convert.hpp b/libs/opencv/include/opencv2/gapi/own/convert.hpp
similarity index 100%
rename from libs/opencv/include/gapi/own/convert.hpp
rename to libs/opencv/include/opencv2/gapi/own/convert.hpp
diff --git a/libs/opencv/include/gapi/own/cvdefs.hpp b/libs/opencv/include/opencv2/gapi/own/cvdefs.hpp
similarity index 100%
rename from libs/opencv/include/gapi/own/cvdefs.hpp
rename to libs/opencv/include/opencv2/gapi/own/cvdefs.hpp
diff --git a/libs/opencv/include/gapi/own/exports.hpp b/libs/opencv/include/opencv2/gapi/own/exports.hpp
similarity index 100%
rename from libs/opencv/include/gapi/own/exports.hpp
rename to libs/opencv/include/opencv2/gapi/own/exports.hpp
diff --git a/libs/opencv/include/gapi/own/mat.hpp b/libs/opencv/include/opencv2/gapi/own/mat.hpp
similarity index 100%
rename from libs/opencv/include/gapi/own/mat.hpp
rename to libs/opencv/include/opencv2/gapi/own/mat.hpp
diff --git a/libs/opencv/include/gapi/own/saturate.hpp b/libs/opencv/include/opencv2/gapi/own/saturate.hpp
similarity index 100%
rename from libs/opencv/include/gapi/own/saturate.hpp
rename to libs/opencv/include/opencv2/gapi/own/saturate.hpp
diff --git a/libs/opencv/include/gapi/own/scalar.hpp b/libs/opencv/include/opencv2/gapi/own/scalar.hpp
similarity index 100%
rename from libs/opencv/include/gapi/own/scalar.hpp
rename to libs/opencv/include/opencv2/gapi/own/scalar.hpp
diff --git a/libs/opencv/include/gapi/own/types.hpp b/libs/opencv/include/opencv2/gapi/own/types.hpp
similarity index 100%
rename from libs/opencv/include/gapi/own/types.hpp
rename to libs/opencv/include/opencv2/gapi/own/types.hpp
diff --git a/libs/opencv/include/gapi/plaidml/core.hpp b/libs/opencv/include/opencv2/gapi/plaidml/core.hpp
similarity index 100%
rename from libs/opencv/include/gapi/plaidml/core.hpp
rename to libs/opencv/include/opencv2/gapi/plaidml/core.hpp
diff --git a/libs/opencv/include/gapi/plaidml/gplaidmlkernel.hpp b/libs/opencv/include/opencv2/gapi/plaidml/gplaidmlkernel.hpp
similarity index 100%
rename from libs/opencv/include/gapi/plaidml/gplaidmlkernel.hpp
rename to libs/opencv/include/opencv2/gapi/plaidml/gplaidmlkernel.hpp
diff --git a/libs/opencv/include/gapi/plaidml/plaidml.hpp b/libs/opencv/include/opencv2/gapi/plaidml/plaidml.hpp
similarity index 100%
rename from libs/opencv/include/gapi/plaidml/plaidml.hpp
rename to libs/opencv/include/opencv2/gapi/plaidml/plaidml.hpp
diff --git a/libs/opencv/include/gapi/python/python.hpp b/libs/opencv/include/opencv2/gapi/python/python.hpp
similarity index 100%
rename from libs/opencv/include/gapi/python/python.hpp
rename to libs/opencv/include/opencv2/gapi/python/python.hpp
diff --git a/libs/opencv/include/gapi/render.hpp b/libs/opencv/include/opencv2/gapi/render.hpp
similarity index 100%
rename from libs/opencv/include/gapi/render.hpp
rename to libs/opencv/include/opencv2/gapi/render.hpp
diff --git a/libs/opencv/include/gapi/render/render.hpp b/libs/opencv/include/opencv2/gapi/render/render.hpp
similarity index 100%
rename from libs/opencv/include/gapi/render/render.hpp
rename to libs/opencv/include/opencv2/gapi/render/render.hpp
diff --git a/libs/opencv/include/gapi/render/render_types.hpp b/libs/opencv/include/opencv2/gapi/render/render_types.hpp
similarity index 100%
rename from libs/opencv/include/gapi/render/render_types.hpp
rename to libs/opencv/include/opencv2/gapi/render/render_types.hpp
diff --git a/libs/opencv/include/gapi/rmat.hpp b/libs/opencv/include/opencv2/gapi/rmat.hpp
similarity index 100%
rename from libs/opencv/include/gapi/rmat.hpp
rename to libs/opencv/include/opencv2/gapi/rmat.hpp
diff --git a/libs/opencv/include/gapi/s11n.hpp b/libs/opencv/include/opencv2/gapi/s11n.hpp
similarity index 100%
rename from libs/opencv/include/gapi/s11n.hpp
rename to libs/opencv/include/opencv2/gapi/s11n.hpp
diff --git a/libs/opencv/include/gapi/s11n/base.hpp b/libs/opencv/include/opencv2/gapi/s11n/base.hpp
similarity index 100%
rename from libs/opencv/include/gapi/s11n/base.hpp
rename to libs/opencv/include/opencv2/gapi/s11n/base.hpp
diff --git a/libs/opencv/include/gapi/stereo.hpp b/libs/opencv/include/opencv2/gapi/stereo.hpp
similarity index 100%
rename from libs/opencv/include/gapi/stereo.hpp
rename to libs/opencv/include/opencv2/gapi/stereo.hpp
diff --git a/libs/opencv/include/gapi/streaming/cap.hpp b/libs/opencv/include/opencv2/gapi/streaming/cap.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/cap.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/cap.hpp
diff --git a/libs/opencv/include/gapi/streaming/desync.hpp b/libs/opencv/include/opencv2/gapi/streaming/desync.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/desync.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/desync.hpp
diff --git a/libs/opencv/include/gapi/streaming/format.hpp b/libs/opencv/include/opencv2/gapi/streaming/format.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/format.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/format.hpp
diff --git a/libs/opencv/include/gapi/streaming/gstreamer/gstreamerpipeline.hpp b/libs/opencv/include/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/gstreamer/gstreamerpipeline.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp
diff --git a/libs/opencv/include/gapi/streaming/gstreamer/gstreamersource.hpp b/libs/opencv/include/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/gstreamer/gstreamersource.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp
diff --git a/libs/opencv/include/gapi/streaming/meta.hpp b/libs/opencv/include/opencv2/gapi/streaming/meta.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/meta.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/meta.hpp
diff --git a/libs/opencv/include/gapi/streaming/onevpl/cfg_params.hpp b/libs/opencv/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/onevpl/cfg_params.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp
diff --git a/libs/opencv/include/gapi/streaming/onevpl/data_provider_interface.hpp b/libs/opencv/include/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/onevpl/data_provider_interface.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp
diff --git a/libs/opencv/include/gapi/streaming/onevpl/device_selector_interface.hpp b/libs/opencv/include/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/onevpl/device_selector_interface.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp
diff --git a/libs/opencv/include/gapi/streaming/onevpl/source.hpp b/libs/opencv/include/opencv2/gapi/streaming/onevpl/source.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/onevpl/source.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/onevpl/source.hpp
diff --git a/libs/opencv/include/gapi/streaming/source.hpp b/libs/opencv/include/opencv2/gapi/streaming/source.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/source.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/source.hpp
diff --git a/libs/opencv/include/gapi/streaming/sync.hpp b/libs/opencv/include/opencv2/gapi/streaming/sync.hpp
similarity index 100%
rename from libs/opencv/include/gapi/streaming/sync.hpp
rename to libs/opencv/include/opencv2/gapi/streaming/sync.hpp
diff --git a/libs/opencv/include/gapi/util/any.hpp b/libs/opencv/include/opencv2/gapi/util/any.hpp
similarity index 100%
rename from libs/opencv/include/gapi/util/any.hpp
rename to libs/opencv/include/opencv2/gapi/util/any.hpp
diff --git a/libs/opencv/include/gapi/util/compiler_hints.hpp b/libs/opencv/include/opencv2/gapi/util/compiler_hints.hpp
similarity index 100%
rename from libs/opencv/include/gapi/util/compiler_hints.hpp
rename to libs/opencv/include/opencv2/gapi/util/compiler_hints.hpp
diff --git a/libs/opencv/include/gapi/util/copy_through_move.hpp b/libs/opencv/include/opencv2/gapi/util/copy_through_move.hpp
similarity index 100%
rename from libs/opencv/include/gapi/util/copy_through_move.hpp
rename to libs/opencv/include/opencv2/gapi/util/copy_through_move.hpp
diff --git a/libs/opencv/include/gapi/util/optional.hpp b/libs/opencv/include/opencv2/gapi/util/optional.hpp
similarity index 100%
rename from libs/opencv/include/gapi/util/optional.hpp
rename to libs/opencv/include/opencv2/gapi/util/optional.hpp
diff --git a/libs/opencv/include/gapi/util/throw.hpp b/libs/opencv/include/opencv2/gapi/util/throw.hpp
similarity index 100%
rename from libs/opencv/include/gapi/util/throw.hpp
rename to libs/opencv/include/opencv2/gapi/util/throw.hpp
diff --git a/libs/opencv/include/gapi/util/type_traits.hpp b/libs/opencv/include/opencv2/gapi/util/type_traits.hpp
similarity index 100%
rename from libs/opencv/include/gapi/util/type_traits.hpp
rename to libs/opencv/include/opencv2/gapi/util/type_traits.hpp
diff --git a/libs/opencv/include/gapi/util/util.hpp b/libs/opencv/include/opencv2/gapi/util/util.hpp
similarity index 100%
rename from libs/opencv/include/gapi/util/util.hpp
rename to libs/opencv/include/opencv2/gapi/util/util.hpp
diff --git a/libs/opencv/include/gapi/util/variant.hpp b/libs/opencv/include/opencv2/gapi/util/variant.hpp
similarity index 100%
rename from libs/opencv/include/gapi/util/variant.hpp
rename to libs/opencv/include/opencv2/gapi/util/variant.hpp
diff --git a/libs/opencv/include/gapi/video.hpp b/libs/opencv/include/opencv2/gapi/video.hpp
similarity index 100%
rename from libs/opencv/include/gapi/video.hpp
rename to libs/opencv/include/opencv2/gapi/video.hpp
diff --git a/libs/opencv/include/highgui.hpp b/libs/opencv/include/opencv2/highgui.hpp
similarity index 100%
rename from libs/opencv/include/highgui.hpp
rename to libs/opencv/include/opencv2/highgui.hpp
diff --git a/libs/opencv/include/highgui/highgui.hpp b/libs/opencv/include/opencv2/highgui/highgui.hpp
similarity index 100%
rename from libs/opencv/include/highgui/highgui.hpp
rename to libs/opencv/include/opencv2/highgui/highgui.hpp
diff --git a/libs/opencv/include/highgui/highgui_c.h b/libs/opencv/include/opencv2/highgui/highgui_c.h
similarity index 100%
rename from libs/opencv/include/highgui/highgui_c.h
rename to libs/opencv/include/opencv2/highgui/highgui_c.h
diff --git a/libs/opencv/include/imgcodecs.hpp b/libs/opencv/include/opencv2/imgcodecs.hpp
similarity index 100%
rename from libs/opencv/include/imgcodecs.hpp
rename to libs/opencv/include/opencv2/imgcodecs.hpp
diff --git a/libs/opencv/include/imgcodecs/imgcodecs.hpp b/libs/opencv/include/opencv2/imgcodecs/imgcodecs.hpp
similarity index 100%
rename from libs/opencv/include/imgcodecs/imgcodecs.hpp
rename to libs/opencv/include/opencv2/imgcodecs/imgcodecs.hpp
diff --git a/libs/opencv/include/imgcodecs/imgcodecs_c.h b/libs/opencv/include/opencv2/imgcodecs/imgcodecs_c.h
similarity index 100%
rename from libs/opencv/include/imgcodecs/imgcodecs_c.h
rename to libs/opencv/include/opencv2/imgcodecs/imgcodecs_c.h
diff --git a/libs/opencv/include/imgcodecs/ios.h b/libs/opencv/include/opencv2/imgcodecs/ios.h
similarity index 100%
rename from libs/opencv/include/imgcodecs/ios.h
rename to libs/opencv/include/opencv2/imgcodecs/ios.h
diff --git a/libs/opencv/include/imgcodecs/legacy/constants_c.h b/libs/opencv/include/opencv2/imgcodecs/legacy/constants_c.h
similarity index 100%
rename from libs/opencv/include/imgcodecs/legacy/constants_c.h
rename to libs/opencv/include/opencv2/imgcodecs/legacy/constants_c.h
diff --git a/libs/opencv/include/imgcodecs/macosx.h b/libs/opencv/include/opencv2/imgcodecs/macosx.h
similarity index 100%
rename from libs/opencv/include/imgcodecs/macosx.h
rename to libs/opencv/include/opencv2/imgcodecs/macosx.h
diff --git a/libs/opencv/include/imgproc.hpp b/libs/opencv/include/opencv2/imgproc.hpp
similarity index 100%
rename from libs/opencv/include/imgproc.hpp
rename to libs/opencv/include/opencv2/imgproc.hpp
diff --git a/libs/opencv/include/imgproc/bindings.hpp b/libs/opencv/include/opencv2/imgproc/bindings.hpp
similarity index 100%
rename from libs/opencv/include/imgproc/bindings.hpp
rename to libs/opencv/include/opencv2/imgproc/bindings.hpp
diff --git a/libs/opencv/include/imgproc/detail/gcgraph.hpp b/libs/opencv/include/opencv2/imgproc/detail/gcgraph.hpp
similarity index 100%
rename from libs/opencv/include/imgproc/detail/gcgraph.hpp
rename to libs/opencv/include/opencv2/imgproc/detail/gcgraph.hpp
diff --git a/libs/opencv/include/imgproc/hal/hal.hpp b/libs/opencv/include/opencv2/imgproc/hal/hal.hpp
similarity index 100%
rename from libs/opencv/include/imgproc/hal/hal.hpp
rename to libs/opencv/include/opencv2/imgproc/hal/hal.hpp
diff --git a/libs/opencv/include/imgproc/hal/interface.h b/libs/opencv/include/opencv2/imgproc/hal/interface.h
similarity index 100%
rename from libs/opencv/include/imgproc/hal/interface.h
rename to libs/opencv/include/opencv2/imgproc/hal/interface.h
diff --git a/libs/opencv/include/imgproc/imgproc.hpp b/libs/opencv/include/opencv2/imgproc/imgproc.hpp
similarity index 100%
rename from libs/opencv/include/imgproc/imgproc.hpp
rename to libs/opencv/include/opencv2/imgproc/imgproc.hpp
diff --git a/libs/opencv/include/imgproc/imgproc_c.h b/libs/opencv/include/opencv2/imgproc/imgproc_c.h
similarity index 100%
rename from libs/opencv/include/imgproc/imgproc_c.h
rename to libs/opencv/include/opencv2/imgproc/imgproc_c.h
diff --git a/libs/opencv/include/imgproc/segmentation.hpp b/libs/opencv/include/opencv2/imgproc/segmentation.hpp
similarity index 100%
rename from libs/opencv/include/imgproc/segmentation.hpp
rename to libs/opencv/include/opencv2/imgproc/segmentation.hpp
diff --git a/libs/opencv/include/imgproc/types_c.h b/libs/opencv/include/opencv2/imgproc/types_c.h
similarity index 100%
rename from libs/opencv/include/imgproc/types_c.h
rename to libs/opencv/include/opencv2/imgproc/types_c.h
diff --git a/libs/opencv/include/ml.hpp b/libs/opencv/include/opencv2/ml.hpp
similarity index 100%
rename from libs/opencv/include/ml.hpp
rename to libs/opencv/include/opencv2/ml.hpp
diff --git a/libs/opencv/include/ml/ml.hpp b/libs/opencv/include/opencv2/ml/ml.hpp
similarity index 100%
rename from libs/opencv/include/ml/ml.hpp
rename to libs/opencv/include/opencv2/ml/ml.hpp
diff --git a/libs/opencv/include/ml/ml.inl.hpp b/libs/opencv/include/opencv2/ml/ml.inl.hpp
similarity index 100%
rename from libs/opencv/include/ml/ml.inl.hpp
rename to libs/opencv/include/opencv2/ml/ml.inl.hpp
diff --git a/libs/opencv/include/objdetect.hpp b/libs/opencv/include/opencv2/objdetect.hpp
similarity index 100%
rename from libs/opencv/include/objdetect.hpp
rename to libs/opencv/include/opencv2/objdetect.hpp
diff --git a/libs/opencv/include/objdetect/detection_based_tracker.hpp b/libs/opencv/include/opencv2/objdetect/detection_based_tracker.hpp
similarity index 100%
rename from libs/opencv/include/objdetect/detection_based_tracker.hpp
rename to libs/opencv/include/opencv2/objdetect/detection_based_tracker.hpp
diff --git a/libs/opencv/include/objdetect/face.hpp b/libs/opencv/include/opencv2/objdetect/face.hpp
similarity index 100%
rename from libs/opencv/include/objdetect/face.hpp
rename to libs/opencv/include/opencv2/objdetect/face.hpp
diff --git a/libs/opencv/include/objdetect/objdetect.hpp b/libs/opencv/include/opencv2/objdetect/objdetect.hpp
similarity index 100%
rename from libs/opencv/include/objdetect/objdetect.hpp
rename to libs/opencv/include/opencv2/objdetect/objdetect.hpp
diff --git a/libs/opencv/include/opencv.hpp b/libs/opencv/include/opencv2/opencv.hpp
similarity index 100%
rename from libs/opencv/include/opencv.hpp
rename to libs/opencv/include/opencv2/opencv.hpp
diff --git a/libs/opencv/include/opencv_modules.hpp b/libs/opencv/include/opencv2/opencv_modules.hpp
similarity index 100%
rename from libs/opencv/include/opencv_modules.hpp
rename to libs/opencv/include/opencv2/opencv_modules.hpp
diff --git a/libs/opencv/include/photo.hpp b/libs/opencv/include/opencv2/photo.hpp
similarity index 100%
rename from libs/opencv/include/photo.hpp
rename to libs/opencv/include/opencv2/photo.hpp
diff --git a/libs/opencv/include/photo/cuda.hpp b/libs/opencv/include/opencv2/photo/cuda.hpp
similarity index 100%
rename from libs/opencv/include/photo/cuda.hpp
rename to libs/opencv/include/opencv2/photo/cuda.hpp
diff --git a/libs/opencv/include/photo/legacy/constants_c.h b/libs/opencv/include/opencv2/photo/legacy/constants_c.h
similarity index 100%
rename from libs/opencv/include/photo/legacy/constants_c.h
rename to libs/opencv/include/opencv2/photo/legacy/constants_c.h
diff --git a/libs/opencv/include/photo/photo.hpp b/libs/opencv/include/opencv2/photo/photo.hpp
similarity index 100%
rename from libs/opencv/include/photo/photo.hpp
rename to libs/opencv/include/opencv2/photo/photo.hpp
diff --git a/libs/opencv/include/stitching.hpp b/libs/opencv/include/opencv2/stitching.hpp
similarity index 100%
rename from libs/opencv/include/stitching.hpp
rename to libs/opencv/include/opencv2/stitching.hpp
diff --git a/libs/opencv/include/stitching/detail/autocalib.hpp b/libs/opencv/include/opencv2/stitching/detail/autocalib.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/autocalib.hpp
rename to libs/opencv/include/opencv2/stitching/detail/autocalib.hpp
diff --git a/libs/opencv/include/stitching/detail/blenders.hpp b/libs/opencv/include/opencv2/stitching/detail/blenders.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/blenders.hpp
rename to libs/opencv/include/opencv2/stitching/detail/blenders.hpp
diff --git a/libs/opencv/include/stitching/detail/camera.hpp b/libs/opencv/include/opencv2/stitching/detail/camera.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/camera.hpp
rename to libs/opencv/include/opencv2/stitching/detail/camera.hpp
diff --git a/libs/opencv/include/stitching/detail/exposure_compensate.hpp b/libs/opencv/include/opencv2/stitching/detail/exposure_compensate.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/exposure_compensate.hpp
rename to libs/opencv/include/opencv2/stitching/detail/exposure_compensate.hpp
diff --git a/libs/opencv/include/stitching/detail/matchers.hpp b/libs/opencv/include/opencv2/stitching/detail/matchers.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/matchers.hpp
rename to libs/opencv/include/opencv2/stitching/detail/matchers.hpp
diff --git a/libs/opencv/include/stitching/detail/motion_estimators.hpp b/libs/opencv/include/opencv2/stitching/detail/motion_estimators.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/motion_estimators.hpp
rename to libs/opencv/include/opencv2/stitching/detail/motion_estimators.hpp
diff --git a/libs/opencv/include/stitching/detail/seam_finders.hpp b/libs/opencv/include/opencv2/stitching/detail/seam_finders.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/seam_finders.hpp
rename to libs/opencv/include/opencv2/stitching/detail/seam_finders.hpp
diff --git a/libs/opencv/include/stitching/detail/timelapsers.hpp b/libs/opencv/include/opencv2/stitching/detail/timelapsers.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/timelapsers.hpp
rename to libs/opencv/include/opencv2/stitching/detail/timelapsers.hpp
diff --git a/libs/opencv/include/stitching/detail/util.hpp b/libs/opencv/include/opencv2/stitching/detail/util.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/util.hpp
rename to libs/opencv/include/opencv2/stitching/detail/util.hpp
diff --git a/libs/opencv/include/stitching/detail/util_inl.hpp b/libs/opencv/include/opencv2/stitching/detail/util_inl.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/util_inl.hpp
rename to libs/opencv/include/opencv2/stitching/detail/util_inl.hpp
diff --git a/libs/opencv/include/stitching/detail/warpers.hpp b/libs/opencv/include/opencv2/stitching/detail/warpers.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/warpers.hpp
rename to libs/opencv/include/opencv2/stitching/detail/warpers.hpp
diff --git a/libs/opencv/include/stitching/detail/warpers_inl.hpp b/libs/opencv/include/opencv2/stitching/detail/warpers_inl.hpp
similarity index 100%
rename from libs/opencv/include/stitching/detail/warpers_inl.hpp
rename to libs/opencv/include/opencv2/stitching/detail/warpers_inl.hpp
diff --git a/libs/opencv/include/stitching/warpers.hpp b/libs/opencv/include/opencv2/stitching/warpers.hpp
similarity index 100%
rename from libs/opencv/include/stitching/warpers.hpp
rename to libs/opencv/include/opencv2/stitching/warpers.hpp
diff --git a/libs/opencv/include/video.hpp b/libs/opencv/include/opencv2/video.hpp
similarity index 100%
rename from libs/opencv/include/video.hpp
rename to libs/opencv/include/opencv2/video.hpp
diff --git a/libs/opencv/include/video/background_segm.hpp b/libs/opencv/include/opencv2/video/background_segm.hpp
similarity index 100%
rename from libs/opencv/include/video/background_segm.hpp
rename to libs/opencv/include/opencv2/video/background_segm.hpp
diff --git a/libs/opencv/include/video/detail/tracking.detail.hpp b/libs/opencv/include/opencv2/video/detail/tracking.detail.hpp
similarity index 100%
rename from libs/opencv/include/video/detail/tracking.detail.hpp
rename to libs/opencv/include/opencv2/video/detail/tracking.detail.hpp
diff --git a/libs/opencv/include/video/legacy/constants_c.h b/libs/opencv/include/opencv2/video/legacy/constants_c.h
similarity index 100%
rename from libs/opencv/include/video/legacy/constants_c.h
rename to libs/opencv/include/opencv2/video/legacy/constants_c.h
diff --git a/libs/opencv/include/video/tracking.hpp b/libs/opencv/include/opencv2/video/tracking.hpp
similarity index 100%
rename from libs/opencv/include/video/tracking.hpp
rename to libs/opencv/include/opencv2/video/tracking.hpp
diff --git a/libs/opencv/include/video/video.hpp b/libs/opencv/include/opencv2/video/video.hpp
similarity index 100%
rename from libs/opencv/include/video/video.hpp
rename to libs/opencv/include/opencv2/video/video.hpp
diff --git a/libs/opencv/include/videoio.hpp b/libs/opencv/include/opencv2/videoio.hpp
similarity index 100%
rename from libs/opencv/include/videoio.hpp
rename to libs/opencv/include/opencv2/videoio.hpp
diff --git a/libs/opencv/include/videoio/cap_ios.h b/libs/opencv/include/opencv2/videoio/cap_ios.h
similarity index 100%
rename from libs/opencv/include/videoio/cap_ios.h
rename to libs/opencv/include/opencv2/videoio/cap_ios.h
diff --git a/libs/opencv/include/videoio/legacy/constants_c.h b/libs/opencv/include/opencv2/videoio/legacy/constants_c.h
similarity index 100%
rename from libs/opencv/include/videoio/legacy/constants_c.h
rename to libs/opencv/include/opencv2/videoio/legacy/constants_c.h
diff --git a/libs/opencv/include/videoio/registry.hpp b/libs/opencv/include/opencv2/videoio/registry.hpp
similarity index 100%
rename from libs/opencv/include/videoio/registry.hpp
rename to libs/opencv/include/opencv2/videoio/registry.hpp
diff --git a/libs/opencv/include/videoio/videoio.hpp b/libs/opencv/include/opencv2/videoio/videoio.hpp
similarity index 100%
rename from libs/opencv/include/videoio/videoio.hpp
rename to libs/opencv/include/opencv2/videoio/videoio.hpp
diff --git a/libs/opencv/include/videoio/videoio_c.h b/libs/opencv/include/opencv2/videoio/videoio_c.h
similarity index 100%
rename from libs/opencv/include/videoio/videoio_c.h
rename to libs/opencv/include/opencv2/videoio/videoio_c.h
diff --git a/libs/opencv/include/world.hpp b/libs/opencv/include/opencv2/world.hpp
similarity index 100%
rename from libs/opencv/include/world.hpp
rename to libs/opencv/include/opencv2/world.hpp
diff --git a/materialscanner/camera.cpp b/materialscanner/camera.cpp
index cb257fac57dec31b40e1d12b7c37384225d281cb..877b865d1d5f38e8c83a1738d41294d141b8620b 100644
--- a/materialscanner/camera.cpp
+++ b/materialscanner/camera.cpp
@@ -3,6 +3,8 @@
 #include<QImage>
 #include<QObject>
 #include "camera.h"
+#include "opencv2/opencv.hpp"
+#include "opencv2/core/mat.hpp"
 //#include<CSampleCaptureEventHandler.h>
 
 
@@ -122,7 +124,19 @@ bool camera::run()
             // Angenommen, die Originaldaten sind ein BayerRG8-Bild
             pRGB24Buffer = objImageDataPtr->ConvertToRGB24(GX_BIT_0_7, GX_RAW2RGB_NEIGHBOUR, true);
 
-            QImage* image = new QImage(objImageDataPtr->GetWidth(), objImageDataPtr->GetHeight(), QImage::Format_ARGB32);
+            int width = objImageDataPtr->GetWidth();
+            int height = objImageDataPtr->GetHeight();
+
+            // Welche konvertierungsmatrix braucht man?
+            cv::Mat openCvImage(height, width, CV_16UC1, pRGB24Buffer);
+            openCvImage.convertTo(openCvImage, CV_8UC1);
+
+            QImage qImage = QImage(
+                openCvImage.data,
+                width,
+                height,
+                QImage::Format_ARGB32
+            );
         }
         
 
diff --git a/materialscanner/materialscanner.vcxproj b/materialscanner/materialscanner.vcxproj
index 92dad51d3f49c3e6ecf68c97a13790077f2cecb4..540244bc68f1bc2f505523378050ef5e845d3900 100644
--- a/materialscanner/materialscanner.vcxproj
+++ b/materialscanner/materialscanner.vcxproj
@@ -62,22 +62,22 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)\libs\GxIAPICPPEx\lib\x64;$(SolutionDir)\libs\mqtt\paho-c\lib;$(SolutionDir)\libs\mqtt\paho-cpp\lib;$(SolutionDir)\\libs\opencv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>GxIAPICPPEx.lib;paho-mqttpp3.lib;paho-mqtt3a.lib;opencv_world454d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)\libs\opencv\lib;$(SolutionDir)\libs\GxIAPICPPEx\lib\x64;$(SolutionDir)\libs\mqtt\paho-c\lib;$(SolutionDir)\libs\mqtt\paho-cpp\lib;$(SolutionDir)\\libs\opencv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opencv_world455d.lib;GxIAPICPPEx.lib;paho-mqttpp3.lib;paho-mqtt3a.lib;opencv_world454d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\libs\GxIAPICPPEx\src\Common;$(SolutionDir)\libs\GxIAPICPPEx\inc;$(SolutionDir)\libs\mqtt\paho-c\include;$(SolutionDir)\libs\mqtt\paho-cpp\include;$(SolutionDir)\libs\opencv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\opencv\include;$(SolutionDir)\libs\GxIAPICPPEx\src\Common;$(SolutionDir)\libs\GxIAPICPPEx\inc;$(SolutionDir)\libs\mqtt\paho-c\include;$(SolutionDir)\libs\mqtt\paho-cpp\include;$(SolutionDir)\libs\opencv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)\libs\GxIAPICPPEx\lib\x64;$(SolutionDir)\libs\mqtt\paho-c\lib;$(SolutionDir)\libs\mqtt\paho-cpp\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>GxIAPICPPEx.lib;paho-mqttpp3.lib;paho-mqtt3a.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)\libs\opencv\lib;$(SolutionDir)\libs\GxIAPICPPEx\lib\x64;$(SolutionDir)\libs\mqtt\paho-c\lib;$(SolutionDir)\libs\mqtt\paho-cpp\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opencv_world455d.lib;GxIAPICPPEx.lib;paho-mqttpp3.lib;paho-mqtt3a.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\libs\GxIAPICPPEx\src\Common;$(SolutionDir)\libs\GxIAPICPPEx\inc;$(SolutionDir)\libs\mqtt\paho-c\include;$(SolutionDir)\libs\mqtt\paho-cpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\opencv\include;$(SolutionDir)\libs\GxIAPICPPEx\src\Common;$(SolutionDir)\libs\GxIAPICPPEx\inc;$(SolutionDir)\libs\mqtt\paho-c\include;$(SolutionDir)\libs\mqtt\paho-cpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
diff --git a/materialscanner/materialscanner.vcxproj.user b/materialscanner/materialscanner.vcxproj.user
index 04fd4d6f4a59120e07c54ab83190eeaa81eb6fed..70e3e3832ef73975de27d59a341854d775173ad1 100644
--- a/materialscanner/materialscanner.vcxproj.user
+++ b/materialscanner/materialscanner.vcxproj.user
@@ -2,9 +2,9 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup />
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <QtLastBackgroundBuild>2022-04-20T07:56:11.9902122Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-04-20T18:48:58.7305378Z</QtLastBackgroundBuild>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <QtLastBackgroundBuild>2022-04-20T07:56:13.6088372Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-04-20T18:49:05.7243391Z</QtLastBackgroundBuild>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/materialscanner/x64/Debug/materialscanner.log b/materialscanner/x64/Debug/materialscanner.log
index a448c1abe3c5be87f685fd05fd571e299fa108cd..e166472c91e078760844e4bc5aff12fe34d24370 100644
--- a/materialscanner/x64/Debug/materialscanner.log
+++ b/materialscanner/x64/Debug/materialscanner.log
@@ -1,7 +1,2 @@
   Reading Qt configuration (C:/Qt/6.2.4/msvc2019_64/bin/qmake)
-  camera.cpp
-C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x807 that is illegal in the current source character set (codepage 65001).
-C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x1320 that is illegal in the current source character set (codepage 65001).
-C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x143e that is illegal in the current source character set (codepage 65001).
-C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x144f that is illegal in the current source character set (codepage 65001).
   materialscanner.vcxproj -> C:\dev\materialscanner\materialscanner-qt\x64\Debug\materialscanner.exe
diff --git a/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog
index 0ab5fccf8112c936d7768aef1ecd031dab95be16..e7e0b8dd793757c044b7ece55d997f6ba4ddc1ce 100644
Binary files a/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog differ
diff --git a/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog
index 7eb4e40487d2af2d7dbcbae980f699b1bcd82bf9..f9dbd78fc060201c7d710ef79caa53d97d331b3d 100644
Binary files a/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog differ
diff --git a/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog
index 41ccc82292fbfad8a11de756d89a2c82654e91c3..09b655947cb4ecfd4790096c1134ae0d544b13cd 100644
Binary files a/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog differ
diff --git a/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog
index b38cb5ad7197752d60e8b129c079236a86e4bd62..5a58cedb02ebe818fc7d7ef38b867fc532427808 100644
Binary files a/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog differ
diff --git a/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog
index 4401905937678234fa284de2c27aa3bf3eea4d2f..7c0bd1886a746b0c194719ee75ebd7e8d84ce202 100644
Binary files a/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog differ
diff --git a/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog
index 49a5e4d3e3f9056e7c611e661b09b7795e56e375..4e826e2ac4f98dd282194ce4ae7bd565a8813765 100644
Binary files a/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog differ
diff --git a/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog b/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog
index 43884b2384da5f3964337e49e24678639d19789c..a65a0dfadcb40842549ad69d18e409b0e1104305 100644
Binary files a/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog differ
diff --git a/materialscanner/x64/Debug/materialscanner.tlog/unsuccessfulbuild b/materialscanner/x64/Debug/materialscanner.tlog/unsuccessfulbuild
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/materialscanner/x64/Debug/qmake/temp/.qmake.stash b/materialscanner/x64/Debug/qmake/temp/.qmake.stash
index 25ca1a2f95041fc2f9312bbc98cff0d3fe4a3076..0341ac07043af0f5b1d804cfa8fd6aa86c4d7958 100644
--- a/materialscanner/x64/Debug/qmake/temp/.qmake.stash
+++ b/materialscanner/x64/Debug/qmake/temp/.qmake.stash
@@ -5,3 +5,23 @@ QMAKE_CXX.COMPILER_MACROS = \
     QT_COMPILER_STDCXX \
     QMAKE_MSC_VER \
     QMAKE_MSC_FULL_VER
+QMAKE_CXX.INCDIRS = \
+    G:\\dev\\projects\\materialscanner\\libs\\GxIAPICPPEx\\inc \
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\include" \
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\atlmfc\\include" \
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\VS\\include" \
+    "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\ucrt" \
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\VS\\UnitTest\\include" \
+    "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\um" \
+    "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\shared" \
+    "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\winrt" \
+    "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\cppwinrt" \
+    "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.8\\Include\\um"
+QMAKE_CXX.LIBDIRS = \
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64" \
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\atlmfc\\lib\\x64" \
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\VS\\lib\\x64" \
+    "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.19041.0\\ucrt\\x64" \
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\VS\\UnitTest\\lib" \
+    "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.19041.0\\um\\x64" \
+    "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.8\\lib\\um\\x64"
diff --git a/materialscanner/x64/Debug/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx b/materialscanner/x64/Debug/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx
deleted file mode 100644
index d1fe9f422b0e060d5e2c6e1b9057f2b165c592e1..0000000000000000000000000000000000000000
--- a/materialscanner/x64/Debug/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx
+++ /dev/null
@@ -1 +0,0 @@
-C:\Users\Jan\AppData\Local\Temp\kdzyfmt1.sud.designtime.props
diff --git a/materialscanner/x64/Debug/qt_work.log b/materialscanner/x64/Debug/qt_work.log
index 0d4f8e735be63a382e4b8da15f494e3068b906ea..835e8dbb33afbad10cc7e306dc216d40239ec85a 100644
Binary files a/materialscanner/x64/Debug/qt_work.log and b/materialscanner/x64/Debug/qt_work.log differ
diff --git a/materialscanner/x64/Debug/vc142.pdb b/materialscanner/x64/Debug/vc142.pdb
index fec6cc2ba83bc43e04ccbf353394f07daaaed16e..8c14903d33623b142a0aa1e6cdf825683e9012bd 100644
Binary files a/materialscanner/x64/Debug/vc142.pdb and b/materialscanner/x64/Debug/vc142.pdb differ
diff --git a/x64/Debug/materialscanner.ilk b/x64/Debug/materialscanner.ilk
index 5129f0e402b60ed9564a033523e6f25f0cb66b23..3da648df16a6a7c1250db4208ab2fb61031da1ed 100644
Binary files a/x64/Debug/materialscanner.ilk and b/x64/Debug/materialscanner.ilk differ
diff --git a/x64/Debug/materialscanner.pdb b/x64/Debug/materialscanner.pdb
index 7b209e19848a35b08d8f8eaf5f72188fe2d055b0..584e97fc7544a61cddc811bc37ffbb63a53cf860 100644
Binary files a/x64/Debug/materialscanner.pdb and b/x64/Debug/materialscanner.pdb differ
diff --git a/x64/Debug/opencv_world455.dll b/x64/Debug/opencv_world455.dll
index 492909088bf5d739094aa04c70494616c11732a0..a45a4e4d5e6118f4eb4d5b2a13eabda7230e6420 100644
Binary files a/x64/Debug/opencv_world455.dll and b/x64/Debug/opencv_world455.dll differ