diff --git a/tier1/kitemmodels/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from tier1/kitemmodels/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/tier1/kitemmodels/COPYING.LIB b/COPYING.LIB
similarity index 100%
rename from tier1/kitemmodels/COPYING.LIB
rename to COPYING.LIB
diff --git a/tier1/kitemmodels/KF5ItemModelsConfig.cmake.in b/KF5ItemModelsConfig.cmake.in
similarity index 100%
rename from tier1/kitemmodels/KF5ItemModelsConfig.cmake.in
rename to KF5ItemModelsConfig.cmake.in
diff --git a/tier1/kitemmodels/Mainpage.dox b/Mainpage.dox
similarity index 100%
rename from tier1/kitemmodels/Mainpage.dox
rename to Mainpage.dox
diff --git a/tier1/kitemmodels/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
similarity index 100%
rename from tier1/kitemmodels/autotests/CMakeLists.txt
rename to autotests/CMakeLists.txt
diff --git a/tier1/kitemmodels/autotests/bihash/CMakeLists.txt b/autotests/bihash/CMakeLists.txt
similarity index 100%
rename from tier1/kitemmodels/autotests/bihash/CMakeLists.txt
rename to autotests/bihash/CMakeLists.txt
diff --git a/tier1/kitemmodels/autotests/bihash/aggregrator.xls b/autotests/bihash/aggregrator.xls
similarity index 100%
rename from tier1/kitemmodels/autotests/bihash/aggregrator.xls
rename to autotests/bihash/aggregrator.xls
diff --git a/tier1/kitemmodels/autotests/bihash/benchmarker.py b/autotests/bihash/benchmarker.py
similarity index 100%
rename from tier1/kitemmodels/autotests/bihash/benchmarker.py
rename to autotests/bihash/benchmarker.py
diff --git a/tier1/kitemmodels/autotests/bihash/benchmarks.cpp b/autotests/bihash/benchmarks.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/bihash/benchmarks.cpp
rename to autotests/bihash/benchmarks.cpp
diff --git a/tier1/kitemmodels/autotests/bihash/functionalitytest.cpp b/autotests/bihash/functionalitytest.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/bihash/functionalitytest.cpp
rename to autotests/bihash/functionalitytest.cpp
diff --git a/tier1/kitemmodels/autotests/bihash/script.py b/autotests/bihash/script.py
similarity index 100%
rename from tier1/kitemmodels/autotests/bihash/script.py
rename to autotests/bihash/script.py
diff --git a/tier1/kitemmodels/autotests/kdescendantentitiesproxymodeltest.cpp b/autotests/kdescendantentitiesproxymodeltest.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/kdescendantentitiesproxymodeltest.cpp
rename to autotests/kdescendantentitiesproxymodeltest.cpp
diff --git a/tier1/kitemmodels/autotests/kdescendantsproxymodeltest.cpp b/autotests/kdescendantsproxymodeltest.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/kdescendantsproxymodeltest.cpp
rename to autotests/kdescendantsproxymodeltest.cpp
diff --git a/tier1/kitemmodels/autotests/klinkitemselectionmodeltest.cpp b/autotests/klinkitemselectionmodeltest.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/klinkitemselectionmodeltest.cpp
rename to autotests/klinkitemselectionmodeltest.cpp
diff --git a/tier1/kitemmodels/autotests/klinkitemselectionmodeltest.h b/autotests/klinkitemselectionmodeltest.h
similarity index 100%
rename from tier1/kitemmodels/autotests/klinkitemselectionmodeltest.h
rename to autotests/klinkitemselectionmodeltest.h
diff --git a/tier1/kitemmodels/autotests/kselectionproxymodeltest.cpp b/autotests/kselectionproxymodeltest.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/kselectionproxymodeltest.cpp
rename to autotests/kselectionproxymodeltest.cpp
diff --git a/tier1/kitemmodels/autotests/kselectionproxymodeltestsuite.cpp b/autotests/kselectionproxymodeltestsuite.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/kselectionproxymodeltestsuite.cpp
rename to autotests/kselectionproxymodeltestsuite.cpp
diff --git a/tier1/kitemmodels/autotests/kselectionproxymodeltestsuite.h b/autotests/kselectionproxymodeltestsuite.h
similarity index 100%
rename from tier1/kitemmodels/autotests/kselectionproxymodeltestsuite.h
rename to autotests/kselectionproxymodeltestsuite.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/CMakeLists.txt b/autotests/proxymodeltestapp/CMakeLists.txt
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/CMakeLists.txt
rename to autotests/proxymodeltestapp/CMakeLists.txt
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbdirectionwidget.cpp b/autotests/proxymodeltestapp/breadcrumbdirectionwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbdirectionwidget.cpp
rename to autotests/proxymodeltestapp/breadcrumbdirectionwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbdirectionwidget.h b/autotests/proxymodeltestapp/breadcrumbdirectionwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbdirectionwidget.h
rename to autotests/proxymodeltestapp/breadcrumbdirectionwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbnavigationwidget.cpp b/autotests/proxymodeltestapp/breadcrumbnavigationwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbnavigationwidget.cpp
rename to autotests/proxymodeltestapp/breadcrumbnavigationwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbnavigationwidget.h b/autotests/proxymodeltestapp/breadcrumbnavigationwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbnavigationwidget.h
rename to autotests/proxymodeltestapp/breadcrumbnavigationwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbswidget.cpp b/autotests/proxymodeltestapp/breadcrumbswidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbswidget.cpp
rename to autotests/proxymodeltestapp/breadcrumbswidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbswidget.h b/autotests/proxymodeltestapp/breadcrumbswidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/breadcrumbswidget.h
rename to autotests/proxymodeltestapp/breadcrumbswidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/checkablewidget.cpp b/autotests/proxymodeltestapp/checkablewidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/checkablewidget.cpp
rename to autotests/proxymodeltestapp/checkablewidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/checkablewidget.h b/autotests/proxymodeltestapp/checkablewidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/checkablewidget.h
rename to autotests/proxymodeltestapp/checkablewidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/descendantpmwidget.cpp b/autotests/proxymodeltestapp/descendantpmwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/descendantpmwidget.cpp
rename to autotests/proxymodeltestapp/descendantpmwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/descendantpmwidget.h b/autotests/proxymodeltestapp/descendantpmwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/descendantpmwidget.h
rename to autotests/proxymodeltestapp/descendantpmwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/kidentityproxymodelwidget.cpp b/autotests/proxymodeltestapp/kidentityproxymodelwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/kidentityproxymodelwidget.cpp
rename to autotests/proxymodeltestapp/kidentityproxymodelwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/kidentityproxymodelwidget.h b/autotests/proxymodeltestapp/kidentityproxymodelwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/kidentityproxymodelwidget.h
rename to autotests/proxymodeltestapp/kidentityproxymodelwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/kreparentingproxymodel.cpp b/autotests/proxymodeltestapp/kreparentingproxymodel.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/kreparentingproxymodel.cpp
rename to autotests/proxymodeltestapp/kreparentingproxymodel.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/kreparentingproxymodel.h b/autotests/proxymodeltestapp/kreparentingproxymodel.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/kreparentingproxymodel.h
rename to autotests/proxymodeltestapp/kreparentingproxymodel.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/lessthanwidget.cpp b/autotests/proxymodeltestapp/lessthanwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/lessthanwidget.cpp
rename to autotests/proxymodeltestapp/lessthanwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/lessthanwidget.h b/autotests/proxymodeltestapp/lessthanwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/lessthanwidget.h
rename to autotests/proxymodeltestapp/lessthanwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/main.cpp b/autotests/proxymodeltestapp/main.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/main.cpp
rename to autotests/proxymodeltestapp/main.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/mainwindow.cpp b/autotests/proxymodeltestapp/mainwindow.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/mainwindow.cpp
rename to autotests/proxymodeltestapp/mainwindow.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/mainwindow.h b/autotests/proxymodeltestapp/mainwindow.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/mainwindow.h
rename to autotests/proxymodeltestapp/mainwindow.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/matchcheckingwidget.cpp b/autotests/proxymodeltestapp/matchcheckingwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/matchcheckingwidget.cpp
rename to autotests/proxymodeltestapp/matchcheckingwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/matchcheckingwidget.h b/autotests/proxymodeltestapp/matchcheckingwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/matchcheckingwidget.h
rename to autotests/proxymodeltestapp/matchcheckingwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/modelcommanderwidget.cpp b/autotests/proxymodeltestapp/modelcommanderwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/modelcommanderwidget.cpp
rename to autotests/proxymodeltestapp/modelcommanderwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/modelcommanderwidget.h b/autotests/proxymodeltestapp/modelcommanderwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/modelcommanderwidget.h
rename to autotests/proxymodeltestapp/modelcommanderwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/proxyitemselectionwidget.cpp b/autotests/proxymodeltestapp/proxyitemselectionwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/proxyitemselectionwidget.cpp
rename to autotests/proxymodeltestapp/proxyitemselectionwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/proxyitemselectionwidget.h b/autotests/proxymodeltestapp/proxyitemselectionwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/proxyitemselectionwidget.h
rename to autotests/proxymodeltestapp/proxyitemselectionwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/proxymodeltestwidget.cpp b/autotests/proxymodeltestapp/proxymodeltestwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/proxymodeltestwidget.cpp
rename to autotests/proxymodeltestapp/proxymodeltestwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/proxymodeltestwidget.h b/autotests/proxymodeltestapp/proxymodeltestwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/proxymodeltestwidget.h
rename to autotests/proxymodeltestapp/proxymodeltestwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/recursivefilterpmwidget.cpp b/autotests/proxymodeltestapp/recursivefilterpmwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/recursivefilterpmwidget.cpp
rename to autotests/proxymodeltestapp/recursivefilterpmwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/recursivefilterpmwidget.h b/autotests/proxymodeltestapp/recursivefilterpmwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/recursivefilterpmwidget.h
rename to autotests/proxymodeltestapp/recursivefilterpmwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/reparenting1.png b/autotests/proxymodeltestapp/reparenting1.png
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/reparenting1.png
rename to autotests/proxymodeltestapp/reparenting1.png
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/reparenting2.png b/autotests/proxymodeltestapp/reparenting2.png
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/reparenting2.png
rename to autotests/proxymodeltestapp/reparenting2.png
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/reparenting3.png b/autotests/proxymodeltestapp/reparenting3.png
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/reparenting3.png
rename to autotests/proxymodeltestapp/reparenting3.png
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/reparentingpmwidget.cpp b/autotests/proxymodeltestapp/reparentingpmwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/reparentingpmwidget.cpp
rename to autotests/proxymodeltestapp/reparentingpmwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/reparentingpmwidget.h b/autotests/proxymodeltestapp/reparentingpmwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/reparentingpmwidget.h
rename to autotests/proxymodeltestapp/reparentingpmwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/scriptablereparentingwidget.cpp b/autotests/proxymodeltestapp/scriptablereparentingwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/scriptablereparentingwidget.cpp
rename to autotests/proxymodeltestapp/scriptablereparentingwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/scriptablereparentingwidget.h b/autotests/proxymodeltestapp/scriptablereparentingwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/scriptablereparentingwidget.h
rename to autotests/proxymodeltestapp/scriptablereparentingwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/selectionpmwidget.cpp b/autotests/proxymodeltestapp/selectionpmwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/selectionpmwidget.cpp
rename to autotests/proxymodeltestapp/selectionpmwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/selectionpmwidget.h b/autotests/proxymodeltestapp/selectionpmwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/selectionpmwidget.h
rename to autotests/proxymodeltestapp/selectionpmwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/statesaverwidget.cpp b/autotests/proxymodeltestapp/statesaverwidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/statesaverwidget.cpp
rename to autotests/proxymodeltestapp/statesaverwidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestapp/statesaverwidget.h b/autotests/proxymodeltestapp/statesaverwidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestapp/statesaverwidget.h
rename to autotests/proxymodeltestapp/statesaverwidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/CMakeLists.txt b/autotests/proxymodeltestsuite/CMakeLists.txt
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/CMakeLists.txt
rename to autotests/proxymodeltestsuite/CMakeLists.txt
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/dynamictreemodel.cpp b/autotests/proxymodeltestsuite/dynamictreemodel.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/dynamictreemodel.cpp
rename to autotests/proxymodeltestsuite/dynamictreemodel.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/dynamictreemodel.h b/autotests/proxymodeltestsuite/dynamictreemodel.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/dynamictreemodel.h
rename to autotests/proxymodeltestsuite/dynamictreemodel.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/dynamictreewidget.cpp b/autotests/proxymodeltestsuite/dynamictreewidget.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/dynamictreewidget.cpp
rename to autotests/proxymodeltestsuite/dynamictreewidget.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/dynamictreewidget.h b/autotests/proxymodeltestsuite/dynamictreewidget.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/dynamictreewidget.h
rename to autotests/proxymodeltestsuite/dynamictreewidget.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/eventlogger.qrc b/autotests/proxymodeltestsuite/eventlogger.qrc
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/eventlogger.qrc
rename to autotests/proxymodeltestsuite/eventlogger.qrc
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/eventloggerregister.cpp b/autotests/proxymodeltestsuite/eventloggerregister.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/eventloggerregister.cpp
rename to autotests/proxymodeltestsuite/eventloggerregister.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/eventloggerregister.h b/autotests/proxymodeltestsuite/eventloggerregister.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/eventloggerregister.h
rename to autotests/proxymodeltestsuite/eventloggerregister.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/grantlee_paths.h.cmake b/autotests/proxymodeltestsuite/grantlee_paths.h.cmake
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/grantlee_paths.h.cmake
rename to autotests/proxymodeltestsuite/grantlee_paths.h.cmake
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/indexfinder.h b/autotests/proxymodeltestsuite/indexfinder.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/indexfinder.h
rename to autotests/proxymodeltestsuite/indexfinder.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modelcommander.cpp b/autotests/proxymodeltestsuite/modelcommander.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modelcommander.cpp
rename to autotests/proxymodeltestsuite/modelcommander.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modelcommander.h b/autotests/proxymodeltestsuite/modelcommander.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modelcommander.h
rename to autotests/proxymodeltestsuite/modelcommander.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modeldumper.cpp b/autotests/proxymodeltestsuite/modeldumper.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modeldumper.cpp
rename to autotests/proxymodeltestsuite/modeldumper.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modeldumper.h b/autotests/proxymodeltestsuite/modeldumper.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modeldumper.h
rename to autotests/proxymodeltestsuite/modeldumper.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modeleventlogger.cpp b/autotests/proxymodeltestsuite/modeleventlogger.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modeleventlogger.cpp
rename to autotests/proxymodeltestsuite/modeleventlogger.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modeleventlogger.h b/autotests/proxymodeltestsuite/modeleventlogger.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modeleventlogger.h
rename to autotests/proxymodeltestsuite/modeleventlogger.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modelselector.cpp b/autotests/proxymodeltestsuite/modelselector.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modelselector.cpp
rename to autotests/proxymodeltestsuite/modelselector.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modelselector.h b/autotests/proxymodeltestsuite/modelselector.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modelselector.h
rename to autotests/proxymodeltestsuite/modelselector.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modelspy.cpp b/autotests/proxymodeltestsuite/modelspy.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modelspy.cpp
rename to autotests/proxymodeltestsuite/modelspy.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modelspy.h b/autotests/proxymodeltestsuite/modelspy.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modelspy.h
rename to autotests/proxymodeltestsuite/modelspy.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modeltest.cpp b/autotests/proxymodeltestsuite/modeltest.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modeltest.cpp
rename to autotests/proxymodeltestsuite/modeltest.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/modeltest.h b/autotests/proxymodeltestsuite/modeltest.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/modeltest.h
rename to autotests/proxymodeltestsuite/modeltest.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/persistentchangelist.h b/autotests/proxymodeltestsuite/persistentchangelist.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/persistentchangelist.h
rename to autotests/proxymodeltestsuite/persistentchangelist.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/proxymodeltest.cpp b/autotests/proxymodeltestsuite/proxymodeltest.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/proxymodeltest.cpp
rename to autotests/proxymodeltestsuite/proxymodeltest.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/proxymodeltest.h b/autotests/proxymodeltestsuite/proxymodeltest.h
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/proxymodeltest.h
rename to autotests/proxymodeltestsuite/proxymodeltest.h
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/templates/datachanged.cpp b/autotests/proxymodeltestsuite/templates/datachanged.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/templates/datachanged.cpp
rename to autotests/proxymodeltestsuite/templates/datachanged.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/templates/init.cpp b/autotests/proxymodeltestsuite/templates/init.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/templates/init.cpp
rename to autotests/proxymodeltestsuite/templates/init.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/templates/layoutchanged.cpp b/autotests/proxymodeltestsuite/templates/layoutchanged.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/templates/layoutchanged.cpp
rename to autotests/proxymodeltestsuite/templates/layoutchanged.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/templates/main.cpp b/autotests/proxymodeltestsuite/templates/main.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/templates/main.cpp
rename to autotests/proxymodeltestsuite/templates/main.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/templates/modelreset.cpp b/autotests/proxymodeltestsuite/templates/modelreset.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/templates/modelreset.cpp
rename to autotests/proxymodeltestsuite/templates/modelreset.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/templates/rowsinserted.cpp b/autotests/proxymodeltestsuite/templates/rowsinserted.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/templates/rowsinserted.cpp
rename to autotests/proxymodeltestsuite/templates/rowsinserted.cpp
diff --git a/tier1/kitemmodels/autotests/proxymodeltestsuite/templates/rowsremoved.cpp b/autotests/proxymodeltestsuite/templates/rowsremoved.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/proxymodeltestsuite/templates/rowsremoved.cpp
rename to autotests/proxymodeltestsuite/templates/rowsremoved.cpp
diff --git a/tier1/kitemmodels/autotests/testmodelqueuedconnections.cpp b/autotests/testmodelqueuedconnections.cpp
similarity index 100%
rename from tier1/kitemmodels/autotests/testmodelqueuedconnections.cpp
rename to autotests/testmodelqueuedconnections.cpp
diff --git a/tier1/kitemmodels/dox/descendantentitiesproxymodel-colfilter.png b/dox/descendantentitiesproxymodel-colfilter.png
similarity index 100%
rename from tier1/kitemmodels/dox/descendantentitiesproxymodel-colfilter.png
rename to dox/descendantentitiesproxymodel-colfilter.png
diff --git a/tier1/kitemmodels/dox/descendantentitiesproxymodel-withansecnames.png b/dox/descendantentitiesproxymodel-withansecnames.png
similarity index 100%
rename from tier1/kitemmodels/dox/descendantentitiesproxymodel-withansecnames.png
rename to dox/descendantentitiesproxymodel-withansecnames.png
diff --git a/tier1/kitemmodels/dox/descendantentitiesproxymodel.png b/dox/descendantentitiesproxymodel.png
similarity index 100%
rename from tier1/kitemmodels/dox/descendantentitiesproxymodel.png
rename to dox/descendantentitiesproxymodel.png
diff --git a/tier1/kitemmodels/dox/entitytreemodel-collections.png b/dox/entitytreemodel-collections.png
similarity index 100%
rename from tier1/kitemmodels/dox/entitytreemodel-collections.png
rename to dox/entitytreemodel-collections.png
diff --git a/tier1/kitemmodels/dox/entitytreemodel-showroot.png b/dox/entitytreemodel-showroot.png
similarity index 100%
rename from tier1/kitemmodels/dox/entitytreemodel-showroot.png
rename to dox/entitytreemodel-showroot.png
diff --git a/tier1/kitemmodels/dox/entitytreemodel-showrootwithname.png b/dox/entitytreemodel-showrootwithname.png
similarity index 100%
rename from tier1/kitemmodels/dox/entitytreemodel-showrootwithname.png
rename to dox/entitytreemodel-showrootwithname.png
diff --git a/tier1/kitemmodels/dox/entitytreemodel.png b/dox/entitytreemodel.png
similarity index 100%
rename from tier1/kitemmodels/dox/entitytreemodel.png
rename to dox/entitytreemodel.png
diff --git a/tier1/kitemmodels/dox/kbreadcrumbselectionmodel.png b/dox/kbreadcrumbselectionmodel.png
similarity index 100%
rename from tier1/kitemmodels/dox/kbreadcrumbselectionmodel.png
rename to dox/kbreadcrumbselectionmodel.png
diff --git a/tier1/kitemmodels/dox/kcheckableproxymodel.png b/dox/kcheckableproxymodel.png
similarity index 100%
rename from tier1/kitemmodels/dox/kcheckableproxymodel.png
rename to dox/kcheckableproxymodel.png
diff --git a/tier1/kitemmodels/dox/kproxyitemselectionmodel-complex.png b/dox/kproxyitemselectionmodel-complex.png
similarity index 100%
rename from tier1/kitemmodels/dox/kproxyitemselectionmodel-complex.png
rename to dox/kproxyitemselectionmodel-complex.png
diff --git a/tier1/kitemmodels/dox/kproxyitemselectionmodel-error.png b/dox/kproxyitemselectionmodel-error.png
similarity index 100%
rename from tier1/kitemmodels/dox/kproxyitemselectionmodel-error.png
rename to dox/kproxyitemselectionmodel-error.png
diff --git a/tier1/kitemmodels/dox/kproxyitemselectionmodel-simple.png b/dox/kproxyitemselectionmodel-simple.png
similarity index 100%
rename from tier1/kitemmodels/dox/kproxyitemselectionmodel-simple.png
rename to dox/kproxyitemselectionmodel-simple.png
diff --git a/tier1/kitemmodels/dox/kproxyitemselectionmodel-solution.png b/dox/kproxyitemselectionmodel-solution.png
similarity index 100%
rename from tier1/kitemmodels/dox/kproxyitemselectionmodel-solution.png
rename to dox/kproxyitemselectionmodel-solution.png
diff --git a/tier1/kitemmodels/dox/kselectionproxymodel-testapp.png b/dox/kselectionproxymodel-testapp.png
similarity index 100%
rename from tier1/kitemmodels/dox/kselectionproxymodel-testapp.png
rename to dox/kselectionproxymodel-testapp.png
diff --git a/tier1/kitemmodels/dox/mailmodelapp.png b/dox/mailmodelapp.png
similarity index 100%
rename from tier1/kitemmodels/dox/mailmodelapp.png
rename to dox/mailmodelapp.png
diff --git a/tier1/kitemmodels/dox/selectionproxymodel-ordered.png b/dox/selectionproxymodel-ordered.png
similarity index 100%
rename from tier1/kitemmodels/dox/selectionproxymodel-ordered.png
rename to dox/selectionproxymodel-ordered.png
diff --git a/tier1/kitemmodels/dox/selectionproxymodelmultipleselection-withdescendant.png b/dox/selectionproxymodelmultipleselection-withdescendant.png
similarity index 100%
rename from tier1/kitemmodels/dox/selectionproxymodelmultipleselection-withdescendant.png
rename to dox/selectionproxymodelmultipleselection-withdescendant.png
diff --git a/tier1/kitemmodels/dox/selectionproxymodelmultipleselection.png b/dox/selectionproxymodelmultipleselection.png
similarity index 100%
rename from tier1/kitemmodels/dox/selectionproxymodelmultipleselection.png
rename to dox/selectionproxymodelmultipleselection.png
diff --git a/tier1/kitemmodels/dox/selectionproxymodelsimpleselection.png b/dox/selectionproxymodelsimpleselection.png
similarity index 100%
rename from tier1/kitemmodels/dox/selectionproxymodelsimpleselection.png
rename to dox/selectionproxymodelsimpleselection.png
diff --git a/tier1/kitemmodels/dox/treeandlistapp.png b/dox/treeandlistapp.png
similarity index 100%
rename from tier1/kitemmodels/dox/treeandlistapp.png
rename to dox/treeandlistapp.png
diff --git a/tier1/kitemmodels/dox/treeandlistappwithdesclist.png b/dox/treeandlistappwithdesclist.png
similarity index 100%
rename from tier1/kitemmodels/dox/treeandlistappwithdesclist.png
rename to dox/treeandlistappwithdesclist.png
diff --git a/tier1/kitemmodels/src/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from tier1/kitemmodels/src/CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/tier1/kitemmodels/src/kbihash_p.h b/src/kbihash_p.h
similarity index 100%
rename from tier1/kitemmodels/src/kbihash_p.h
rename to src/kbihash_p.h
diff --git a/tier1/kitemmodels/src/kbreadcrumbselectionmodel.cpp b/src/kbreadcrumbselectionmodel.cpp
similarity index 100%
rename from tier1/kitemmodels/src/kbreadcrumbselectionmodel.cpp
rename to src/kbreadcrumbselectionmodel.cpp
diff --git a/tier1/kitemmodels/src/kbreadcrumbselectionmodel.h b/src/kbreadcrumbselectionmodel.h
similarity index 100%
rename from tier1/kitemmodels/src/kbreadcrumbselectionmodel.h
rename to src/kbreadcrumbselectionmodel.h
diff --git a/tier1/kitemmodels/src/kcheckableproxymodel.cpp b/src/kcheckableproxymodel.cpp
similarity index 100%
rename from tier1/kitemmodels/src/kcheckableproxymodel.cpp
rename to src/kcheckableproxymodel.cpp
diff --git a/tier1/kitemmodels/src/kcheckableproxymodel.h b/src/kcheckableproxymodel.h
similarity index 100%
rename from tier1/kitemmodels/src/kcheckableproxymodel.h
rename to src/kcheckableproxymodel.h
diff --git a/tier1/kitemmodels/src/kdescendantsproxymodel.cpp b/src/kdescendantsproxymodel.cpp
similarity index 100%
rename from tier1/kitemmodels/src/kdescendantsproxymodel.cpp
rename to src/kdescendantsproxymodel.cpp
diff --git a/tier1/kitemmodels/src/kdescendantsproxymodel.h b/src/kdescendantsproxymodel.h
similarity index 100%
rename from tier1/kitemmodels/src/kdescendantsproxymodel.h
rename to src/kdescendantsproxymodel.h
diff --git a/tier1/kitemmodels/src/klinkitemselectionmodel.cpp b/src/klinkitemselectionmodel.cpp
similarity index 100%
rename from tier1/kitemmodels/src/klinkitemselectionmodel.cpp
rename to src/klinkitemselectionmodel.cpp
diff --git a/tier1/kitemmodels/src/klinkitemselectionmodel.h b/src/klinkitemselectionmodel.h
similarity index 100%
rename from tier1/kitemmodels/src/klinkitemselectionmodel.h
rename to src/klinkitemselectionmodel.h
diff --git a/tier1/kitemmodels/src/kmodelindexproxymapper.cpp b/src/kmodelindexproxymapper.cpp
similarity index 100%
rename from tier1/kitemmodels/src/kmodelindexproxymapper.cpp
rename to src/kmodelindexproxymapper.cpp
diff --git a/tier1/kitemmodels/src/kmodelindexproxymapper.h b/src/kmodelindexproxymapper.h
similarity index 100%
rename from tier1/kitemmodels/src/kmodelindexproxymapper.h
rename to src/kmodelindexproxymapper.h
diff --git a/tier1/kitemmodels/src/krecursivefilterproxymodel.cpp b/src/krecursivefilterproxymodel.cpp
similarity index 100%
rename from tier1/kitemmodels/src/krecursivefilterproxymodel.cpp
rename to src/krecursivefilterproxymodel.cpp
diff --git a/tier1/kitemmodels/src/krecursivefilterproxymodel.h b/src/krecursivefilterproxymodel.h
similarity index 100%
rename from tier1/kitemmodels/src/krecursivefilterproxymodel.h
rename to src/krecursivefilterproxymodel.h
diff --git a/tier1/kitemmodels/src/kselectionproxymodel.cpp b/src/kselectionproxymodel.cpp
similarity index 100%
rename from tier1/kitemmodels/src/kselectionproxymodel.cpp
rename to src/kselectionproxymodel.cpp
diff --git a/tier1/kitemmodels/src/kselectionproxymodel.h b/src/kselectionproxymodel.h
similarity index 100%
rename from tier1/kitemmodels/src/kselectionproxymodel.h
rename to src/kselectionproxymodel.h
diff --git a/tier1/kitemmodels/src/kvoidpointerfactory_p.h b/src/kvoidpointerfactory_p.h
similarity index 100%
rename from tier1/kitemmodels/src/kvoidpointerfactory_p.h
rename to src/kvoidpointerfactory_p.h