diff --git a/modules/tracking/doc/tracking.rst b/modules/tracking/doc/tracking.rst
index 8ad9fd56a..5701aba04 100644
--- a/modules/tracking/doc/tracking.rst
+++ b/modules/tracking/doc/tracking.rst
@@ -1,5 +1,6 @@
-Tracking API
-============
+******************************************
+tracking. Tracking API
+******************************************
 
 .. highlight:: cpp
 
diff --git a/modules/ximgproc/doc/structured_edge_detection.rst b/modules/ximgproc/doc/structured_edge_detection.rst
index 55848b8b0..912d3c6ce 100644
--- a/modules/ximgproc/doc/structured_edge_detection.rst
+++ b/modules/ximgproc/doc/structured_edge_detection.rst
@@ -50,8 +50,8 @@ StructuredEdgeDetection::detectEdges
 
 .. seealso::
 
-    :ocv:class:`Sobel`,
-    :ocv:class:`Canny`
+    :ocv:func:`Sobel`,
+    :ocv:func:`Canny`
 
 createStructuredEdgeDetection
 +++++++++++++++++++++++++++++
diff --git a/modules/ximgproc/doc/ximgproc.rst b/modules/ximgproc/doc/ximgproc.rst
index d5554ce22..45586563f 100644
--- a/modules/ximgproc/doc/ximgproc.rst
+++ b/modules/ximgproc/doc/ximgproc.rst
@@ -7,5 +7,5 @@ ximgproc. Extended image processing module.
 .. toctree::
     :maxdepth: 2
 
-    edge_aware_filters
     structured_edge_detection
+    edge_aware_filters
diff --git a/modules/ximgproc/test/test_main.cpp b/modules/ximgproc/test/test_main.cpp
index a9bab67d6..6f9ac2e0d 100644
--- a/modules/ximgproc/test/test_main.cpp
+++ b/modules/ximgproc/test/test_main.cpp
@@ -1,3 +1,3 @@
 #include "test_precomp.hpp"
 
-CV_TEST_MAIN("ximpgroc")
+CV_TEST_MAIN("")
diff --git a/modules/ximgproc/test/test_structured_edge_detection.cpp b/modules/ximgproc/test/test_structured_edge_detection.cpp
index c022ac54f..8382212e0 100644
--- a/modules/ximgproc/test/test_structured_edge_detection.cpp
+++ b/modules/ximgproc/test/test_structured_edge_detection.cpp
@@ -5,10 +5,11 @@ namespace cvtest
 
 TEST(ximpgroc_StructuredEdgeDetection, regression)
 {
-    cv::String dir = cvtest::TS::ptr()->get_data_path();
+    cv::String subfolder = "cv/ximgproc/";
+    cv::String dir = cvtest::TS::ptr()->get_data_path() + subfolder;
     int nTests = 12;
     float threshold = 0.01f;
-
+    
     cv::String modelName = dir + "model.yml.gz";
     cv::Ptr<cv::ximgproc::StructuredEdgeDetection> pDollar =
         cv::ximgproc::createStructuredEdgeDetection(modelName);
@@ -17,6 +18,7 @@ TEST(ximpgroc_StructuredEdgeDetection, regression)
     {
         cv::String srcName = dir + cv::format( "sources/%02d.png", i + 1);
         cv::Mat src = cv::imread( srcName, 1 );
+        ASSERT_TRUE(!src.empty());
 
         cv::String previousResultName = dir + cv::format( "results/%02d.png", i + 1 );
         cv::Mat previousResult = cv::imread( previousResultName, 0 );
diff --git a/modules/ximgproc/testdata/model.yml.gz b/modules/ximgproc/testdata/ximgproc/model.yml.gz
similarity index 100%
rename from modules/ximgproc/testdata/model.yml.gz
rename to modules/ximgproc/testdata/ximgproc/model.yml.gz
diff --git a/modules/ximgproc/testdata/results/01.png b/modules/ximgproc/testdata/ximgproc/results/01.png
similarity index 100%
rename from modules/ximgproc/testdata/results/01.png
rename to modules/ximgproc/testdata/ximgproc/results/01.png
diff --git a/modules/ximgproc/testdata/results/02.png b/modules/ximgproc/testdata/ximgproc/results/02.png
similarity index 100%
rename from modules/ximgproc/testdata/results/02.png
rename to modules/ximgproc/testdata/ximgproc/results/02.png
diff --git a/modules/ximgproc/testdata/results/03.png b/modules/ximgproc/testdata/ximgproc/results/03.png
similarity index 100%
rename from modules/ximgproc/testdata/results/03.png
rename to modules/ximgproc/testdata/ximgproc/results/03.png
diff --git a/modules/ximgproc/testdata/results/04.png b/modules/ximgproc/testdata/ximgproc/results/04.png
similarity index 100%
rename from modules/ximgproc/testdata/results/04.png
rename to modules/ximgproc/testdata/ximgproc/results/04.png
diff --git a/modules/ximgproc/testdata/results/05.png b/modules/ximgproc/testdata/ximgproc/results/05.png
similarity index 100%
rename from modules/ximgproc/testdata/results/05.png
rename to modules/ximgproc/testdata/ximgproc/results/05.png
diff --git a/modules/ximgproc/testdata/results/06.png b/modules/ximgproc/testdata/ximgproc/results/06.png
similarity index 100%
rename from modules/ximgproc/testdata/results/06.png
rename to modules/ximgproc/testdata/ximgproc/results/06.png
diff --git a/modules/ximgproc/testdata/results/07.png b/modules/ximgproc/testdata/ximgproc/results/07.png
similarity index 100%
rename from modules/ximgproc/testdata/results/07.png
rename to modules/ximgproc/testdata/ximgproc/results/07.png
diff --git a/modules/ximgproc/testdata/results/08.png b/modules/ximgproc/testdata/ximgproc/results/08.png
similarity index 100%
rename from modules/ximgproc/testdata/results/08.png
rename to modules/ximgproc/testdata/ximgproc/results/08.png
diff --git a/modules/ximgproc/testdata/results/09.png b/modules/ximgproc/testdata/ximgproc/results/09.png
similarity index 100%
rename from modules/ximgproc/testdata/results/09.png
rename to modules/ximgproc/testdata/ximgproc/results/09.png
diff --git a/modules/ximgproc/testdata/results/10.png b/modules/ximgproc/testdata/ximgproc/results/10.png
similarity index 100%
rename from modules/ximgproc/testdata/results/10.png
rename to modules/ximgproc/testdata/ximgproc/results/10.png
diff --git a/modules/ximgproc/testdata/results/11.png b/modules/ximgproc/testdata/ximgproc/results/11.png
similarity index 100%
rename from modules/ximgproc/testdata/results/11.png
rename to modules/ximgproc/testdata/ximgproc/results/11.png
diff --git a/modules/ximgproc/testdata/results/12.png b/modules/ximgproc/testdata/ximgproc/results/12.png
similarity index 100%
rename from modules/ximgproc/testdata/results/12.png
rename to modules/ximgproc/testdata/ximgproc/results/12.png
diff --git a/modules/ximgproc/testdata/sources/01.png b/modules/ximgproc/testdata/ximgproc/sources/01.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/01.png
rename to modules/ximgproc/testdata/ximgproc/sources/01.png
diff --git a/modules/ximgproc/testdata/sources/02.png b/modules/ximgproc/testdata/ximgproc/sources/02.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/02.png
rename to modules/ximgproc/testdata/ximgproc/sources/02.png
diff --git a/modules/ximgproc/testdata/sources/03.png b/modules/ximgproc/testdata/ximgproc/sources/03.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/03.png
rename to modules/ximgproc/testdata/ximgproc/sources/03.png
diff --git a/modules/ximgproc/testdata/sources/04.png b/modules/ximgproc/testdata/ximgproc/sources/04.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/04.png
rename to modules/ximgproc/testdata/ximgproc/sources/04.png
diff --git a/modules/ximgproc/testdata/sources/05.png b/modules/ximgproc/testdata/ximgproc/sources/05.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/05.png
rename to modules/ximgproc/testdata/ximgproc/sources/05.png
diff --git a/modules/ximgproc/testdata/sources/06.png b/modules/ximgproc/testdata/ximgproc/sources/06.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/06.png
rename to modules/ximgproc/testdata/ximgproc/sources/06.png
diff --git a/modules/ximgproc/testdata/sources/07.png b/modules/ximgproc/testdata/ximgproc/sources/07.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/07.png
rename to modules/ximgproc/testdata/ximgproc/sources/07.png
diff --git a/modules/ximgproc/testdata/sources/08.png b/modules/ximgproc/testdata/ximgproc/sources/08.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/08.png
rename to modules/ximgproc/testdata/ximgproc/sources/08.png
diff --git a/modules/ximgproc/testdata/sources/09.png b/modules/ximgproc/testdata/ximgproc/sources/09.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/09.png
rename to modules/ximgproc/testdata/ximgproc/sources/09.png
diff --git a/modules/ximgproc/testdata/sources/10.png b/modules/ximgproc/testdata/ximgproc/sources/10.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/10.png
rename to modules/ximgproc/testdata/ximgproc/sources/10.png
diff --git a/modules/ximgproc/testdata/sources/11.png b/modules/ximgproc/testdata/ximgproc/sources/11.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/11.png
rename to modules/ximgproc/testdata/ximgproc/sources/11.png
diff --git a/modules/ximgproc/testdata/sources/12.png b/modules/ximgproc/testdata/ximgproc/sources/12.png
similarity index 100%
rename from modules/ximgproc/testdata/sources/12.png
rename to modules/ximgproc/testdata/ximgproc/sources/12.png
diff --git a/modules/xphoto/doc/colorbalance/whitebalance.rst b/modules/xphoto/doc/colorbalance/whitebalance.rst
index a3ff45f2e..81fa4e04e 100644
--- a/modules/xphoto/doc/colorbalance/whitebalance.rst
+++ b/modules/xphoto/doc/colorbalance/whitebalance.rst
@@ -5,21 +5,18 @@ Automatic white balance correction
 
 balanceWhite
 ------------
+
 .. ocv:function:: void balanceWhite(const Mat &src, Mat &dst, const int algorithmType, const float inputMin  = 0.0f, const float inputMax  = 255.0f, const float outputMin = 0.0f, const float outputMax = 255.0f)
 
-The function implements different algorithm of automatic white balance, i.e.
-it tries to map image's white color to perceptual white (this can be violated
-due to specific illumination or camera settings).
+	The function implements different algorithm of automatic white balance, i.e. it tries to map image's white color to perceptual white (this can be violated due to specific illumination or camera settings).
 
-    :param src : source image
-    :param dst : destination image
-    :param algorithmType : type of the algorithm to use. Use WHITE_BALANCE_SIMPLE to perform smart histogram adjustments (ignoring 4% pixels with minimal and maximal values) for each channel.
-    :param inputMin : minimum value in the input image
-    :param inputMax : maximum value in the input image
-    :param outputMin : minimum value in the output image
-    :param outputMax : maximum value in the output image
+    :param algorithmType: type of the algorithm to use. Use WHITE_BALANCE_SIMPLE to perform smart histogram adjustments (ignoring 4% pixels with minimal and maximal values) for each channel.
+    :param inputMin: minimum value in the input image
+    :param inputMax: maximum value in the input image
+    :param outputMin: minimum value in the output image
+    :param outputMax: maximum value in the output image
 
 .. seealso::
 
     :ocv:func:`cvtColor`,
-    :ocv:func:`equalizeHist`
\ No newline at end of file
+    :ocv:func:`equalizeHist`
diff --git a/modules/xphoto/doc/denoising/denoising.rst b/modules/xphoto/doc/denoising/denoising.rst
index 92f569407..74e03c3b2 100644
--- a/modules/xphoto/doc/denoising/denoising.rst
+++ b/modules/xphoto/doc/denoising/denoising.rst
@@ -7,13 +7,13 @@ dctDenoising
 ------------
 .. ocv:function:: void dctDenoising(const Mat &src, Mat &dst, const float sigma)
 
-The function implements simple dct-based denoising,
-link: http://www.ipol.im/pub/art/2011/ys-dct/.
+	The function implements simple dct-based denoising,
+	link: http://www.ipol.im/pub/art/2011/ys-dct/.
 
-    :param src : source image
-    :param dst : destination image
-    :param sigma : expected noise standard deviation
-    :param psize : size of block side where dct is computed
+    :param src: source image
+    :param dst: destination image
+    :param sigma: expected noise standard deviation
+    :param psize: size of block side where dct is computed
 
 .. seealso::
 
diff --git a/modules/xphoto/doc/inpainting/inpainting.rst b/modules/xphoto/doc/inpainting/inpainting.rst
index 1bc654a90..58f9577db 100644
--- a/modules/xphoto/doc/inpainting/inpainting.rst
+++ b/modules/xphoto/doc/inpainting/inpainting.rst
@@ -7,12 +7,12 @@ Inpainting
 ----------
 .. ocv:function:: void inpaint(const Mat &src, const Mat &mask, Mat &dst, const int algorithmType)
 
-The function implements different single-image inpainting algorithms.
+	The function implements different single-image inpainting algorithms.
 
-    :param src : source image, it could be of any type and any number of channels from 1 to 4. In case of 3- and 4-channels images the function expect them in CIELab colorspace or similar one, where first color component shows intensity, while second and third shows colors. Nonetheless you can try any colorspaces.
-    :param mask : mask (CV_8UC1), where non-zero pixels indicate valid image area, while zero pixels indicate area to be inpainted
-    :param dst : destination image
-    :param algorithmType : expected noise standard deviation
+    :param src: source image, it could be of any type and any number of channels from 1 to 4. In case of 3- and 4-channels images the function expect them in CIELab colorspace or similar one, where first color component shows intensity, while second and third shows colors. Nonetheless you can try any colorspaces.
+    :param mask: mask (CV_8UC1), where non-zero pixels indicate valid image area, while zero pixels indicate area to be inpainted
+    :param dst: destination image
+    :param algorithmType: expected noise standard deviation
         * INPAINT_SHIFTMAP: This algorithm searches for dominant correspondences (transformations) of image patches and tries to seamlessly fill-in the area to be inpainted using this transformations. Look in the original paper [He2012]_ for details.
 
     .. [He2012] K. He, J. Sun., "Statistics of Patch Offsets for Image Completion",
diff --git a/modules/xphoto/include/opencv2/xphoto.hpp b/modules/xphoto/include/opencv2/xphoto.hpp
index 822a8060f..a0d434642 100644
--- a/modules/xphoto/include/opencv2/xphoto.hpp
+++ b/modules/xphoto/include/opencv2/xphoto.hpp
@@ -40,11 +40,10 @@
 //
 //M*/
 
-#ifndef __OPENCV_EDGEDETECTION_HPP__
-#define __OPENCV_EDGEDETECTION_HPP__
+#ifndef __OPENCV_XPHOTO_HPP__
+#define __OPENCV_XPHOTO_HPP__
 
-#include "opencv2/xphoto.hpp"
-#include "opencv2/xphoto/inpainting.hpp"
-#include "opencv2/xphoto/simple_color_balance.hpp"
-#include "opencv2/xphoto/dct_image_denoising.hpp"
+#include "xphoto/inpainting.hpp"
+#include "xphoto/simple_color_balance.hpp"
+#include "xphoto/dct_image_denoising.hpp"
 #endif
diff --git a/modules/xphoto/include/opencv2/xphoto/dct_image_denoising.hpp b/modules/xphoto/include/opencv2/xphoto/dct_image_denoising.hpp
index 5260c52c1..3980f92af 100644
--- a/modules/xphoto/include/opencv2/xphoto/dct_image_denoising.hpp
+++ b/modules/xphoto/include/opencv2/xphoto/dct_image_denoising.hpp
@@ -56,6 +56,8 @@
 Namespace where all the C++ OpenCV functionality resides
 */
 namespace cv
+{
+namespace xphoto
 {
     /*! This function implements simple dct-based image denoising,
 	 *	link: http://www.ipol.im/pub/art/2011/ys-dct/
@@ -67,5 +69,6 @@ namespace cv
      */
     CV_EXPORTS_W void dctDenoising(const Mat &src, Mat &dst, const double sigma, const int psize = 16);
 }
+}
 
 #endif // __OPENCV_DCT_IMAGE_DENOISING_HPP__
\ No newline at end of file
diff --git a/modules/xphoto/include/opencv2/xphoto/inpainting.hpp b/modules/xphoto/include/opencv2/xphoto/inpainting.hpp
index 9863905f8..3f66394af 100644
--- a/modules/xphoto/include/opencv2/xphoto/inpainting.hpp
+++ b/modules/xphoto/include/opencv2/xphoto/inpainting.hpp
@@ -56,6 +56,8 @@
 Namespace where all the C++ OpenCV functionality resides
 */
 namespace cv
+{
+namespace xphoto
 {
     //! various inpainting algorithms
     enum
@@ -71,5 +73,6 @@ namespace cv
     */
     CV_EXPORTS_W void inpaint(const Mat &src, const Mat &mask, Mat &dst, const int algorithmType);
 }
+}
 
 #endif // __OPENCV_INPAINTING_HPP__
\ No newline at end of file
diff --git a/modules/xphoto/include/opencv2/xphoto/simple_color_balance.hpp b/modules/xphoto/include/opencv2/xphoto/simple_color_balance.hpp
index e236eee95..42d376487 100644
--- a/modules/xphoto/include/opencv2/xphoto/simple_color_balance.hpp
+++ b/modules/xphoto/include/opencv2/xphoto/simple_color_balance.hpp
@@ -56,6 +56,8 @@
 Namespace where all the C++ OpenCV functionality resides
 */
 namespace cv
+{
+namespace xphoto
 {
     //! various white balance algorithms
     enum
@@ -77,5 +79,6 @@ namespace cv
         const float inputMin  = 0.0f, const float inputMax  = 255.0f,
         const float outputMin = 0.0f, const float outputMax = 255.0f);
 }
+}
 
 #endif // __OPENCV_SIMPLE_COLOR_BALANCE_HPP__
\ No newline at end of file
diff --git a/modules/xphoto/samples/dct_image_denoising.cpp b/modules/xphoto/samples/dct_image_denoising.cpp
index 7548d2b28..e305a23ef 100644
--- a/modules/xphoto/samples/dct_image_denoising.cpp
+++ b/modules/xphoto/samples/dct_image_denoising.cpp
@@ -54,7 +54,7 @@ int main( int argc, const char** argv )
         psize = 16;
 
     cv::Mat res(src.size(), src.type());
-    cv::dctDenoising(src, res, sigma, psize);
+    cv::xphoto::dctDenoising(src, res, sigma, psize);
 
     if ( outFilename == "" )
     {
diff --git a/modules/xphoto/samples/inpainting.cpp b/modules/xphoto/samples/inpainting.cpp
index ff37f9cca..c491b0337 100644
--- a/modules/xphoto/samples/inpainting.cpp
+++ b/modules/xphoto/samples/inpainting.cpp
@@ -56,7 +56,7 @@ int main( int argc, const char** argv )
     }
 
     cv::Mat res(src.size(), src.type());
-    cv::inpaint( src, mask, res, cv::INPAINT_SHIFTMAP );
+    cv::xphoto::inpaint( src, mask, res, cv::xphoto::INPAINT_SHIFTMAP );
     cv::cvtColor(res, res, CV_Lab2RGB);
 
     if ( outFilename == "" )
diff --git a/modules/xphoto/samples/simple_color_balance.cpp b/modules/xphoto/samples/simple_color_balance.cpp
index e9b9dbbc5..4159544bd 100644
--- a/modules/xphoto/samples/simple_color_balance.cpp
+++ b/modules/xphoto/samples/simple_color_balance.cpp
@@ -44,7 +44,7 @@ int main( int argc, const char** argv )
     }
 
     cv::Mat res(src.size(), src.type());
-    cv::balanceWhite(src, res, cv::WHITE_BALANCE_SIMPLE);
+    cv::xphoto::balanceWhite(src, res, cv::xphoto::WHITE_BALANCE_SIMPLE);
 
     if ( outFilename == "" )
     {
diff --git a/modules/xphoto/src/dct_image_denoising.cpp b/modules/xphoto/src/dct_image_denoising.cpp
index 0081bc68d..757a7a4ee 100644
--- a/modules/xphoto/src/dct_image_denoising.cpp
+++ b/modules/xphoto/src/dct_image_denoising.cpp
@@ -54,6 +54,9 @@
 
 namespace cv
 {
+namespace xphoto
+{
+
     void grayDctDenoising(const Mat &, Mat &, const double, const int);
     void rgbDctDenoising(const Mat &, Mat &, const double, const int);
     void dctDenoising(const Mat &, Mat &, const double, const int);
@@ -179,3 +182,4 @@ namespace cv
     }
 
 }
+}
\ No newline at end of file
diff --git a/modules/xphoto/src/inpainting.cpp b/modules/xphoto/src/inpainting.cpp
index f1619d989..197d97217 100644
--- a/modules/xphoto/src/inpainting.cpp
+++ b/modules/xphoto/src/inpainting.cpp
@@ -67,6 +67,9 @@ namespace xphotoInternal
 
 namespace cv
 {
+namespace xphoto
+{
+
     template <typename Tp, unsigned int cn>
     static void shiftMapInpaint(const Mat &src, const Mat &mask, Mat &dst,
         const int nTransform = 60, const int psize = 8)
@@ -117,7 +120,7 @@ namespace cv
 
         switch ( algorithmType )
         {
-            case INPAINT_SHIFTMAP:
+            case xphoto::INPAINT_SHIFTMAP:
                 shiftMapInpaint <Tp, cn>(src, mask, dst);
                 break;
             default:
@@ -232,3 +235,4 @@ namespace cv
         }
     }
 }
+}
diff --git a/modules/xphoto/src/simple_color_balance.cpp b/modules/xphoto/src/simple_color_balance.cpp
index 454b4bacb..5298ce6e1 100644
--- a/modules/xphoto/src/simple_color_balance.cpp
+++ b/modules/xphoto/src/simple_color_balance.cpp
@@ -54,6 +54,9 @@
 
 namespace cv
 {
+namespace xphoto
+{
+
     template <typename T>
     void balanceWhite(std::vector < Mat_<T> > &src, Mat &dst,
         const float inputMin, const float inputMax,
@@ -205,3 +208,4 @@ namespace cv
         }
     }
 }
+}
diff --git a/modules/xphoto/test/dct_image_denoising.cpp b/modules/xphoto/test/dct_image_denoising.cpp
index d2e1d8baa..9426b7922 100644
--- a/modules/xphoto/test/dct_image_denoising.cpp
+++ b/modules/xphoto/test/dct_image_denoising.cpp
@@ -4,10 +4,11 @@ namespace cvtest
 {
     TEST(xphoto_dctimagedenoising, regression)
     {
-        cv::String dir = cvtest::TS::ptr()->get_data_path() + "dct_image_denoising/";
+        cv::String subfolder = "cv/xphoto/";
+        cv::String dir = cvtest::TS::ptr()->get_data_path() + subfolder + "dct_image_denoising/";
         int nTests = 1;
 
-        double thresholds[] = {0.1};
+        double thresholds[] = {0.2};
 
         int psize[] = {8};
         double sigma[] = {9.0};
@@ -16,13 +17,15 @@ namespace cvtest
         {
             cv::String srcName = dir + cv::format( "sources/%02d.png", i + 1);
             cv::Mat src = cv::imread( srcName, 1 );
+            ASSERT_TRUE(!src.empty());
 
             cv::String previousResultName = dir + cv::format( "results/%02d.png", i + 1 );
             cv::Mat previousResult = cv::imread( previousResultName, 1 );
+            ASSERT_TRUE(!src.empty());
 
-            cv::Mat currentResult, fastNlMeansResult;
+            cv::Mat currentResult;
 
-            cv::dctDenoising(src, currentResult, sigma[i], psize[i]);
+            cv::xphoto::dctDenoising(src, currentResult, sigma[i], psize[i]);
 
             cv::Mat sqrError = ( currentResult - previousResult )
                 .mul( currentResult - previousResult );
diff --git a/modules/xphoto/test/simple_color_balance.cpp b/modules/xphoto/test/simple_color_balance.cpp
index 449a0c459..956e2b11d 100644
--- a/modules/xphoto/test/simple_color_balance.cpp
+++ b/modules/xphoto/test/simple_color_balance.cpp
@@ -4,7 +4,8 @@ namespace cvtest
 {
     TEST(xphoto_simplecolorbalance, regression)
     {
-        cv::String dir = cvtest::TS::ptr()->get_data_path() + "simple_white_balance/";
+        cv::String subfolder = "cv/xphoto/";
+        cv::String dir = cvtest::TS::ptr()->get_data_path() + subfolder + "simple_white_balance/";
         int nTests = 12;
         float threshold = 0.005f;
 
@@ -12,12 +13,13 @@ namespace cvtest
         {
             cv::String srcName = dir + cv::format( "sources/%02d.png", i + 1);
             cv::Mat src = cv::imread( srcName, 1 );
+            ASSERT_TRUE(!src.empty());
 
             cv::String previousResultName = dir + cv::format( "results/%02d.png", i + 1 );
             cv::Mat previousResult = cv::imread( previousResultName, 1 );
 
             cv::Mat currentResult;
-            cv::balanceWhite(src, currentResult, cv::WHITE_BALANCE_SIMPLE);
+            cv::xphoto::balanceWhite(src, currentResult, cv::xphoto::WHITE_BALANCE_SIMPLE);
 
             cv::Mat sqrError = ( currentResult - previousResult )
                 .mul( currentResult - previousResult );
diff --git a/modules/xphoto/test/test_main.cpp b/modules/xphoto/test/test_main.cpp
index 7b7c1ab30..6f9ac2e0d 100644
--- a/modules/xphoto/test/test_main.cpp
+++ b/modules/xphoto/test/test_main.cpp
@@ -1,3 +1,3 @@
 #include "test_precomp.hpp"
 
-CV_TEST_MAIN("xphoto")
+CV_TEST_MAIN("")
diff --git a/modules/xphoto/testdata/dct_image_denoising/results/01.png b/modules/xphoto/testdata/dct_image_denoising/results/01.png
deleted file mode 100644
index c8e8d407f..000000000
Binary files a/modules/xphoto/testdata/dct_image_denoising/results/01.png and /dev/null differ
diff --git a/modules/xphoto/testdata/x.png b/modules/xphoto/testdata/x.png
deleted file mode 100644
index e69de29bb..000000000
diff --git a/modules/xphoto/testdata/xphoto/dct_image_denoising/results/.DS_Store b/modules/xphoto/testdata/xphoto/dct_image_denoising/results/.DS_Store
new file mode 100644
index 000000000..5008ddfcf
Binary files /dev/null and b/modules/xphoto/testdata/xphoto/dct_image_denoising/results/.DS_Store differ
diff --git a/modules/xphoto/testdata/xphoto/dct_image_denoising/results/01.png b/modules/xphoto/testdata/xphoto/dct_image_denoising/results/01.png
new file mode 100644
index 000000000..d451f21fa
Binary files /dev/null and b/modules/xphoto/testdata/xphoto/dct_image_denoising/results/01.png differ
diff --git a/modules/xphoto/testdata/dct_image_denoising/sources/01.png b/modules/xphoto/testdata/xphoto/dct_image_denoising/sources/01.png
similarity index 100%
rename from modules/xphoto/testdata/dct_image_denoising/sources/01.png
rename to modules/xphoto/testdata/xphoto/dct_image_denoising/sources/01.png
diff --git a/modules/xphoto/testdata/xphoto/inpainting/mask_1.png b/modules/xphoto/testdata/xphoto/inpainting/mask_1.png
new file mode 100644
index 000000000..f100fed07
Binary files /dev/null and b/modules/xphoto/testdata/xphoto/inpainting/mask_1.png differ
diff --git a/modules/xphoto/testdata/xphoto/inpainting/src_1.jpg b/modules/xphoto/testdata/xphoto/inpainting/src_1.jpg
new file mode 100644
index 000000000..64cd3cef9
Binary files /dev/null and b/modules/xphoto/testdata/xphoto/inpainting/src_1.jpg differ
diff --git a/modules/xphoto/testdata/simple_white_balance/results/01.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/01.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/01.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/01.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/02.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/02.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/02.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/02.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/03.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/03.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/03.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/03.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/04.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/04.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/04.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/04.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/05.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/05.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/05.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/05.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/06.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/06.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/06.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/06.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/07.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/07.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/07.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/07.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/08.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/08.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/08.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/08.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/09.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/09.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/09.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/09.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/10.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/10.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/10.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/10.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/11.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/11.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/11.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/11.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/12.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/12.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/12.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/12.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/13.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/13.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/13.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/13.png
diff --git a/modules/xphoto/testdata/simple_white_balance/results/14.png b/modules/xphoto/testdata/xphoto/simple_white_balance/results/14.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/results/14.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/results/14.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/01.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/01.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/01.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/01.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/02.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/02.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/02.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/02.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/03.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/03.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/03.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/03.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/04.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/04.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/04.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/04.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/05.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/05.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/05.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/05.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/06.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/06.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/06.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/06.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/07.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/07.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/07.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/07.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/08.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/08.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/08.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/08.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/09.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/09.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/09.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/09.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/10.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/10.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/10.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/10.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/11.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/11.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/11.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/11.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/12.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/12.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/12.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/12.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/13.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/13.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/13.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/13.png
diff --git a/modules/xphoto/testdata/simple_white_balance/sources/14.png b/modules/xphoto/testdata/xphoto/simple_white_balance/sources/14.png
similarity index 100%
rename from modules/xphoto/testdata/simple_white_balance/sources/14.png
rename to modules/xphoto/testdata/xphoto/simple_white_balance/sources/14.png