moved to yast-tests

diff --git a/zypp/solver/testsuite/data.deptestomatic/README b/zypp/solver/testsuite/data.deptestomatic/yast-tests/README
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/README
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/README

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-1-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-1-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-1-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-1-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-1-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-1-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-1-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-1-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-2-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-2-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-2-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-2-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-2-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-2-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-2-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-2-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-3-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-3-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-3-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-3-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-3-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-3-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-3-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-3-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-4-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-4-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-4-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-4-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-4-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-4-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-4-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-4-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-5-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-5-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-5-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-5-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-5-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-5-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-5-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-5-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-6-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-6-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-6-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-6-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-6-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-6-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-6-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-6-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-7-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-7-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-7-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-7-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-7-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-7-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-7-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-7-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-8-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-8-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-8-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-8-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-8-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-8-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-8-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-8-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-9-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-9-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-9-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-9-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-9-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-9-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-9-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-9-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-01simple-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-01simple-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-01simple-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-01-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-01-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-01-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-01-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-01-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-01-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-01-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-01-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-02-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-02-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-02-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-02-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-02-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-02-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-02-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-02-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-03-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-03-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-03-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-03-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-03-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-03-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-03-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-03-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-04-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-04-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-04-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-04-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-04-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-04-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-04-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-04-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-05-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-05-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-05-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-05-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-05-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-05-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-05-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-05-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-06-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-06-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-06-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-06-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-06-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-06-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-06-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-06-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-07-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-07-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-07-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-07-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-07-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-07-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-07-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-07-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-08-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-08-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-08-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-08-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-08-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-08-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-08-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-08-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-09-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-09-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-09-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-09-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-09-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-09-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-09-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-09-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-10-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-10-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-10-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-10-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-10-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-10-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-10-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-10-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-11-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-11-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-11-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-11-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-11-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-11-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-11-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-11-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-12-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-12-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-12-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-12-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-12-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-12-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-12-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-12-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-13-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-13-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-13-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-13-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-13-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-13-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-13-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-13-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-14-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-14-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-14-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-14-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-14-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-14-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-14-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-14-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-02conflict-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-02conflict-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-03alternatives-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-03alternatives-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-03alternatives-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-03alternatives-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-03alternatives-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-03alternatives-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-03alternatives-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-03alternatives-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-01-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-01-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-01-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-01-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-01-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-01-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-01-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-01-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-02-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-02-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-02-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-02-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-02-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-02-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-02-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-02-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-03-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-03-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-03-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-03-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-04-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-04-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-04-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-04-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-04-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-04-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-04-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-04-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-05-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-05-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-05-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-05-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-05-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-05-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-05-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-05-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-06-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-06-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-06-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-06-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-06-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-06-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-06-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-06-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-07-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-07-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-07-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-07-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-07-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-07-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-07-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-07-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-08-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-08-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-08-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-08-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-08-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-08-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-08-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-08-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-09-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-09-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-09-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-09-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-09-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-09-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-09-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-09-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-10-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-10-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-10-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-10-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-10-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-10-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-10-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-10-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-11-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-11-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-11-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-11-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-11-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-11-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-11-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-11-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-04obsoletes-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-04obsoletes-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-1-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-1-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-1-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-1-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-1-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-1-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-1-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-1-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-2-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-2-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-2-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-2-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-2-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-2-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-2-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-2-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-3-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-3-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-3-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-3-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-3-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-3-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-3-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-3-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-4-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-4-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-4-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-4-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-4-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-4-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-4-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-4-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-05reallive-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-05reallive-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-06upgrade-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-06upgrade-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-06upgrade-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-06upgrade-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-06upgrade-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-06upgrade-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-06upgrade-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-06upgrade-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-06upgrade-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-06upgrade-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-06upgrade-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-06upgrade-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-06upgrade-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-06upgrade-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-06upgrade-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-06upgrade-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-1-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-1-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-1-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-1-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-1-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-1-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-1-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-1-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-2-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-2-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-2-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-2-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-2-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-2-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-2-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-2-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-3-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-3-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-3-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-3-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-3-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-3-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-3-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-3-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-4-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-4-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-4-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-4-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-4-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-4-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-4-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-4-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-alternatives-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-alternatives-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-1-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-1-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-1-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-1-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-1-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-1-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-1-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-1-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-2-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-2-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-2-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-2-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-2-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-2-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-2-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-2-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-3-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-3-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-3-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-3-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-3-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-3-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-3-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-3-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-4-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-4-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-4-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-4-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-4-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-4-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-4-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-4-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-5-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-5-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-5-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-5-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-5-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-5-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-5-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-5-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-bug21829-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-bug21829-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-corcircle-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-corcircle-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-corcircle-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-corcircle-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-corcircle-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-corcircle-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-corcircle-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-corcircle-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-corcircle-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-corcircle-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-corcircle-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-corcircle-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-corcircle-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-corcircle-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-corcircle-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-corcircle-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent1-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent1-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent1-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent1-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent1-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent1-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent1-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent1-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent1-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent1-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent1-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent1-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent1-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent1-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent1-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent1-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent2-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent2-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent2-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent2-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent2-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent2-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent2-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent2-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent2-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent2-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent2-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent2-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent2-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent2-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent2-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent2-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent3-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent3-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent3-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent3-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent3-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent3-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent3-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent3-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent3-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent3-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent3-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent3-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent3-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent3-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent3-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent3-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent4-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent4-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent4-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent4-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent4-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent4-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent4-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent4-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent4-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent4-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent4-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent4-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent4-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent4-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent4-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent4-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent5-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent5-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent5-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent5-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent5-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent5-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent5-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent5-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent5-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent5-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent5-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent5-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent5-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent5-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent5-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent5-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent6-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent6-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent6-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent6-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent6-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent6-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent6-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent6-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent6-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent6-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent6-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent6-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent6-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent6-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-inconsistent6-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-inconsistent6-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-kdelibsobs-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-kdelibsobs-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-kdelibsobs-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-kdelibsobs-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-kdelibsobs-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-kdelibsobs-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-kdelibsobs-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-kdelibsobs-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-kdelibsobs-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-kdelibsobs-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-kdelibsobs-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-kdelibsobs-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-kdelibsobs-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-kdelibsobs-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-kdelibsobs-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-kdelibsobs-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-01-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-01-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-01-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-01-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-01-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-01-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-01-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-01-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-02-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-02-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-02-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-02-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-03-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-03-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-03-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-03-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-04-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-04-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-04-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-04-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-05-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-05-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-05-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-05-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-05-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-06-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-06-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-06-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-06-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-07-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-07-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-07-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-07-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-07-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-07-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-07-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-07-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-08-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-08-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-08-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-08-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-08-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-08-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-08-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-08-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-09-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-09-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-09-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-09-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-09-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-09-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-09-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-09-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-10-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-10-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-10-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-10-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-10-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-10-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-10-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-10-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-11-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-11-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-11-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-11-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-11-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-11-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-11-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-11-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-obscureobsoletes-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-obscureobsoletes-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-phpalternatives-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-phpalternatives-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-phpalternatives-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-phpalternatives-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-phpalternatives-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-phpalternatives-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-phpalternatives-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-phpalternatives-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-phpalternatives-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-phpalternatives-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-phpalternatives-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-phpalternatives-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-phpalternatives-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-phpalternatives-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-phpalternatives-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-phpalternatives-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-xfree-packages.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-xfree-packages.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-xfree-packages.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-xfree-packages.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-xfree-system.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-xfree-system.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-xfree-system.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-xfree-system.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-xfree-test.solution b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-xfree-test.solution
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-xfree-test.solution
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-xfree-test.solution

diff --git a/zypp/solver/testsuite/data.deptestomatic/exercise-xfree-test.xml b/zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-xfree-test.xml
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/exercise-xfree-test.xml
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/exercise-xfree-test.xml

diff --git a/zypp/solver/testsuite/data.deptestomatic/makesolution.sh b/zypp/solver/testsuite/data.deptestomatic/yast-tests/makesolution.sh
similarity index 100%
rename from zypp/solver/testsuite/data.deptestomatic/makesolution.sh
rename to zypp/solver/testsuite/data.deptestomatic/yast-tests/makesolution.sh