diff --git a/autotest.pro b/autotest.pro
deleted file mode 100644
index 77543b34a51..00000000000
--- a/autotest.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-
-SUBDIRS += plugins/autotest shared
-
-QMAKE_EXTRA_TARGETS = docs install_docs # dummy targets for consistency
diff --git a/qtcreatorplugin.pri b/qtcreatorplugin.pri
deleted file mode 100644
index 190dbed1c3b..00000000000
--- a/qtcreatorplugin.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-isEmpty(IDE_SOURCE_TREE): IDE_SOURCE_TREE=$$(QTC_SOURCE)
-isEmpty(IDE_BUILD_TREE): IDE_BUILD_TREE=$$(QTC_BUILD)
-
-isEmpty(IDE_SOURCE_TREE):error(Set QTC_SOURCE environment variable)
-isEmpty(IDE_BUILD_TREE):error(Set QTC_BUILD environment variable)
-
-INCLUDEPATH+= $$PWD/plugins
-include($$IDE_SOURCE_TREE/src/qtcreatorplugin.pri)
diff --git a/shared/templates/wizards/autotest/auto.pro b/shared/qtcreator/templates/wizards/autotest/auto.pro
similarity index 100%
rename from shared/templates/wizards/autotest/auto.pro
rename to shared/qtcreator/templates/wizards/autotest/auto.pro
diff --git a/shared/templates/wizards/autotest/autotest_24.png b/shared/qtcreator/templates/wizards/autotest/autotest_24.png
similarity index 100%
rename from shared/templates/wizards/autotest/autotest_24.png
rename to shared/qtcreator/templates/wizards/autotest/autotest_24.png
diff --git a/shared/templates/wizards/autotest/main.cpp b/shared/qtcreator/templates/wizards/autotest/main.cpp
similarity index 100%
rename from shared/templates/wizards/autotest/main.cpp
rename to shared/qtcreator/templates/wizards/autotest/main.cpp
diff --git a/shared/templates/wizards/autotest/src.pro b/shared/qtcreator/templates/wizards/autotest/src.pro
similarity index 100%
rename from shared/templates/wizards/autotest/src.pro
rename to shared/qtcreator/templates/wizards/autotest/src.pro
diff --git a/shared/templates/wizards/autotest/tests.pro b/shared/qtcreator/templates/wizards/autotest/tests.pro
similarity index 100%
rename from shared/templates/wizards/autotest/tests.pro
rename to shared/qtcreator/templates/wizards/autotest/tests.pro
diff --git a/shared/templates/wizards/autotest/tmp.pro b/shared/qtcreator/templates/wizards/autotest/tmp.pro
similarity index 100%
rename from shared/templates/wizards/autotest/tmp.pro
rename to shared/qtcreator/templates/wizards/autotest/tmp.pro
diff --git a/shared/templates/wizards/autotest/tst.pro b/shared/qtcreator/templates/wizards/autotest/tst.pro
similarity index 100%
rename from shared/templates/wizards/autotest/tst.pro
rename to shared/qtcreator/templates/wizards/autotest/tst.pro
diff --git a/shared/templates/wizards/autotest/tst_src.cpp b/shared/qtcreator/templates/wizards/autotest/tst_src.cpp
similarity index 100%
rename from shared/templates/wizards/autotest/tst_src.cpp
rename to shared/qtcreator/templates/wizards/autotest/tst_src.cpp
diff --git a/shared/templates/wizards/autotest/wizard.xml b/shared/qtcreator/templates/wizards/autotest/wizard.xml
similarity index 100%
rename from shared/templates/wizards/autotest/wizard.xml
rename to shared/qtcreator/templates/wizards/autotest/wizard.xml
diff --git a/shared/shared.pro b/shared/shared.pro
deleted file mode 100644
index 541044da119..00000000000
--- a/shared/shared.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-isEmpty(IDE_SOURCE_TREE): IDE_SOURCE_TREE = $$(QTC_SOURCE)
-isEmpty(IDE_BUILD_TREE): IDE_BUILD_TREE = $$(QTC_BUILD)
-isEmpty(IDE_SOURCE_TREE): error("Set QTC_SOURCE environment variable")
-isEmpty(IDE_BUILD_TREE): error("Set QTC_BUILD environment variable")
-
-TEMPLATE = aux
-
-STATIC_BASE = $$PWD
-STATIC_DIRS = templates
-
-for(data_dir, STATIC_DIRS) {
-    files = $$files($$STATIC_BASE/$$data_dir/*, true)
-    for(file, files): !exists($$file/*): STATIC_FILES += $$file
-}
-
-include($$IDE_SOURCE_TREE/share/qtcreator/static.pri)
-
diff --git a/plugins/autotest/AutoTest.json.in b/src/plugins/autotest/AutoTest.json.in
similarity index 100%
rename from plugins/autotest/AutoTest.json.in
rename to src/plugins/autotest/AutoTest.json.in
diff --git a/plugins/autotest/autotest.pro b/src/plugins/autotest/autotest.pro
similarity index 100%
rename from plugins/autotest/autotest.pro
rename to src/plugins/autotest/autotest.pro
diff --git a/plugins/autotest/autotest.qbs b/src/plugins/autotest/autotest.qbs
similarity index 100%
rename from plugins/autotest/autotest.qbs
rename to src/plugins/autotest/autotest.qbs
diff --git a/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc
similarity index 100%
rename from plugins/autotest/autotest.qrc
rename to src/plugins/autotest/autotest.qrc
diff --git a/plugins/autotest/autotest_dependencies.pri b/src/plugins/autotest/autotest_dependencies.pri
similarity index 100%
rename from plugins/autotest/autotest_dependencies.pri
rename to src/plugins/autotest/autotest_dependencies.pri
diff --git a/plugins/autotest/autotest_global.h b/src/plugins/autotest/autotest_global.h
similarity index 100%
rename from plugins/autotest/autotest_global.h
rename to src/plugins/autotest/autotest_global.h
diff --git a/plugins/autotest/autotest_utils.h b/src/plugins/autotest/autotest_utils.h
similarity index 100%
rename from plugins/autotest/autotest_utils.h
rename to src/plugins/autotest/autotest_utils.h
diff --git a/plugins/autotest/autotestconstants.h b/src/plugins/autotest/autotestconstants.h
similarity index 100%
rename from plugins/autotest/autotestconstants.h
rename to src/plugins/autotest/autotestconstants.h
diff --git a/plugins/autotest/autotesticons.h b/src/plugins/autotest/autotesticons.h
similarity index 100%
rename from plugins/autotest/autotesticons.h
rename to src/plugins/autotest/autotesticons.h
diff --git a/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
similarity index 100%
rename from plugins/autotest/autotestplugin.cpp
rename to src/plugins/autotest/autotestplugin.cpp
diff --git a/plugins/autotest/autotestplugin.h b/src/plugins/autotest/autotestplugin.h
similarity index 100%
rename from plugins/autotest/autotestplugin.h
rename to src/plugins/autotest/autotestplugin.h
diff --git a/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp
similarity index 100%
rename from plugins/autotest/autotestunittests.cpp
rename to src/plugins/autotest/autotestunittests.cpp
diff --git a/plugins/autotest/autotestunittests.h b/src/plugins/autotest/autotestunittests.h
similarity index 100%
rename from plugins/autotest/autotestunittests.h
rename to src/plugins/autotest/autotestunittests.h
diff --git a/plugins/autotest/autotestunittests.qrc b/src/plugins/autotest/autotestunittests.qrc
similarity index 100%
rename from plugins/autotest/autotestunittests.qrc
rename to src/plugins/autotest/autotestunittests.qrc
diff --git a/plugins/autotest/images/autotest.png b/src/plugins/autotest/images/autotest.png
similarity index 100%
rename from plugins/autotest/images/autotest.png
rename to src/plugins/autotest/images/autotest.png
diff --git a/plugins/autotest/images/benchmark.png b/src/plugins/autotest/images/benchmark.png
similarity index 100%
rename from plugins/autotest/images/benchmark.png
rename to src/plugins/autotest/images/benchmark.png
diff --git a/plugins/autotest/images/blacklisted_fail.png b/src/plugins/autotest/images/blacklisted_fail.png
similarity index 100%
rename from plugins/autotest/images/blacklisted_fail.png
rename to src/plugins/autotest/images/blacklisted_fail.png
diff --git a/plugins/autotest/images/blacklisted_pass.png b/src/plugins/autotest/images/blacklisted_pass.png
similarity index 100%
rename from plugins/autotest/images/blacklisted_pass.png
rename to src/plugins/autotest/images/blacklisted_pass.png
diff --git a/plugins/autotest/images/class.png b/src/plugins/autotest/images/class.png
similarity index 100%
rename from plugins/autotest/images/class.png
rename to src/plugins/autotest/images/class.png
diff --git a/plugins/autotest/images/collapse.png b/src/plugins/autotest/images/collapse.png
similarity index 100%
rename from plugins/autotest/images/collapse.png
rename to src/plugins/autotest/images/collapse.png
diff --git a/plugins/autotest/images/collapse@2x.png b/src/plugins/autotest/images/collapse@2x.png
similarity index 100%
rename from plugins/autotest/images/collapse@2x.png
rename to src/plugins/autotest/images/collapse@2x.png
diff --git a/plugins/autotest/images/data.png b/src/plugins/autotest/images/data.png
similarity index 100%
rename from plugins/autotest/images/data.png
rename to src/plugins/autotest/images/data.png
diff --git a/plugins/autotest/images/debug.png b/src/plugins/autotest/images/debug.png
similarity index 100%
rename from plugins/autotest/images/debug.png
rename to src/plugins/autotest/images/debug.png
diff --git a/plugins/autotest/images/expand.png b/src/plugins/autotest/images/expand.png
similarity index 100%
rename from plugins/autotest/images/expand.png
rename to src/plugins/autotest/images/expand.png
diff --git a/plugins/autotest/images/expand@2x.png b/src/plugins/autotest/images/expand@2x.png
similarity index 100%
rename from plugins/autotest/images/expand@2x.png
rename to src/plugins/autotest/images/expand@2x.png
diff --git a/plugins/autotest/images/fail.png b/src/plugins/autotest/images/fail.png
similarity index 100%
rename from plugins/autotest/images/fail.png
rename to src/plugins/autotest/images/fail.png
diff --git a/plugins/autotest/images/fatal.png b/src/plugins/autotest/images/fatal.png
similarity index 100%
rename from plugins/autotest/images/fatal.png
rename to src/plugins/autotest/images/fatal.png
diff --git a/plugins/autotest/images/func.png b/src/plugins/autotest/images/func.png
similarity index 100%
rename from plugins/autotest/images/func.png
rename to src/plugins/autotest/images/func.png
diff --git a/plugins/autotest/images/leafsort.png b/src/plugins/autotest/images/leafsort.png
similarity index 100%
rename from plugins/autotest/images/leafsort.png
rename to src/plugins/autotest/images/leafsort.png
diff --git a/plugins/autotest/images/leafsort@2x.png b/src/plugins/autotest/images/leafsort@2x.png
similarity index 100%
rename from plugins/autotest/images/leafsort@2x.png
rename to src/plugins/autotest/images/leafsort@2x.png
diff --git a/plugins/autotest/images/pass.png b/src/plugins/autotest/images/pass.png
similarity index 100%
rename from plugins/autotest/images/pass.png
rename to src/plugins/autotest/images/pass.png
diff --git a/plugins/autotest/images/runselected_boxes.png b/src/plugins/autotest/images/runselected_boxes.png
similarity index 100%
rename from plugins/autotest/images/runselected_boxes.png
rename to src/plugins/autotest/images/runselected_boxes.png
diff --git a/plugins/autotest/images/runselected_boxes@2x.png b/src/plugins/autotest/images/runselected_boxes@2x.png
similarity index 100%
rename from plugins/autotest/images/runselected_boxes@2x.png
rename to src/plugins/autotest/images/runselected_boxes@2x.png
diff --git a/plugins/autotest/images/runselected_tickmarks.png b/src/plugins/autotest/images/runselected_tickmarks.png
similarity index 100%
rename from plugins/autotest/images/runselected_tickmarks.png
rename to src/plugins/autotest/images/runselected_tickmarks.png
diff --git a/plugins/autotest/images/runselected_tickmarks@2x.png b/src/plugins/autotest/images/runselected_tickmarks@2x.png
similarity index 100%
rename from plugins/autotest/images/runselected_tickmarks@2x.png
rename to src/plugins/autotest/images/runselected_tickmarks@2x.png
diff --git a/plugins/autotest/images/skip.png b/src/plugins/autotest/images/skip.png
similarity index 100%
rename from plugins/autotest/images/skip.png
rename to src/plugins/autotest/images/skip.png
diff --git a/plugins/autotest/images/sort.png b/src/plugins/autotest/images/sort.png
similarity index 100%
rename from plugins/autotest/images/sort.png
rename to src/plugins/autotest/images/sort.png
diff --git a/plugins/autotest/images/sort@2x.png b/src/plugins/autotest/images/sort@2x.png
similarity index 100%
rename from plugins/autotest/images/sort@2x.png
rename to src/plugins/autotest/images/sort@2x.png
diff --git a/plugins/autotest/images/warn.png b/src/plugins/autotest/images/warn.png
similarity index 100%
rename from plugins/autotest/images/warn.png
rename to src/plugins/autotest/images/warn.png
diff --git a/plugins/autotest/images/xfail.png b/src/plugins/autotest/images/xfail.png
similarity index 100%
rename from plugins/autotest/images/xfail.png
rename to src/plugins/autotest/images/xfail.png
diff --git a/plugins/autotest/images/xpass.png b/src/plugins/autotest/images/xpass.png
similarity index 100%
rename from plugins/autotest/images/xpass.png
rename to src/plugins/autotest/images/xpass.png
diff --git a/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp
similarity index 100%
rename from plugins/autotest/testcodeparser.cpp
rename to src/plugins/autotest/testcodeparser.cpp
diff --git a/plugins/autotest/testcodeparser.h b/src/plugins/autotest/testcodeparser.h
similarity index 100%
rename from plugins/autotest/testcodeparser.h
rename to src/plugins/autotest/testcodeparser.h
diff --git a/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp
similarity index 100%
rename from plugins/autotest/testconfiguration.cpp
rename to src/plugins/autotest/testconfiguration.cpp
diff --git a/plugins/autotest/testconfiguration.h b/src/plugins/autotest/testconfiguration.h
similarity index 100%
rename from plugins/autotest/testconfiguration.h
rename to src/plugins/autotest/testconfiguration.h
diff --git a/plugins/autotest/testinfo.cpp b/src/plugins/autotest/testinfo.cpp
similarity index 100%
rename from plugins/autotest/testinfo.cpp
rename to src/plugins/autotest/testinfo.cpp
diff --git a/plugins/autotest/testinfo.h b/src/plugins/autotest/testinfo.h
similarity index 100%
rename from plugins/autotest/testinfo.h
rename to src/plugins/autotest/testinfo.h
diff --git a/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp
similarity index 100%
rename from plugins/autotest/testnavigationwidget.cpp
rename to src/plugins/autotest/testnavigationwidget.cpp
diff --git a/plugins/autotest/testnavigationwidget.h b/src/plugins/autotest/testnavigationwidget.h
similarity index 100%
rename from plugins/autotest/testnavigationwidget.h
rename to src/plugins/autotest/testnavigationwidget.h
diff --git a/plugins/autotest/testoutputreader.cpp b/src/plugins/autotest/testoutputreader.cpp
similarity index 100%
rename from plugins/autotest/testoutputreader.cpp
rename to src/plugins/autotest/testoutputreader.cpp
diff --git a/plugins/autotest/testoutputreader.h b/src/plugins/autotest/testoutputreader.h
similarity index 100%
rename from plugins/autotest/testoutputreader.h
rename to src/plugins/autotest/testoutputreader.h
diff --git a/plugins/autotest/testresult.cpp b/src/plugins/autotest/testresult.cpp
similarity index 100%
rename from plugins/autotest/testresult.cpp
rename to src/plugins/autotest/testresult.cpp
diff --git a/plugins/autotest/testresult.h b/src/plugins/autotest/testresult.h
similarity index 100%
rename from plugins/autotest/testresult.h
rename to src/plugins/autotest/testresult.h
diff --git a/plugins/autotest/testresultdelegate.cpp b/src/plugins/autotest/testresultdelegate.cpp
similarity index 100%
rename from plugins/autotest/testresultdelegate.cpp
rename to src/plugins/autotest/testresultdelegate.cpp
diff --git a/plugins/autotest/testresultdelegate.h b/src/plugins/autotest/testresultdelegate.h
similarity index 100%
rename from plugins/autotest/testresultdelegate.h
rename to src/plugins/autotest/testresultdelegate.h
diff --git a/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp
similarity index 100%
rename from plugins/autotest/testresultmodel.cpp
rename to src/plugins/autotest/testresultmodel.cpp
diff --git a/plugins/autotest/testresultmodel.h b/src/plugins/autotest/testresultmodel.h
similarity index 100%
rename from plugins/autotest/testresultmodel.h
rename to src/plugins/autotest/testresultmodel.h
diff --git a/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp
similarity index 100%
rename from plugins/autotest/testresultspane.cpp
rename to src/plugins/autotest/testresultspane.cpp
diff --git a/plugins/autotest/testresultspane.h b/src/plugins/autotest/testresultspane.h
similarity index 100%
rename from plugins/autotest/testresultspane.h
rename to src/plugins/autotest/testresultspane.h
diff --git a/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
similarity index 100%
rename from plugins/autotest/testrunner.cpp
rename to src/plugins/autotest/testrunner.cpp
diff --git a/plugins/autotest/testrunner.h b/src/plugins/autotest/testrunner.h
similarity index 100%
rename from plugins/autotest/testrunner.h
rename to src/plugins/autotest/testrunner.h
diff --git a/plugins/autotest/testsettings.cpp b/src/plugins/autotest/testsettings.cpp
similarity index 100%
rename from plugins/autotest/testsettings.cpp
rename to src/plugins/autotest/testsettings.cpp
diff --git a/plugins/autotest/testsettings.h b/src/plugins/autotest/testsettings.h
similarity index 100%
rename from plugins/autotest/testsettings.h
rename to src/plugins/autotest/testsettings.h
diff --git a/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp
similarity index 100%
rename from plugins/autotest/testsettingspage.cpp
rename to src/plugins/autotest/testsettingspage.cpp
diff --git a/plugins/autotest/testsettingspage.h b/src/plugins/autotest/testsettingspage.h
similarity index 100%
rename from plugins/autotest/testsettingspage.h
rename to src/plugins/autotest/testsettingspage.h
diff --git a/plugins/autotest/testsettingspage.ui b/src/plugins/autotest/testsettingspage.ui
similarity index 100%
rename from plugins/autotest/testsettingspage.ui
rename to src/plugins/autotest/testsettingspage.ui
diff --git a/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp
similarity index 100%
rename from plugins/autotest/testtreeitem.cpp
rename to src/plugins/autotest/testtreeitem.cpp
diff --git a/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h
similarity index 100%
rename from plugins/autotest/testtreeitem.h
rename to src/plugins/autotest/testtreeitem.h
diff --git a/plugins/autotest/testtreeitemdelegate.cpp b/src/plugins/autotest/testtreeitemdelegate.cpp
similarity index 100%
rename from plugins/autotest/testtreeitemdelegate.cpp
rename to src/plugins/autotest/testtreeitemdelegate.cpp
diff --git a/plugins/autotest/testtreeitemdelegate.h b/src/plugins/autotest/testtreeitemdelegate.h
similarity index 100%
rename from plugins/autotest/testtreeitemdelegate.h
rename to src/plugins/autotest/testtreeitemdelegate.h
diff --git a/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp
similarity index 100%
rename from plugins/autotest/testtreemodel.cpp
rename to src/plugins/autotest/testtreemodel.cpp
diff --git a/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h
similarity index 100%
rename from plugins/autotest/testtreemodel.h
rename to src/plugins/autotest/testtreemodel.h
diff --git a/plugins/autotest/testtreeview.cpp b/src/plugins/autotest/testtreeview.cpp
similarity index 100%
rename from plugins/autotest/testtreeview.cpp
rename to src/plugins/autotest/testtreeview.cpp
diff --git a/plugins/autotest/testtreeview.h b/src/plugins/autotest/testtreeview.h
similarity index 100%
rename from plugins/autotest/testtreeview.h
rename to src/plugins/autotest/testtreeview.h
diff --git a/plugins/autotest/testvisitor.cpp b/src/plugins/autotest/testvisitor.cpp
similarity index 100%
rename from plugins/autotest/testvisitor.cpp
rename to src/plugins/autotest/testvisitor.cpp
diff --git a/plugins/autotest/testvisitor.h b/src/plugins/autotest/testvisitor.h
similarity index 100%
rename from plugins/autotest/testvisitor.h
rename to src/plugins/autotest/testvisitor.h
diff --git a/plugins/autotest/unit_test/mixed_atp/mixed_atp.pro b/src/plugins/autotest/unit_test/mixed_atp/mixed_atp.pro
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/mixed_atp.pro
rename to src/plugins/autotest/unit_test/mixed_atp/mixed_atp.pro
diff --git a/plugins/autotest/unit_test/mixed_atp/mixed_atp.qbs b/src/plugins/autotest/unit_test/mixed_atp/mixed_atp.qbs
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/mixed_atp.qbs
rename to src/plugins/autotest/unit_test/mixed_atp/mixed_atp.qbs
diff --git a/plugins/autotest/unit_test/mixed_atp/src/main.cpp b/src/plugins/autotest/unit_test/mixed_atp/src/main.cpp
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/src/main.cpp
rename to src/plugins/autotest/unit_test/mixed_atp/src/main.cpp
diff --git a/plugins/autotest/unit_test/mixed_atp/src/src.pro b/src/plugins/autotest/unit_test/mixed_atp/src/src.pro
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/src/src.pro
rename to src/plugins/autotest/unit_test/mixed_atp/src/src.pro
diff --git a/plugins/autotest/unit_test/mixed_atp/src/src.qbs b/src/plugins/autotest/unit_test/mixed_atp/src/src.qbs
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/src/src.qbs
rename to src/plugins/autotest/unit_test/mixed_atp/src/src.qbs
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/auto.pro b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/auto.pro
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/auto.pro
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/auto.pro
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/auto.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/auto.qbs
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/auto.qbs
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/auto.qbs
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.pro b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.pro
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.pro
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.pro
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.qbs
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.qbs
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.qbs
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/tst_benchtest.cpp b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/tst_benchtest.cpp
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/bench/tst_benchtest.cpp
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/tst_benchtest.cpp
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.pro b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.pro
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.pro
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.pro
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.qbs
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.qbs
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.qbs
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/tst_foo.cpp b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/tst_foo.cpp
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/tst_foo.cpp
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/tst_foo.cpp
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/tst_foo.h b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/tst_foo.h
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/tst_foo.h
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/tst_foo.h
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/gui/gui.pro b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/gui/gui.pro
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/gui/gui.pro
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/gui/gui.pro
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/gui/gui.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/gui/gui.qbs
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/gui/gui.qbs
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/gui/gui.qbs
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/gui/tst_guitest.cpp b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/gui/tst_guitest.cpp
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/gui/tst_guitest.cpp
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/gui/tst_guitest.cpp
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/TestDummy.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/TestDummy.qml
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/TestDummy.qml
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/TestDummy.qml
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/bar/tst_foo.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/bar/tst_foo.qml
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/bar/tst_foo.qml
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/bar/tst_foo.qml
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/main.cpp b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/main.cpp
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/main.cpp
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/main.cpp
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/notlisted/tst_bla.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/notlisted/tst_bla.qml
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/notlisted/tst_bla.qml
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/notlisted/tst_bla.qml
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.pro b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.pro
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.pro
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.pro
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.qbs
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.qbs
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.qbs
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test1.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test1.qml
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test1.qml
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test1.qml
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test2.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test2.qml
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test2.qml
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test2.qml
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test3.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test3.qml
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test3.qml
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/tst_test3.qml
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/main.cpp b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/main.cpp
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/main.cpp
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/main.cpp
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.pro b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.pro
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.pro
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.pro
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.qbs
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.qbs
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.qbs
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/tst_test1.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/tst_test1.qml
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/tst_test1.qml
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/tst_test1.qml
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/tst_test2.qml b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/tst_test2.qml
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/tst_test2.qml
rename to src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/tst_test2.qml
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/tests.pro b/src/plugins/autotest/unit_test/mixed_atp/tests/tests.pro
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/tests.pro
rename to src/plugins/autotest/unit_test/mixed_atp/tests/tests.pro
diff --git a/plugins/autotest/unit_test/mixed_atp/tests/tests.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/tests.qbs
similarity index 100%
rename from plugins/autotest/unit_test/mixed_atp/tests/tests.qbs
rename to src/plugins/autotest/unit_test/mixed_atp/tests/tests.qbs
diff --git a/plugins/autotest/unit_test/plain/plain.pro b/src/plugins/autotest/unit_test/plain/plain.pro
similarity index 100%
rename from plugins/autotest/unit_test/plain/plain.pro
rename to src/plugins/autotest/unit_test/plain/plain.pro
diff --git a/plugins/autotest/unit_test/plain/plain.qbs b/src/plugins/autotest/unit_test/plain/plain.qbs
similarity index 100%
rename from plugins/autotest/unit_test/plain/plain.qbs
rename to src/plugins/autotest/unit_test/plain/plain.qbs
diff --git a/plugins/autotest/unit_test/plain/test_plain/test_plain.pro b/src/plugins/autotest/unit_test/plain/test_plain/test_plain.pro
similarity index 100%
rename from plugins/autotest/unit_test/plain/test_plain/test_plain.pro
rename to src/plugins/autotest/unit_test/plain/test_plain/test_plain.pro
diff --git a/plugins/autotest/unit_test/plain/test_plain/test_plain.qbs b/src/plugins/autotest/unit_test/plain/test_plain/test_plain.qbs
similarity index 100%
rename from plugins/autotest/unit_test/plain/test_plain/test_plain.qbs
rename to src/plugins/autotest/unit_test/plain/test_plain/test_plain.qbs
diff --git a/plugins/autotest/unit_test/plain/test_plain/tst_simple.cpp b/src/plugins/autotest/unit_test/plain/test_plain/tst_simple.cpp
similarity index 100%
rename from plugins/autotest/unit_test/plain/test_plain/tst_simple.cpp
rename to src/plugins/autotest/unit_test/plain/test_plain/tst_simple.cpp
diff --git a/plugins/autotest/unit_test/plain/test_plain/tst_simple.h b/src/plugins/autotest/unit_test/plain/test_plain/tst_simple.h
similarity index 100%
rename from plugins/autotest/unit_test/plain/test_plain/tst_simple.h
rename to src/plugins/autotest/unit_test/plain/test_plain/tst_simple.h
diff --git a/plugins/autotest/unit_test/simple_gt/simple_gt.pro b/src/plugins/autotest/unit_test/simple_gt/simple_gt.pro
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/simple_gt.pro
rename to src/plugins/autotest/unit_test/simple_gt/simple_gt.pro
diff --git a/plugins/autotest/unit_test/simple_gt/src/main.cpp b/src/plugins/autotest/unit_test/simple_gt/src/main.cpp
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/src/main.cpp
rename to src/plugins/autotest/unit_test/simple_gt/src/main.cpp
diff --git a/plugins/autotest/unit_test/simple_gt/src/src.pro b/src/plugins/autotest/unit_test/simple_gt/src/src.pro
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/src/src.pro
rename to src/plugins/autotest/unit_test/simple_gt/src/src.pro
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gt1/further.cpp b/src/plugins/autotest/unit_test/simple_gt/tests/gt1/further.cpp
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gt1/further.cpp
rename to src/plugins/autotest/unit_test/simple_gt/tests/gt1/further.cpp
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gt1/gt1.pro b/src/plugins/autotest/unit_test/simple_gt/tests/gt1/gt1.pro
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gt1/gt1.pro
rename to src/plugins/autotest/unit_test/simple_gt/tests/gt1/gt1.pro
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gt1/main.cpp b/src/plugins/autotest/unit_test/simple_gt/tests/gt1/main.cpp
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gt1/main.cpp
rename to src/plugins/autotest/unit_test/simple_gt/tests/gt1/main.cpp
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gt2/gt2.pro b/src/plugins/autotest/unit_test/simple_gt/tests/gt2/gt2.pro
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gt2/gt2.pro
rename to src/plugins/autotest/unit_test/simple_gt/tests/gt2/gt2.pro
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gt2/main.cpp b/src/plugins/autotest/unit_test/simple_gt/tests/gt2/main.cpp
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gt2/main.cpp
rename to src/plugins/autotest/unit_test/simple_gt/tests/gt2/main.cpp
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gt2/queuetest.h b/src/plugins/autotest/unit_test/simple_gt/tests/gt2/queuetest.h
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gt2/queuetest.h
rename to src/plugins/autotest/unit_test/simple_gt/tests/gt2/queuetest.h
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gt3/dummytest.h b/src/plugins/autotest/unit_test/simple_gt/tests/gt3/dummytest.h
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gt3/dummytest.h
rename to src/plugins/autotest/unit_test/simple_gt/tests/gt3/dummytest.h
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gt3/gt3.pro b/src/plugins/autotest/unit_test/simple_gt/tests/gt3/gt3.pro
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gt3/gt3.pro
rename to src/plugins/autotest/unit_test/simple_gt/tests/gt3/gt3.pro
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gt3/main.cpp b/src/plugins/autotest/unit_test/simple_gt/tests/gt3/main.cpp
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gt3/main.cpp
rename to src/plugins/autotest/unit_test/simple_gt/tests/gt3/main.cpp
diff --git a/plugins/autotest/unit_test/simple_gt/tests/gtest_dependency.pri b/src/plugins/autotest/unit_test/simple_gt/tests/gtest_dependency.pri
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/gtest_dependency.pri
rename to src/plugins/autotest/unit_test/simple_gt/tests/gtest_dependency.pri
diff --git a/plugins/autotest/unit_test/simple_gt/tests/tests.pro b/src/plugins/autotest/unit_test/simple_gt/tests/tests.pro
similarity index 100%
rename from plugins/autotest/unit_test/simple_gt/tests/tests.pro
rename to src/plugins/autotest/unit_test/simple_gt/tests/tests.pro