diff --git a/mailcommon/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from mailcommon/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/mailcommon/KF5MailCommonConfig.cmake.in b/KF5MailCommonConfig.cmake.in
similarity index 100%
rename from mailcommon/KF5MailCommonConfig.cmake.in
rename to KF5MailCommonConfig.cmake.in
diff --git a/mailcommon/cmake/modules/FindXsltproc.cmake b/cmake/modules/FindXsltproc.cmake
similarity index 100%
rename from mailcommon/cmake/modules/FindXsltproc.cmake
rename to cmake/modules/FindXsltproc.cmake
diff --git a/mailcommon/mailcommon.categories b/mailcommon.categories
similarity index 100%
rename from mailcommon/mailcommon.categories
rename to mailcommon.categories
diff --git a/mailcommon/src/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from mailcommon/src/CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/mailcommon/src/Mainpage.dox b/src/Mainpage.dox
similarity index 100%
rename from mailcommon/src/Mainpage.dox
rename to src/Mainpage.dox
diff --git a/mailcommon/src/Messages.sh b/src/Messages.sh
similarity index 100%
rename from mailcommon/src/Messages.sh
rename to src/Messages.sh
diff --git a/mailcommon/src/collectionpage/attributeregistrar.cpp b/src/collectionpage/attributeregistrar.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/attributeregistrar.cpp
rename to src/collectionpage/attributeregistrar.cpp
diff --git a/mailcommon/src/collectionpage/attributes/collectionannotationsattribute.cpp b/src/collectionpage/attributes/collectionannotationsattribute.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/attributes/collectionannotationsattribute.cpp
rename to src/collectionpage/attributes/collectionannotationsattribute.cpp
diff --git a/mailcommon/src/collectionpage/attributes/collectionannotationsattribute.h b/src/collectionpage/attributes/collectionannotationsattribute.h
similarity index 100%
rename from mailcommon/src/collectionpage/attributes/collectionannotationsattribute.h
rename to src/collectionpage/attributes/collectionannotationsattribute.h
diff --git a/mailcommon/src/collectionpage/attributes/expirecollectionattribute.cpp b/src/collectionpage/attributes/expirecollectionattribute.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/attributes/expirecollectionattribute.cpp
rename to src/collectionpage/attributes/expirecollectionattribute.cpp
diff --git a/mailcommon/src/collectionpage/attributes/expirecollectionattribute.h b/src/collectionpage/attributes/expirecollectionattribute.h
similarity index 100%
rename from mailcommon/src/collectionpage/attributes/expirecollectionattribute.h
rename to src/collectionpage/attributes/expirecollectionattribute.h
diff --git a/mailcommon/src/collectionpage/autotests/CMakeLists.txt b/src/collectionpage/autotests/CMakeLists.txt
similarity index 100%
rename from mailcommon/src/collectionpage/autotests/CMakeLists.txt
rename to src/collectionpage/autotests/CMakeLists.txt
diff --git a/mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.cpp b/src/collectionpage/autotests/collectionannotationsattributetest.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.cpp
rename to src/collectionpage/autotests/collectionannotationsattributetest.cpp
diff --git a/mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.h b/src/collectionpage/autotests/collectionannotationsattributetest.h
similarity index 100%
rename from mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.h
rename to src/collectionpage/autotests/collectionannotationsattributetest.h
diff --git a/mailcommon/src/collectionpage/autotests/contenttypewidgettest.cpp b/src/collectionpage/autotests/contenttypewidgettest.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/autotests/contenttypewidgettest.cpp
rename to src/collectionpage/autotests/contenttypewidgettest.cpp
diff --git a/mailcommon/src/collectionpage/autotests/contenttypewidgettest.h b/src/collectionpage/autotests/contenttypewidgettest.h
similarity index 100%
rename from mailcommon/src/collectionpage/autotests/contenttypewidgettest.h
rename to src/collectionpage/autotests/contenttypewidgettest.h
diff --git a/mailcommon/src/collectionpage/autotests/expirecollectionattributetest.cpp b/src/collectionpage/autotests/expirecollectionattributetest.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/autotests/expirecollectionattributetest.cpp
rename to src/collectionpage/autotests/expirecollectionattributetest.cpp
diff --git a/mailcommon/src/collectionpage/autotests/expirecollectionattributetest.h b/src/collectionpage/autotests/expirecollectionattributetest.h
similarity index 100%
rename from mailcommon/src/collectionpage/autotests/expirecollectionattributetest.h
rename to src/collectionpage/autotests/expirecollectionattributetest.h
diff --git a/mailcommon/src/collectionpage/autotests/incidencesforwidgettest.cpp b/src/collectionpage/autotests/incidencesforwidgettest.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/autotests/incidencesforwidgettest.cpp
rename to src/collectionpage/autotests/incidencesforwidgettest.cpp
diff --git a/mailcommon/src/collectionpage/autotests/incidencesforwidgettest.h b/src/collectionpage/autotests/incidencesforwidgettest.h
similarity index 100%
rename from mailcommon/src/collectionpage/autotests/incidencesforwidgettest.h
rename to src/collectionpage/autotests/incidencesforwidgettest.h
diff --git a/mailcommon/src/collectionpage/collectionexpirypage.cpp b/src/collectionpage/collectionexpirypage.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/collectionexpirypage.cpp
rename to src/collectionpage/collectionexpirypage.cpp
diff --git a/mailcommon/src/collectionpage/collectionexpirypage.h b/src/collectionpage/collectionexpirypage.h
similarity index 100%
rename from mailcommon/src/collectionpage/collectionexpirypage.h
rename to src/collectionpage/collectionexpirypage.h
diff --git a/mailcommon/src/collectionpage/collectiongeneralpage.cpp b/src/collectionpage/collectiongeneralpage.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/collectiongeneralpage.cpp
rename to src/collectionpage/collectiongeneralpage.cpp
diff --git a/mailcommon/src/collectionpage/collectiongeneralpage.h b/src/collectionpage/collectiongeneralpage.h
similarity index 100%
rename from mailcommon/src/collectionpage/collectiongeneralpage.h
rename to src/collectionpage/collectiongeneralpage.h
diff --git a/mailcommon/src/collectionpage/collectiontypeutil.cpp b/src/collectionpage/collectiontypeutil.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/collectiontypeutil.cpp
rename to src/collectionpage/collectiontypeutil.cpp
diff --git a/mailcommon/src/collectionpage/collectiontypeutil.h b/src/collectionpage/collectiontypeutil.h
similarity index 100%
rename from mailcommon/src/collectionpage/collectiontypeutil.h
rename to src/collectionpage/collectiontypeutil.h
diff --git a/mailcommon/src/collectionpage/contenttypewidget.cpp b/src/collectionpage/contenttypewidget.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/contenttypewidget.cpp
rename to src/collectionpage/contenttypewidget.cpp
diff --git a/mailcommon/src/collectionpage/contenttypewidget.h b/src/collectionpage/contenttypewidget.h
similarity index 100%
rename from mailcommon/src/collectionpage/contenttypewidget.h
rename to src/collectionpage/contenttypewidget.h
diff --git a/mailcommon/src/collectionpage/incidencesforwidget.cpp b/src/collectionpage/incidencesforwidget.cpp
similarity index 100%
rename from mailcommon/src/collectionpage/incidencesforwidget.cpp
rename to src/collectionpage/incidencesforwidget.cpp
diff --git a/mailcommon/src/collectionpage/incidencesforwidget.h b/src/collectionpage/incidencesforwidget.h
similarity index 100%
rename from mailcommon/src/collectionpage/incidencesforwidget.h
rename to src/collectionpage/incidencesforwidget.h
diff --git a/mailcommon/src/dbusinterfaces/org.freedesktop.Akonadi.MailFilterAgent.xml b/src/dbusinterfaces/org.freedesktop.Akonadi.MailFilterAgent.xml
similarity index 100%
rename from mailcommon/src/dbusinterfaces/org.freedesktop.Akonadi.MailFilterAgent.xml
rename to src/dbusinterfaces/org.freedesktop.Akonadi.MailFilterAgent.xml
diff --git a/mailcommon/src/dbusinterfaces/org.kde.Korganizer.Calendar.xml b/src/dbusinterfaces/org.kde.Korganizer.Calendar.xml
similarity index 100%
rename from mailcommon/src/dbusinterfaces/org.kde.Korganizer.Calendar.xml
rename to src/dbusinterfaces/org.kde.Korganizer.Calendar.xml
diff --git a/mailcommon/src/dbusoperators.h b/src/dbusoperators.h
similarity index 100%
rename from mailcommon/src/dbusoperators.h
rename to src/dbusoperators.h
diff --git a/mailcommon/src/designer/CMakeLists.txt b/src/designer/CMakeLists.txt
similarity index 100%
rename from mailcommon/src/designer/CMakeLists.txt
rename to src/designer/CMakeLists.txt
diff --git a/mailcommon/src/designer/mailcommon.widgets b/src/designer/mailcommon.widgets
similarity index 100%
rename from mailcommon/src/designer/mailcommon.widgets
rename to src/designer/mailcommon.widgets
diff --git a/mailcommon/src/filter/TODO b/src/filter/TODO
similarity index 100%
rename from mailcommon/src/filter/TODO
rename to src/filter/TODO
diff --git a/mailcommon/src/filter/autotests/CMakeLists.txt b/src/filter/autotests/CMakeLists.txt
similarity index 100%
rename from mailcommon/src/filter/autotests/CMakeLists.txt
rename to src/filter/autotests/CMakeLists.txt
diff --git a/mailcommon/src/filter/autotests/filteractionaddheadertest.cpp b/src/filter/autotests/filteractionaddheadertest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionaddheadertest.cpp
rename to src/filter/autotests/filteractionaddheadertest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionaddheadertest.h b/src/filter/autotests/filteractionaddheadertest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionaddheadertest.h
rename to src/filter/autotests/filteractionaddheadertest.h
diff --git a/mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.cpp b/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
rename to src/filter/autotests/filteractionaddtoaddressbooktest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.h b/src/filter/autotests/filteractionaddtoaddressbooktest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.h
rename to src/filter/autotests/filteractionaddtoaddressbooktest.h
diff --git a/mailcommon/src/filter/autotests/filteractioncopytest.cpp b/src/filter/autotests/filteractioncopytest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractioncopytest.cpp
rename to src/filter/autotests/filteractioncopytest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractioncopytest.h b/src/filter/autotests/filteractioncopytest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractioncopytest.h
rename to src/filter/autotests/filteractioncopytest.h
diff --git a/mailcommon/src/filter/autotests/filteractiondeletetest.cpp b/src/filter/autotests/filteractiondeletetest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractiondeletetest.cpp
rename to src/filter/autotests/filteractiondeletetest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractiondeletetest.h b/src/filter/autotests/filteractiondeletetest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractiondeletetest.h
rename to src/filter/autotests/filteractiondeletetest.h
diff --git a/mailcommon/src/filter/autotests/filteractionexectest.cpp b/src/filter/autotests/filteractionexectest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionexectest.cpp
rename to src/filter/autotests/filteractionexectest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionexectest.h b/src/filter/autotests/filteractionexectest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionexectest.h
rename to src/filter/autotests/filteractionexectest.h
diff --git a/mailcommon/src/filter/autotests/filteractionforwardtest.cpp b/src/filter/autotests/filteractionforwardtest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionforwardtest.cpp
rename to src/filter/autotests/filteractionforwardtest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionforwardtest.h b/src/filter/autotests/filteractionforwardtest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionforwardtest.h
rename to src/filter/autotests/filteractionforwardtest.h
diff --git a/mailcommon/src/filter/autotests/filteractionmovetest.cpp b/src/filter/autotests/filteractionmovetest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionmovetest.cpp
rename to src/filter/autotests/filteractionmovetest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionmovetest.h b/src/filter/autotests/filteractionmovetest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionmovetest.h
rename to src/filter/autotests/filteractionmovetest.h
diff --git a/mailcommon/src/filter/autotests/filteractionpipethroughtest.cpp b/src/filter/autotests/filteractionpipethroughtest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionpipethroughtest.cpp
rename to src/filter/autotests/filteractionpipethroughtest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionpipethroughtest.h b/src/filter/autotests/filteractionpipethroughtest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionpipethroughtest.h
rename to src/filter/autotests/filteractionpipethroughtest.h
diff --git a/mailcommon/src/filter/autotests/filteractionplaysoundtest.cpp b/src/filter/autotests/filteractionplaysoundtest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionplaysoundtest.cpp
rename to src/filter/autotests/filteractionplaysoundtest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionplaysoundtest.h b/src/filter/autotests/filteractionplaysoundtest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionplaysoundtest.h
rename to src/filter/autotests/filteractionplaysoundtest.h
diff --git a/mailcommon/src/filter/autotests/filteractionredirecttest.cpp b/src/filter/autotests/filteractionredirecttest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionredirecttest.cpp
rename to src/filter/autotests/filteractionredirecttest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionredirecttest.h b/src/filter/autotests/filteractionredirecttest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionredirecttest.h
rename to src/filter/autotests/filteractionredirecttest.h
diff --git a/mailcommon/src/filter/autotests/filteractionremoveheadertest.cpp b/src/filter/autotests/filteractionremoveheadertest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionremoveheadertest.cpp
rename to src/filter/autotests/filteractionremoveheadertest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionremoveheadertest.h b/src/filter/autotests/filteractionremoveheadertest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionremoveheadertest.h
rename to src/filter/autotests/filteractionremoveheadertest.h
diff --git a/mailcommon/src/filter/autotests/filteractionreplytotest.cpp b/src/filter/autotests/filteractionreplytotest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionreplytotest.cpp
rename to src/filter/autotests/filteractionreplytotest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionreplytotest.h b/src/filter/autotests/filteractionreplytotest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionreplytotest.h
rename to src/filter/autotests/filteractionreplytotest.h
diff --git a/mailcommon/src/filter/autotests/filteractionrewriteheadertest.cpp b/src/filter/autotests/filteractionrewriteheadertest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionrewriteheadertest.cpp
rename to src/filter/autotests/filteractionrewriteheadertest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionrewriteheadertest.h b/src/filter/autotests/filteractionrewriteheadertest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionrewriteheadertest.h
rename to src/filter/autotests/filteractionrewriteheadertest.h
diff --git a/mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.cpp b/src/filter/autotests/filteractionsendfakedispositiontest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.cpp
rename to src/filter/autotests/filteractionsendfakedispositiontest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.h b/src/filter/autotests/filteractionsendfakedispositiontest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.h
rename to src/filter/autotests/filteractionsendfakedispositiontest.h
diff --git a/mailcommon/src/filter/autotests/filteractionsendreceipttest.cpp b/src/filter/autotests/filteractionsendreceipttest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionsendreceipttest.cpp
rename to src/filter/autotests/filteractionsendreceipttest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionsendreceipttest.h b/src/filter/autotests/filteractionsendreceipttest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionsendreceipttest.h
rename to src/filter/autotests/filteractionsendreceipttest.h
diff --git a/mailcommon/src/filter/autotests/filteractionsetstatustest.cpp b/src/filter/autotests/filteractionsetstatustest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionsetstatustest.cpp
rename to src/filter/autotests/filteractionsetstatustest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionsetstatustest.h b/src/filter/autotests/filteractionsetstatustest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionsetstatustest.h
rename to src/filter/autotests/filteractionsetstatustest.h
diff --git a/mailcommon/src/filter/autotests/filteractionsettransporttest.cpp b/src/filter/autotests/filteractionsettransporttest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionsettransporttest.cpp
rename to src/filter/autotests/filteractionsettransporttest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionsettransporttest.h b/src/filter/autotests/filteractionsettransporttest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionsettransporttest.h
rename to src/filter/autotests/filteractionsettransporttest.h
diff --git a/mailcommon/src/filter/autotests/filteractionunsetstatustest.cpp b/src/filter/autotests/filteractionunsetstatustest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionunsetstatustest.cpp
rename to src/filter/autotests/filteractionunsetstatustest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionunsetstatustest.h b/src/filter/autotests/filteractionunsetstatustest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionunsetstatustest.h
rename to src/filter/autotests/filteractionunsetstatustest.h
diff --git a/mailcommon/src/filter/autotests/filteractionwithaddresstest.cpp b/src/filter/autotests/filteractionwithaddresstest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionwithaddresstest.cpp
rename to src/filter/autotests/filteractionwithaddresstest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionwithaddresstest.h b/src/filter/autotests/filteractionwithaddresstest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionwithaddresstest.h
rename to src/filter/autotests/filteractionwithaddresstest.h
diff --git a/mailcommon/src/filter/autotests/filteractionwithurltest.cpp b/src/filter/autotests/filteractionwithurltest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionwithurltest.cpp
rename to src/filter/autotests/filteractionwithurltest.cpp
diff --git a/mailcommon/src/filter/autotests/filteractionwithurltest.h b/src/filter/autotests/filteractionwithurltest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filteractionwithurltest.h
rename to src/filter/autotests/filteractionwithurltest.h
diff --git a/mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.cpp b/src/filter/autotests/filterconverttosieveresultdialogtest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.cpp
rename to src/filter/autotests/filterconverttosieveresultdialogtest.cpp
diff --git a/mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.h b/src/filter/autotests/filterconverttosieveresultdialogtest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.h
rename to src/filter/autotests/filterconverttosieveresultdialogtest.h
diff --git a/mailcommon/src/filter/autotests/invalidfilterdialogtest.cpp b/src/filter/autotests/invalidfilterdialogtest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterdialogtest.cpp
rename to src/filter/autotests/invalidfilterdialogtest.cpp
diff --git a/mailcommon/src/filter/autotests/invalidfilterdialogtest.h b/src/filter/autotests/invalidfilterdialogtest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterdialogtest.h
rename to src/filter/autotests/invalidfilterdialogtest.h
diff --git a/mailcommon/src/filter/autotests/invalidfilterinfotest.cpp b/src/filter/autotests/invalidfilterinfotest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterinfotest.cpp
rename to src/filter/autotests/invalidfilterinfotest.cpp
diff --git a/mailcommon/src/filter/autotests/invalidfilterinfotest.h b/src/filter/autotests/invalidfilterinfotest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterinfotest.h
rename to src/filter/autotests/invalidfilterinfotest.h
diff --git a/mailcommon/src/filter/autotests/invalidfilterinfowidgettest.cpp b/src/filter/autotests/invalidfilterinfowidgettest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterinfowidgettest.cpp
rename to src/filter/autotests/invalidfilterinfowidgettest.cpp
diff --git a/mailcommon/src/filter/autotests/invalidfilterinfowidgettest.h b/src/filter/autotests/invalidfilterinfowidgettest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterinfowidgettest.h
rename to src/filter/autotests/invalidfilterinfowidgettest.h
diff --git a/mailcommon/src/filter/autotests/invalidfilterlistwidgettest.cpp b/src/filter/autotests/invalidfilterlistwidgettest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterlistwidgettest.cpp
rename to src/filter/autotests/invalidfilterlistwidgettest.cpp
diff --git a/mailcommon/src/filter/autotests/invalidfilterlistwidgettest.h b/src/filter/autotests/invalidfilterlistwidgettest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterlistwidgettest.h
rename to src/filter/autotests/invalidfilterlistwidgettest.h
diff --git a/mailcommon/src/filter/autotests/invalidfilterwidgettest.cpp b/src/filter/autotests/invalidfilterwidgettest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterwidgettest.cpp
rename to src/filter/autotests/invalidfilterwidgettest.cpp
diff --git a/mailcommon/src/filter/autotests/invalidfilterwidgettest.h b/src/filter/autotests/invalidfilterwidgettest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/invalidfilterwidgettest.h
rename to src/filter/autotests/invalidfilterwidgettest.h
diff --git a/mailcommon/src/filter/autotests/itemcontexttest.cpp b/src/filter/autotests/itemcontexttest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/itemcontexttest.cpp
rename to src/filter/autotests/itemcontexttest.cpp
diff --git a/mailcommon/src/filter/autotests/itemcontexttest.h b/src/filter/autotests/itemcontexttest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/itemcontexttest.h
rename to src/filter/autotests/itemcontexttest.h
diff --git a/mailcommon/src/filter/autotests/mailfiltertest.cpp b/src/filter/autotests/mailfiltertest.cpp
similarity index 100%
rename from mailcommon/src/filter/autotests/mailfiltertest.cpp
rename to src/filter/autotests/mailfiltertest.cpp
diff --git a/mailcommon/src/filter/autotests/mailfiltertest.h b/src/filter/autotests/mailfiltertest.h
similarity index 100%
rename from mailcommon/src/filter/autotests/mailfiltertest.h
rename to src/filter/autotests/mailfiltertest.h
diff --git a/mailcommon/src/filter/dialog/filteractionmissingargumentdialog.cpp b/src/filter/dialog/filteractionmissingargumentdialog.cpp
similarity index 100%
rename from mailcommon/src/filter/dialog/filteractionmissingargumentdialog.cpp
rename to src/filter/dialog/filteractionmissingargumentdialog.cpp
diff --git a/mailcommon/src/filter/dialog/filteractionmissingargumentdialog.h b/src/filter/dialog/filteractionmissingargumentdialog.h
similarity index 100%
rename from mailcommon/src/filter/dialog/filteractionmissingargumentdialog.h
rename to src/filter/dialog/filteractionmissingargumentdialog.h
diff --git a/mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp b/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
similarity index 100%
rename from mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
rename to src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
diff --git a/mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.h b/src/filter/dialog/selectthunderbirdfilterfilesdialog.h
similarity index 100%
rename from mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.h
rename to src/filter/dialog/selectthunderbirdfilterfilesdialog.h
diff --git a/mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp b/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp
similarity index 100%
rename from mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp
rename to src/filter/dialog/selectthunderbirdfilterfileswidget.cpp
diff --git a/mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.h b/src/filter/dialog/selectthunderbirdfilterfileswidget.h
similarity index 100%
rename from mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.h
rename to src/filter/dialog/selectthunderbirdfilterfileswidget.h
diff --git a/mailcommon/src/filter/filteractions/filteraction.cpp b/src/filter/filteractions/filteraction.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteraction.cpp
rename to src/filter/filteractions/filteraction.cpp
diff --git a/mailcommon/src/filter/filteractions/filteraction.h b/src/filter/filteractions/filteraction.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteraction.h
rename to src/filter/filteractions/filteraction.h
diff --git a/mailcommon/src/filter/filteractions/filteractionaddheader.cpp b/src/filter/filteractions/filteractionaddheader.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionaddheader.cpp
rename to src/filter/filteractions/filteractionaddheader.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionaddheader.h b/src/filter/filteractions/filteractionaddheader.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionaddheader.h
rename to src/filter/filteractions/filteractionaddheader.h
diff --git a/mailcommon/src/filter/filteractions/filteractionaddtag.cpp b/src/filter/filteractions/filteractionaddtag.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionaddtag.cpp
rename to src/filter/filteractions/filteractionaddtag.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionaddtag.h b/src/filter/filteractions/filteractionaddtag.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionaddtag.h
rename to src/filter/filteractions/filteractionaddtag.h
diff --git a/mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.cpp b/src/filter/filteractions/filteractionaddtoaddressbook.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.cpp
rename to src/filter/filteractions/filteractionaddtoaddressbook.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.h b/src/filter/filteractions/filteractionaddtoaddressbook.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.h
rename to src/filter/filteractions/filteractionaddtoaddressbook.h
diff --git a/mailcommon/src/filter/filteractions/filteractioncopy.cpp b/src/filter/filteractions/filteractioncopy.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractioncopy.cpp
rename to src/filter/filteractions/filteractioncopy.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractioncopy.h b/src/filter/filteractions/filteractioncopy.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractioncopy.h
rename to src/filter/filteractions/filteractioncopy.h
diff --git a/mailcommon/src/filter/filteractions/filteractiondelete.cpp b/src/filter/filteractions/filteractiondelete.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractiondelete.cpp
rename to src/filter/filteractions/filteractiondelete.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractiondelete.h b/src/filter/filteractions/filteractiondelete.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractiondelete.h
rename to src/filter/filteractions/filteractiondelete.h
diff --git a/mailcommon/src/filter/filteractions/filteractiondict.cpp b/src/filter/filteractions/filteractiondict.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractiondict.cpp
rename to src/filter/filteractions/filteractiondict.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractiondict.h b/src/filter/filteractions/filteractiondict.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractiondict.h
rename to src/filter/filteractions/filteractiondict.h
diff --git a/mailcommon/src/filter/filteractions/filteractionexec.cpp b/src/filter/filteractions/filteractionexec.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionexec.cpp
rename to src/filter/filteractions/filteractionexec.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionexec.h b/src/filter/filteractions/filteractionexec.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionexec.h
rename to src/filter/filteractions/filteractionexec.h
diff --git a/mailcommon/src/filter/filteractions/filteractionforward.cpp b/src/filter/filteractions/filteractionforward.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionforward.cpp
rename to src/filter/filteractions/filteractionforward.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionforward.h b/src/filter/filteractions/filteractionforward.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionforward.h
rename to src/filter/filteractions/filteractionforward.h
diff --git a/mailcommon/src/filter/filteractions/filteractionmove.cpp b/src/filter/filteractions/filteractionmove.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionmove.cpp
rename to src/filter/filteractions/filteractionmove.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionmove.h b/src/filter/filteractions/filteractionmove.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionmove.h
rename to src/filter/filteractions/filteractionmove.h
diff --git a/mailcommon/src/filter/filteractions/filteractionpipethrough.cpp b/src/filter/filteractions/filteractionpipethrough.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionpipethrough.cpp
rename to src/filter/filteractions/filteractionpipethrough.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionpipethrough.h b/src/filter/filteractions/filteractionpipethrough.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionpipethrough.h
rename to src/filter/filteractions/filteractionpipethrough.h
diff --git a/mailcommon/src/filter/filteractions/filteractionplaysound.cpp b/src/filter/filteractions/filteractionplaysound.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionplaysound.cpp
rename to src/filter/filteractions/filteractionplaysound.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionplaysound.h b/src/filter/filteractions/filteractionplaysound.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionplaysound.h
rename to src/filter/filteractions/filteractionplaysound.h
diff --git a/mailcommon/src/filter/filteractions/filteractionredirect.cpp b/src/filter/filteractions/filteractionredirect.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionredirect.cpp
rename to src/filter/filteractions/filteractionredirect.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionredirect.h b/src/filter/filteractions/filteractionredirect.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionredirect.h
rename to src/filter/filteractions/filteractionredirect.h
diff --git a/mailcommon/src/filter/filteractions/filteractionremoveheader.cpp b/src/filter/filteractions/filteractionremoveheader.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionremoveheader.cpp
rename to src/filter/filteractions/filteractionremoveheader.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionremoveheader.h b/src/filter/filteractions/filteractionremoveheader.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionremoveheader.h
rename to src/filter/filteractions/filteractionremoveheader.h
diff --git a/mailcommon/src/filter/filteractions/filteractionreplyto.cpp b/src/filter/filteractions/filteractionreplyto.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionreplyto.cpp
rename to src/filter/filteractions/filteractionreplyto.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionreplyto.h b/src/filter/filteractions/filteractionreplyto.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionreplyto.h
rename to src/filter/filteractions/filteractionreplyto.h
diff --git a/mailcommon/src/filter/filteractions/filteractionrewriteheader.cpp b/src/filter/filteractions/filteractionrewriteheader.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionrewriteheader.cpp
rename to src/filter/filteractions/filteractionrewriteheader.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionrewriteheader.h b/src/filter/filteractions/filteractionrewriteheader.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionrewriteheader.h
rename to src/filter/filteractions/filteractionrewriteheader.h
diff --git a/mailcommon/src/filter/filteractions/filteractionsendfakedisposition.cpp b/src/filter/filteractions/filteractionsendfakedisposition.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsendfakedisposition.cpp
rename to src/filter/filteractions/filteractionsendfakedisposition.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionsendfakedisposition.h b/src/filter/filteractions/filteractionsendfakedisposition.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsendfakedisposition.h
rename to src/filter/filteractions/filteractionsendfakedisposition.h
diff --git a/mailcommon/src/filter/filteractions/filteractionsendreceipt.cpp b/src/filter/filteractions/filteractionsendreceipt.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsendreceipt.cpp
rename to src/filter/filteractions/filteractionsendreceipt.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionsendreceipt.h b/src/filter/filteractions/filteractionsendreceipt.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsendreceipt.h
rename to src/filter/filteractions/filteractionsendreceipt.h
diff --git a/mailcommon/src/filter/filteractions/filteractionsetidentity.cpp b/src/filter/filteractions/filteractionsetidentity.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsetidentity.cpp
rename to src/filter/filteractions/filteractionsetidentity.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionsetidentity.h b/src/filter/filteractions/filteractionsetidentity.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsetidentity.h
rename to src/filter/filteractions/filteractionsetidentity.h
diff --git a/mailcommon/src/filter/filteractions/filteractionsetstatus.cpp b/src/filter/filteractions/filteractionsetstatus.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsetstatus.cpp
rename to src/filter/filteractions/filteractionsetstatus.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionsetstatus.h b/src/filter/filteractions/filteractionsetstatus.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsetstatus.h
rename to src/filter/filteractions/filteractionsetstatus.h
diff --git a/mailcommon/src/filter/filteractions/filteractionsettransport.cpp b/src/filter/filteractions/filteractionsettransport.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsettransport.cpp
rename to src/filter/filteractions/filteractionsettransport.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionsettransport.h b/src/filter/filteractions/filteractionsettransport.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionsettransport.h
rename to src/filter/filteractions/filteractionsettransport.h
diff --git a/mailcommon/src/filter/filteractions/filteractionstatus.cpp b/src/filter/filteractions/filteractionstatus.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionstatus.cpp
rename to src/filter/filteractions/filteractionstatus.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionstatus.h b/src/filter/filteractions/filteractionstatus.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionstatus.h
rename to src/filter/filteractions/filteractionstatus.h
diff --git a/mailcommon/src/filter/filteractions/filteractionunsetstatus.cpp b/src/filter/filteractions/filteractionunsetstatus.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionunsetstatus.cpp
rename to src/filter/filteractions/filteractionunsetstatus.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionunsetstatus.h b/src/filter/filteractions/filteractionunsetstatus.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionunsetstatus.h
rename to src/filter/filteractions/filteractionunsetstatus.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwidget.cpp b/src/filter/filteractions/filteractionwidget.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwidget.cpp
rename to src/filter/filteractions/filteractionwidget.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwidget.h b/src/filter/filteractions/filteractionwidget.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwidget.h
rename to src/filter/filteractions/filteractionwidget.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwithaddress.cpp b/src/filter/filteractions/filteractionwithaddress.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithaddress.cpp
rename to src/filter/filteractions/filteractionwithaddress.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwithaddress.h b/src/filter/filteractions/filteractionwithaddress.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithaddress.h
rename to src/filter/filteractions/filteractionwithaddress.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwithcommand.cpp b/src/filter/filteractions/filteractionwithcommand.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithcommand.cpp
rename to src/filter/filteractions/filteractionwithcommand.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwithcommand.h b/src/filter/filteractions/filteractionwithcommand.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithcommand.h
rename to src/filter/filteractions/filteractionwithcommand.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwithfolder.cpp b/src/filter/filteractions/filteractionwithfolder.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithfolder.cpp
rename to src/filter/filteractions/filteractionwithfolder.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwithfolder.h b/src/filter/filteractions/filteractionwithfolder.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithfolder.h
rename to src/filter/filteractions/filteractionwithfolder.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwithnone.cpp b/src/filter/filteractions/filteractionwithnone.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithnone.cpp
rename to src/filter/filteractions/filteractionwithnone.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwithnone.h b/src/filter/filteractions/filteractionwithnone.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithnone.h
rename to src/filter/filteractions/filteractionwithnone.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwithstring.cpp b/src/filter/filteractions/filteractionwithstring.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithstring.cpp
rename to src/filter/filteractions/filteractionwithstring.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwithstring.h b/src/filter/filteractions/filteractionwithstring.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithstring.h
rename to src/filter/filteractions/filteractionwithstring.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwithstringlist.cpp b/src/filter/filteractions/filteractionwithstringlist.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithstringlist.cpp
rename to src/filter/filteractions/filteractionwithstringlist.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwithstringlist.h b/src/filter/filteractions/filteractionwithstringlist.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithstringlist.h
rename to src/filter/filteractions/filteractionwithstringlist.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwithtest.cpp b/src/filter/filteractions/filteractionwithtest.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithtest.cpp
rename to src/filter/filteractions/filteractionwithtest.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwithtest.h b/src/filter/filteractions/filteractionwithtest.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithtest.h
rename to src/filter/filteractions/filteractionwithtest.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwithuoid.cpp b/src/filter/filteractions/filteractionwithuoid.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithuoid.cpp
rename to src/filter/filteractions/filteractionwithuoid.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwithuoid.h b/src/filter/filteractions/filteractionwithuoid.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithuoid.h
rename to src/filter/filteractions/filteractionwithuoid.h
diff --git a/mailcommon/src/filter/filteractions/filteractionwithurl.cpp b/src/filter/filteractions/filteractionwithurl.cpp
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithurl.cpp
rename to src/filter/filteractions/filteractionwithurl.cpp
diff --git a/mailcommon/src/filter/filteractions/filteractionwithurl.h b/src/filter/filteractions/filteractionwithurl.h
similarity index 100%
rename from mailcommon/src/filter/filteractions/filteractionwithurl.h
rename to src/filter/filteractions/filteractionwithurl.h
diff --git a/mailcommon/src/filter/filterconverter/filterconverttosieve.cpp b/src/filter/filterconverter/filterconverttosieve.cpp
similarity index 100%
rename from mailcommon/src/filter/filterconverter/filterconverttosieve.cpp
rename to src/filter/filterconverter/filterconverttosieve.cpp
diff --git a/mailcommon/src/filter/filterconverter/filterconverttosieve.h b/src/filter/filterconverter/filterconverttosieve.h
similarity index 100%
rename from mailcommon/src/filter/filterconverter/filterconverttosieve.h
rename to src/filter/filterconverter/filterconverttosieve.h
diff --git a/mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.cpp b/src/filter/filterconverter/filterconverttosieveresultdialog.cpp
similarity index 100%
rename from mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.cpp
rename to src/filter/filterconverter/filterconverttosieveresultdialog.cpp
diff --git a/mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.h b/src/filter/filterconverter/filterconverttosieveresultdialog.h
similarity index 100%
rename from mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.h
rename to src/filter/filterconverter/filterconverttosieveresultdialog.h
diff --git a/mailcommon/src/filter/filterimporter/autotests/CMakeLists.txt b/src/filter/filterimporter/autotests/CMakeLists.txt
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/CMakeLists.txt
rename to src/filter/filterimporter/autotests/CMakeLists.txt
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.cpp b/src/filter/filterimporter/autotests/filterimportbalsatest.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.cpp
rename to src/filter/filterimporter/autotests/filterimportbalsatest.cpp
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.h b/src/filter/filterimporter/autotests/filterimportbalsatest.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.h
rename to src/filter/filterimporter/autotests/filterimportbalsatest.h
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp b/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp
rename to src/filter/filterimporter/autotests/filterimportclawmailtest.cpp
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.h b/src/filter/filterimporter/autotests/filterimportclawmailtest.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.h
rename to src/filter/filterimporter/autotests/filterimportclawmailtest.h
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.cpp b/src/filter/filterimporter/autotests/filterimportergmailtest.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.cpp
rename to src/filter/filterimporter/autotests/filterimportergmailtest.cpp
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.h b/src/filter/filterimporter/autotests/filterimportergmailtest.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.h
rename to src/filter/filterimporter/autotests/filterimportergmailtest.h
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp b/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp
rename to src/filter/filterimporter/autotests/filterimportevolutiontest.cpp
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.h b/src/filter/filterimporter/autotests/filterimportevolutiontest.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.h
rename to src/filter/filterimporter/autotests/filterimportevolutiontest.h
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp b/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp
rename to src/filter/filterimporter/autotests/filterimportprocmailtest.cpp
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.h b/src/filter/filterimporter/autotests/filterimportprocmailtest.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.h
rename to src/filter/filterimporter/autotests/filterimportprocmailtest.h
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp b/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
rename to src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.h b/src/filter/filterimporter/autotests/filterimportsylpheedtest.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.h
rename to src/filter/filterimporter/autotests/filterimportsylpheedtest.h
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp b/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
rename to src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
diff --git a/mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.h b/src/filter/filterimporter/autotests/filterimportthunderbirdtest.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.h
rename to src/filter/filterimporter/autotests/filterimportthunderbirdtest.h
diff --git a/mailcommon/src/filter/filterimporter/autotests/filtertestkernel.cpp b/src/filter/filterimporter/autotests/filtertestkernel.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filtertestkernel.cpp
rename to src/filter/filterimporter/autotests/filtertestkernel.cpp
diff --git a/mailcommon/src/filter/filterimporter/autotests/filtertestkernel.h b/src/filter/filterimporter/autotests/filtertestkernel.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/filtertestkernel.h
rename to src/filter/filterimporter/autotests/filtertestkernel.h
diff --git a/mailcommon/src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml b/src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml
rename to src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml
diff --git a/mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc b/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
rename to src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
diff --git a/mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc b/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc
rename to src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc
diff --git a/mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc b/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc
rename to src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc
diff --git a/mailcommon/src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc b/src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
similarity index 100%
rename from mailcommon/src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
rename to src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
diff --git a/mailcommon/src/filter/filterimporter/filterimporterabstract.cpp b/src/filter/filterimporter/filterimporterabstract.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterabstract.cpp
rename to src/filter/filterimporter/filterimporterabstract.cpp
diff --git a/mailcommon/src/filter/filterimporter/filterimporterabstract.h b/src/filter/filterimporter/filterimporterabstract.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterabstract.h
rename to src/filter/filterimporter/filterimporterabstract.h
diff --git a/mailcommon/src/filter/filterimporter/filterimporterbalsa.cpp b/src/filter/filterimporter/filterimporterbalsa.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterbalsa.cpp
rename to src/filter/filterimporter/filterimporterbalsa.cpp
diff --git a/mailcommon/src/filter/filterimporter/filterimporterbalsa.h b/src/filter/filterimporter/filterimporterbalsa.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterbalsa.h
rename to src/filter/filterimporter/filterimporterbalsa.h
diff --git a/mailcommon/src/filter/filterimporter/filterimporterclawsmail.cpp b/src/filter/filterimporter/filterimporterclawsmail.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterclawsmail.cpp
rename to src/filter/filterimporter/filterimporterclawsmail.cpp
diff --git a/mailcommon/src/filter/filterimporter/filterimporterclawsmail.h b/src/filter/filterimporter/filterimporterclawsmail.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterclawsmail.h
rename to src/filter/filterimporter/filterimporterclawsmail.h
diff --git a/mailcommon/src/filter/filterimporter/filterimporterevolution.cpp b/src/filter/filterimporter/filterimporterevolution.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterevolution.cpp
rename to src/filter/filterimporter/filterimporterevolution.cpp
diff --git a/mailcommon/src/filter/filterimporter/filterimporterevolution.h b/src/filter/filterimporter/filterimporterevolution.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterevolution.h
rename to src/filter/filterimporter/filterimporterevolution.h
diff --git a/mailcommon/src/filter/filterimporter/filterimportergmail.cpp b/src/filter/filterimporter/filterimportergmail.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimportergmail.cpp
rename to src/filter/filterimporter/filterimportergmail.cpp
diff --git a/mailcommon/src/filter/filterimporter/filterimportergmail.h b/src/filter/filterimporter/filterimportergmail.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimportergmail.h
rename to src/filter/filterimporter/filterimportergmail.h
diff --git a/mailcommon/src/filter/filterimporter/filterimporterprocmail.cpp b/src/filter/filterimporter/filterimporterprocmail.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterprocmail.cpp
rename to src/filter/filterimporter/filterimporterprocmail.cpp
diff --git a/mailcommon/src/filter/filterimporter/filterimporterprocmail.h b/src/filter/filterimporter/filterimporterprocmail.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterprocmail.h
rename to src/filter/filterimporter/filterimporterprocmail.h
diff --git a/mailcommon/src/filter/filterimporter/filterimportersylpheed.cpp b/src/filter/filterimporter/filterimportersylpheed.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimportersylpheed.cpp
rename to src/filter/filterimporter/filterimportersylpheed.cpp
diff --git a/mailcommon/src/filter/filterimporter/filterimportersylpheed.h b/src/filter/filterimporter/filterimportersylpheed.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimportersylpheed.h
rename to src/filter/filterimporter/filterimportersylpheed.h
diff --git a/mailcommon/src/filter/filterimporter/filterimporterthunderbird.cpp b/src/filter/filterimporter/filterimporterthunderbird.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterthunderbird.cpp
rename to src/filter/filterimporter/filterimporterthunderbird.cpp
diff --git a/mailcommon/src/filter/filterimporter/filterimporterthunderbird.h b/src/filter/filterimporter/filterimporterthunderbird.h
similarity index 100%
rename from mailcommon/src/filter/filterimporter/filterimporterthunderbird.h
rename to src/filter/filterimporter/filterimporterthunderbird.h
diff --git a/mailcommon/src/filter/filterimporterexporter.cpp b/src/filter/filterimporterexporter.cpp
similarity index 100%
rename from mailcommon/src/filter/filterimporterexporter.cpp
rename to src/filter/filterimporterexporter.cpp
diff --git a/mailcommon/src/filter/filterimporterexporter.h b/src/filter/filterimporterexporter.h
similarity index 100%
rename from mailcommon/src/filter/filterimporterexporter.h
rename to src/filter/filterimporterexporter.h
diff --git a/mailcommon/src/filter/filterlog.cpp b/src/filter/filterlog.cpp
similarity index 100%
rename from mailcommon/src/filter/filterlog.cpp
rename to src/filter/filterlog.cpp
diff --git a/mailcommon/src/filter/filterlog.h b/src/filter/filterlog.h
similarity index 100%
rename from mailcommon/src/filter/filterlog.h
rename to src/filter/filterlog.h
diff --git a/mailcommon/src/filter/filtermanager.cpp b/src/filter/filtermanager.cpp
similarity index 100%
rename from mailcommon/src/filter/filtermanager.cpp
rename to src/filter/filtermanager.cpp
diff --git a/mailcommon/src/filter/filtermanager.h b/src/filter/filtermanager.h
similarity index 100%
rename from mailcommon/src/filter/filtermanager.h
rename to src/filter/filtermanager.h
diff --git a/mailcommon/src/filter/filterselectiondialog.cpp b/src/filter/filterselectiondialog.cpp
similarity index 100%
rename from mailcommon/src/filter/filterselectiondialog.cpp
rename to src/filter/filterselectiondialog.cpp
diff --git a/mailcommon/src/filter/filterselectiondialog.h b/src/filter/filterselectiondialog.h
similarity index 100%
rename from mailcommon/src/filter/filterselectiondialog.h
rename to src/filter/filterselectiondialog.h
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterdialog.cpp b/src/filter/invalidfilters/invalidfilterdialog.cpp
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterdialog.cpp
rename to src/filter/invalidfilters/invalidfilterdialog.cpp
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterdialog.h b/src/filter/invalidfilters/invalidfilterdialog.h
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterdialog.h
rename to src/filter/invalidfilters/invalidfilterdialog.h
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterinfo.cpp b/src/filter/invalidfilters/invalidfilterinfo.cpp
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterinfo.cpp
rename to src/filter/invalidfilters/invalidfilterinfo.cpp
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterinfo.h b/src/filter/invalidfilters/invalidfilterinfo.h
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterinfo.h
rename to src/filter/invalidfilters/invalidfilterinfo.h
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.cpp b/src/filter/invalidfilters/invalidfilterinfowidget.cpp
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.cpp
rename to src/filter/invalidfilters/invalidfilterinfowidget.cpp
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.h b/src/filter/invalidfilters/invalidfilterinfowidget.h
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.h
rename to src/filter/invalidfilters/invalidfilterinfowidget.h
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.cpp b/src/filter/invalidfilters/invalidfilterlistitemdelegate.cpp
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.cpp
rename to src/filter/invalidfilters/invalidfilterlistitemdelegate.cpp
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.h b/src/filter/invalidfilters/invalidfilterlistitemdelegate.h
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.h
rename to src/filter/invalidfilters/invalidfilterlistitemdelegate.h
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.cpp b/src/filter/invalidfilters/invalidfilterlistmodel.cpp
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.cpp
rename to src/filter/invalidfilters/invalidfilterlistmodel.cpp
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.h b/src/filter/invalidfilters/invalidfilterlistmodel.h
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.h
rename to src/filter/invalidfilters/invalidfilterlistmodel.h
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterlistview.cpp b/src/filter/invalidfilters/invalidfilterlistview.cpp
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterlistview.cpp
rename to src/filter/invalidfilters/invalidfilterlistview.cpp
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterlistview.h b/src/filter/invalidfilters/invalidfilterlistview.h
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterlistview.h
rename to src/filter/invalidfilters/invalidfilterlistview.h
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterwidget.cpp b/src/filter/invalidfilters/invalidfilterwidget.cpp
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterwidget.cpp
rename to src/filter/invalidfilters/invalidfilterwidget.cpp
diff --git a/mailcommon/src/filter/invalidfilters/invalidfilterwidget.h b/src/filter/invalidfilters/invalidfilterwidget.h
similarity index 100%
rename from mailcommon/src/filter/invalidfilters/invalidfilterwidget.h
rename to src/filter/invalidfilters/invalidfilterwidget.h
diff --git a/mailcommon/src/filter/itemcontext.cpp b/src/filter/itemcontext.cpp
similarity index 100%
rename from mailcommon/src/filter/itemcontext.cpp
rename to src/filter/itemcontext.cpp
diff --git a/mailcommon/src/filter/itemcontext.h b/src/filter/itemcontext.h
similarity index 100%
rename from mailcommon/src/filter/itemcontext.h
rename to src/filter/itemcontext.h
diff --git a/mailcommon/src/filter/kmfilteraccountlist.cpp b/src/filter/kmfilteraccountlist.cpp
similarity index 100%
rename from mailcommon/src/filter/kmfilteraccountlist.cpp
rename to src/filter/kmfilteraccountlist.cpp
diff --git a/mailcommon/src/filter/kmfilteraccountlist.h b/src/filter/kmfilteraccountlist.h
similarity index 100%
rename from mailcommon/src/filter/kmfilteraccountlist.h
rename to src/filter/kmfilteraccountlist.h
diff --git a/mailcommon/src/filter/kmfilterdialog.cpp b/src/filter/kmfilterdialog.cpp
similarity index 100%
rename from mailcommon/src/filter/kmfilterdialog.cpp
rename to src/filter/kmfilterdialog.cpp
diff --git a/mailcommon/src/filter/kmfilterdialog.h b/src/filter/kmfilterdialog.h
similarity index 100%
rename from mailcommon/src/filter/kmfilterdialog.h
rename to src/filter/kmfilterdialog.h
diff --git a/mailcommon/src/filter/kmfilterlistbox.cpp b/src/filter/kmfilterlistbox.cpp
similarity index 100%
rename from mailcommon/src/filter/kmfilterlistbox.cpp
rename to src/filter/kmfilterlistbox.cpp
diff --git a/mailcommon/src/filter/kmfilterlistbox.h b/src/filter/kmfilterlistbox.h
similarity index 100%
rename from mailcommon/src/filter/kmfilterlistbox.h
rename to src/filter/kmfilterlistbox.h
diff --git a/mailcommon/src/filter/mailfilter.cpp b/src/filter/mailfilter.cpp
similarity index 100%
rename from mailcommon/src/filter/mailfilter.cpp
rename to src/filter/mailfilter.cpp
diff --git a/mailcommon/src/filter/mailfilter.h b/src/filter/mailfilter.h
similarity index 100%
rename from mailcommon/src/filter/mailfilter.h
rename to src/filter/mailfilter.h
diff --git a/mailcommon/src/filter/mdnadvicedialog.cpp b/src/filter/mdnadvicedialog.cpp
similarity index 100%
rename from mailcommon/src/filter/mdnadvicedialog.cpp
rename to src/filter/mdnadvicedialog.cpp
diff --git a/mailcommon/src/filter/mdnadvicedialog.h b/src/filter/mdnadvicedialog.h
similarity index 100%
rename from mailcommon/src/filter/mdnadvicedialog.h
rename to src/filter/mdnadvicedialog.h
diff --git a/mailcommon/src/filter/soundtestwidget.cpp b/src/filter/soundtestwidget.cpp
similarity index 100%
rename from mailcommon/src/filter/soundtestwidget.cpp
rename to src/filter/soundtestwidget.cpp
diff --git a/mailcommon/src/filter/soundtestwidget.h b/src/filter/soundtestwidget.h
similarity index 100%
rename from mailcommon/src/filter/soundtestwidget.h
rename to src/filter/soundtestwidget.h
diff --git a/mailcommon/src/filter/tests/CMakeLists.txt b/src/filter/tests/CMakeLists.txt
similarity index 100%
rename from mailcommon/src/filter/tests/CMakeLists.txt
rename to src/filter/tests/CMakeLists.txt
diff --git a/mailcommon/src/filter/tests/dummykernel.cpp b/src/filter/tests/dummykernel.cpp
similarity index 100%
rename from mailcommon/src/filter/tests/dummykernel.cpp
rename to src/filter/tests/dummykernel.cpp
diff --git a/mailcommon/src/filter/tests/dummykernel.h b/src/filter/tests/dummykernel.h
similarity index 100%
rename from mailcommon/src/filter/tests/dummykernel.h
rename to src/filter/tests/dummykernel.h
diff --git a/mailcommon/src/filter/tests/filterimporterexportergui.cpp b/src/filter/tests/filterimporterexportergui.cpp
similarity index 100%
rename from mailcommon/src/filter/tests/filterimporterexportergui.cpp
rename to src/filter/tests/filterimporterexportergui.cpp
diff --git a/mailcommon/src/filter/tests/filterimporterexportergui.h b/src/filter/tests/filterimporterexportergui.h
similarity index 100%
rename from mailcommon/src/filter/tests/filterimporterexportergui.h
rename to src/filter/tests/filterimporterexportergui.h
diff --git a/mailcommon/src/filter/tests/invalidfilterdialoggui.cpp b/src/filter/tests/invalidfilterdialoggui.cpp
similarity index 100%
rename from mailcommon/src/filter/tests/invalidfilterdialoggui.cpp
rename to src/filter/tests/invalidfilterdialoggui.cpp
diff --git a/mailcommon/src/filter/tests/kmfilterdialogtestgui.cpp b/src/filter/tests/kmfilterdialogtestgui.cpp
similarity index 100%
rename from mailcommon/src/filter/tests/kmfilterdialogtestgui.cpp
rename to src/filter/tests/kmfilterdialogtestgui.cpp
diff --git a/mailcommon/src/filter/tests/kmfilterdialogtestgui.h b/src/filter/tests/kmfilterdialogtestgui.h
similarity index 100%
rename from mailcommon/src/filter/tests/kmfilterdialogtestgui.h
rename to src/filter/tests/kmfilterdialogtestgui.h
diff --git a/mailcommon/src/filter/tests/mndadvicedialoggui.cpp b/src/filter/tests/mndadvicedialoggui.cpp
similarity index 100%
rename from mailcommon/src/filter/tests/mndadvicedialoggui.cpp
rename to src/filter/tests/mndadvicedialoggui.cpp
diff --git a/mailcommon/src/filter/ui/filterconfigwidget.ui b/src/filter/ui/filterconfigwidget.ui
similarity index 100%
rename from mailcommon/src/filter/ui/filterconfigwidget.ui
rename to src/filter/ui/filterconfigwidget.ui
diff --git a/mailcommon/src/filter/ui/selectthunderbirdfilterfileswidget.ui b/src/filter/ui/selectthunderbirdfilterfileswidget.ui
similarity index 100%
rename from mailcommon/src/filter/ui/selectthunderbirdfilterfileswidget.ui
rename to src/filter/ui/selectthunderbirdfilterfileswidget.ui
diff --git a/mailcommon/src/folder/accountconfigorderdialog.cpp b/src/folder/accountconfigorderdialog.cpp
similarity index 100%
rename from mailcommon/src/folder/accountconfigorderdialog.cpp
rename to src/folder/accountconfigorderdialog.cpp
diff --git a/mailcommon/src/folder/accountconfigorderdialog.h b/src/folder/accountconfigorderdialog.h
similarity index 100%
rename from mailcommon/src/folder/accountconfigorderdialog.h
rename to src/folder/accountconfigorderdialog.h
diff --git a/mailcommon/src/folder/entitycollectionorderproxymodel.cpp b/src/folder/entitycollectionorderproxymodel.cpp
similarity index 100%
rename from mailcommon/src/folder/entitycollectionorderproxymodel.cpp
rename to src/folder/entitycollectionorderproxymodel.cpp
diff --git a/mailcommon/src/folder/entitycollectionorderproxymodel.h b/src/folder/entitycollectionorderproxymodel.h
similarity index 100%
rename from mailcommon/src/folder/entitycollectionorderproxymodel.h
rename to src/folder/entitycollectionorderproxymodel.h
diff --git a/mailcommon/src/folder/foldercollection.cpp b/src/folder/foldercollection.cpp
similarity index 100%
rename from mailcommon/src/folder/foldercollection.cpp
rename to src/folder/foldercollection.cpp
diff --git a/mailcommon/src/folder/foldercollection.h b/src/folder/foldercollection.h
similarity index 100%
rename from mailcommon/src/folder/foldercollection.h
rename to src/folder/foldercollection.h
diff --git a/mailcommon/src/folder/foldercollectionmonitor.cpp b/src/folder/foldercollectionmonitor.cpp
similarity index 100%
rename from mailcommon/src/folder/foldercollectionmonitor.cpp
rename to src/folder/foldercollectionmonitor.cpp
diff --git a/mailcommon/src/folder/foldercollectionmonitor.h b/src/folder/foldercollectionmonitor.h
similarity index 100%
rename from mailcommon/src/folder/foldercollectionmonitor.h
rename to src/folder/foldercollectionmonitor.h
diff --git a/mailcommon/src/folder/folderrequester.cpp b/src/folder/folderrequester.cpp
similarity index 100%
rename from mailcommon/src/folder/folderrequester.cpp
rename to src/folder/folderrequester.cpp
diff --git a/mailcommon/src/folder/folderrequester.h b/src/folder/folderrequester.h
similarity index 100%
rename from mailcommon/src/folder/folderrequester.h
rename to src/folder/folderrequester.h
diff --git a/mailcommon/src/folder/folderselectiondialog.cpp b/src/folder/folderselectiondialog.cpp
similarity index 100%
rename from mailcommon/src/folder/folderselectiondialog.cpp
rename to src/folder/folderselectiondialog.cpp
diff --git a/mailcommon/src/folder/folderselectiondialog.h b/src/folder/folderselectiondialog.h
similarity index 100%
rename from mailcommon/src/folder/folderselectiondialog.h
rename to src/folder/folderselectiondialog.h
diff --git a/mailcommon/src/folder/foldertreeview.cpp b/src/folder/foldertreeview.cpp
similarity index 100%
rename from mailcommon/src/folder/foldertreeview.cpp
rename to src/folder/foldertreeview.cpp
diff --git a/mailcommon/src/folder/foldertreeview.h b/src/folder/foldertreeview.h
similarity index 100%
rename from mailcommon/src/folder/foldertreeview.h
rename to src/folder/foldertreeview.h
diff --git a/mailcommon/src/folder/foldertreewidget.cpp b/src/folder/foldertreewidget.cpp
similarity index 100%
rename from mailcommon/src/folder/foldertreewidget.cpp
rename to src/folder/foldertreewidget.cpp
diff --git a/mailcommon/src/folder/foldertreewidget.h b/src/folder/foldertreewidget.h
similarity index 100%
rename from mailcommon/src/folder/foldertreewidget.h
rename to src/folder/foldertreewidget.h
diff --git a/mailcommon/src/folder/foldertreewidgetproxymodel.cpp b/src/folder/foldertreewidgetproxymodel.cpp
similarity index 100%
rename from mailcommon/src/folder/foldertreewidgetproxymodel.cpp
rename to src/folder/foldertreewidgetproxymodel.cpp
diff --git a/mailcommon/src/folder/foldertreewidgetproxymodel.h b/src/folder/foldertreewidgetproxymodel.h
similarity index 100%
rename from mailcommon/src/folder/foldertreewidgetproxymodel.h
rename to src/folder/foldertreewidgetproxymodel.h
diff --git a/mailcommon/src/interfaces/mailinterfaces.h b/src/interfaces/mailinterfaces.h
similarity index 100%
rename from mailcommon/src/interfaces/mailinterfaces.h
rename to src/interfaces/mailinterfaces.h
diff --git a/mailcommon/src/interfaces/rulewidgethandler.h b/src/interfaces/rulewidgethandler.h
similarity index 100%
rename from mailcommon/src/interfaces/rulewidgethandler.h
rename to src/interfaces/rulewidgethandler.h
diff --git a/mailcommon/src/job/backupjob.cpp b/src/job/backupjob.cpp
similarity index 100%
rename from mailcommon/src/job/backupjob.cpp
rename to src/job/backupjob.cpp
diff --git a/mailcommon/src/job/backupjob.h b/src/job/backupjob.h
similarity index 100%
rename from mailcommon/src/job/backupjob.h
rename to src/job/backupjob.h
diff --git a/mailcommon/src/job/expirejob.cpp b/src/job/expirejob.cpp
similarity index 100%
rename from mailcommon/src/job/expirejob.cpp
rename to src/job/expirejob.cpp
diff --git a/mailcommon/src/job/expirejob.h b/src/job/expirejob.h
similarity index 100%
rename from mailcommon/src/job/expirejob.h
rename to src/job/expirejob.h
diff --git a/mailcommon/src/job/folderjob.cpp b/src/job/folderjob.cpp
similarity index 100%
rename from mailcommon/src/job/folderjob.cpp
rename to src/job/folderjob.cpp
diff --git a/mailcommon/src/job/folderjob.h b/src/job/folderjob.h
similarity index 100%
rename from mailcommon/src/job/folderjob.h
rename to src/job/folderjob.h
diff --git a/mailcommon/src/job/jobscheduler.cpp b/src/job/jobscheduler.cpp
similarity index 100%
rename from mailcommon/src/job/jobscheduler.cpp
rename to src/job/jobscheduler.cpp
diff --git a/mailcommon/src/job/jobscheduler.h b/src/job/jobscheduler.h
similarity index 100%
rename from mailcommon/src/job/jobscheduler.h
rename to src/job/jobscheduler.h
diff --git a/mailcommon/src/kernel/mailkernel.cpp b/src/kernel/mailkernel.cpp
similarity index 100%
rename from mailcommon/src/kernel/mailkernel.cpp
rename to src/kernel/mailkernel.cpp
diff --git a/mailcommon/src/kernel/mailkernel.h b/src/kernel/mailkernel.h
similarity index 100%
rename from mailcommon/src/kernel/mailkernel.h
rename to src/kernel/mailkernel.h
diff --git a/mailcommon/src/mdn/autotests/CMakeLists.txt b/src/mdn/autotests/CMakeLists.txt
similarity index 100%
rename from mailcommon/src/mdn/autotests/CMakeLists.txt
rename to src/mdn/autotests/CMakeLists.txt
diff --git a/mailcommon/src/mdn/autotests/mdnstateattributetest.cpp b/src/mdn/autotests/mdnstateattributetest.cpp
similarity index 100%
rename from mailcommon/src/mdn/autotests/mdnstateattributetest.cpp
rename to src/mdn/autotests/mdnstateattributetest.cpp
diff --git a/mailcommon/src/mdn/autotests/mdnstateattributetest.h b/src/mdn/autotests/mdnstateattributetest.h
similarity index 100%
rename from mailcommon/src/mdn/autotests/mdnstateattributetest.h
rename to src/mdn/autotests/mdnstateattributetest.h
diff --git a/mailcommon/src/mdn/mdnstateattribute.cpp b/src/mdn/mdnstateattribute.cpp
similarity index 100%
rename from mailcommon/src/mdn/mdnstateattribute.cpp
rename to src/mdn/mdnstateattribute.cpp
diff --git a/mailcommon/src/mdn/mdnstateattribute.h b/src/mdn/mdnstateattribute.h
similarity index 100%
rename from mailcommon/src/mdn/mdnstateattribute.h
rename to src/mdn/mdnstateattribute.h
diff --git a/mailcommon/src/mdn/sendmdnhandler.cpp b/src/mdn/sendmdnhandler.cpp
similarity index 100%
rename from mailcommon/src/mdn/sendmdnhandler.cpp
rename to src/mdn/sendmdnhandler.cpp
diff --git a/mailcommon/src/mdn/sendmdnhandler.h b/src/mdn/sendmdnhandler.h
similarity index 100%
rename from mailcommon/src/mdn/sendmdnhandler.h
rename to src/mdn/sendmdnhandler.h
diff --git a/mailcommon/src/search/autotests/CMakeLists.txt b/src/search/autotests/CMakeLists.txt
similarity index 100%
rename from mailcommon/src/search/autotests/CMakeLists.txt
rename to src/search/autotests/CMakeLists.txt
diff --git a/mailcommon/src/search/autotests/searchpatterntest.cpp b/src/search/autotests/searchpatterntest.cpp
similarity index 100%
rename from mailcommon/src/search/autotests/searchpatterntest.cpp
rename to src/search/autotests/searchpatterntest.cpp
diff --git a/mailcommon/src/search/autotests/searchpatterntest.h b/src/search/autotests/searchpatterntest.h
similarity index 100%
rename from mailcommon/src/search/autotests/searchpatterntest.h
rename to src/search/autotests/searchpatterntest.h
diff --git a/mailcommon/src/search/autotests/searchruledatetest.cpp b/src/search/autotests/searchruledatetest.cpp
similarity index 100%
rename from mailcommon/src/search/autotests/searchruledatetest.cpp
rename to src/search/autotests/searchruledatetest.cpp
diff --git a/mailcommon/src/search/autotests/searchruledatetest.h b/src/search/autotests/searchruledatetest.h
similarity index 100%
rename from mailcommon/src/search/autotests/searchruledatetest.h
rename to src/search/autotests/searchruledatetest.h
diff --git a/mailcommon/src/search/autotests/searchrulenumericaltest.cpp b/src/search/autotests/searchrulenumericaltest.cpp
similarity index 100%
rename from mailcommon/src/search/autotests/searchrulenumericaltest.cpp
rename to src/search/autotests/searchrulenumericaltest.cpp
diff --git a/mailcommon/src/search/autotests/searchrulenumericaltest.h b/src/search/autotests/searchrulenumericaltest.h
similarity index 100%
rename from mailcommon/src/search/autotests/searchrulenumericaltest.h
rename to src/search/autotests/searchrulenumericaltest.h
diff --git a/mailcommon/src/search/autotests/searchrulestatustest.cpp b/src/search/autotests/searchrulestatustest.cpp
similarity index 100%
rename from mailcommon/src/search/autotests/searchrulestatustest.cpp
rename to src/search/autotests/searchrulestatustest.cpp
diff --git a/mailcommon/src/search/autotests/searchrulestatustest.h b/src/search/autotests/searchrulestatustest.h
similarity index 100%
rename from mailcommon/src/search/autotests/searchrulestatustest.h
rename to src/search/autotests/searchrulestatustest.h
diff --git a/mailcommon/src/search/autotests/searchrulestringtest.cpp b/src/search/autotests/searchrulestringtest.cpp
similarity index 100%
rename from mailcommon/src/search/autotests/searchrulestringtest.cpp
rename to src/search/autotests/searchrulestringtest.cpp
diff --git a/mailcommon/src/search/autotests/searchrulestringtest.h b/src/search/autotests/searchrulestringtest.h
similarity index 100%
rename from mailcommon/src/search/autotests/searchrulestringtest.h
rename to src/search/autotests/searchrulestringtest.h
diff --git a/mailcommon/src/search/autotests/searchruletest.cpp b/src/search/autotests/searchruletest.cpp
similarity index 100%
rename from mailcommon/src/search/autotests/searchruletest.cpp
rename to src/search/autotests/searchruletest.cpp
diff --git a/mailcommon/src/search/autotests/searchruletest.h b/src/search/autotests/searchruletest.h
similarity index 100%
rename from mailcommon/src/search/autotests/searchruletest.h
rename to src/search/autotests/searchruletest.h
diff --git a/mailcommon/src/search/searchpattern.cpp b/src/search/searchpattern.cpp
similarity index 100%
rename from mailcommon/src/search/searchpattern.cpp
rename to src/search/searchpattern.cpp
diff --git a/mailcommon/src/search/searchpattern.h b/src/search/searchpattern.h
similarity index 100%
rename from mailcommon/src/search/searchpattern.h
rename to src/search/searchpattern.h
diff --git a/mailcommon/src/search/searchpatternedit.cpp b/src/search/searchpatternedit.cpp
similarity index 100%
rename from mailcommon/src/search/searchpatternedit.cpp
rename to src/search/searchpatternedit.cpp
diff --git a/mailcommon/src/search/searchpatternedit.h b/src/search/searchpatternedit.h
similarity index 100%
rename from mailcommon/src/search/searchpatternedit.h
rename to src/search/searchpatternedit.h
diff --git a/mailcommon/src/search/searchrule/searchrule.cpp b/src/search/searchrule/searchrule.cpp
similarity index 100%
rename from mailcommon/src/search/searchrule/searchrule.cpp
rename to src/search/searchrule/searchrule.cpp
diff --git a/mailcommon/src/search/searchrule/searchrule.h b/src/search/searchrule/searchrule.h
similarity index 100%
rename from mailcommon/src/search/searchrule/searchrule.h
rename to src/search/searchrule/searchrule.h
diff --git a/mailcommon/src/search/searchrule/searchruledate.cpp b/src/search/searchrule/searchruledate.cpp
similarity index 100%
rename from mailcommon/src/search/searchrule/searchruledate.cpp
rename to src/search/searchrule/searchruledate.cpp
diff --git a/mailcommon/src/search/searchrule/searchruledate.h b/src/search/searchrule/searchruledate.h
similarity index 100%
rename from mailcommon/src/search/searchrule/searchruledate.h
rename to src/search/searchrule/searchruledate.h
diff --git a/mailcommon/src/search/searchrule/searchrulenumerical.cpp b/src/search/searchrule/searchrulenumerical.cpp
similarity index 100%
rename from mailcommon/src/search/searchrule/searchrulenumerical.cpp
rename to src/search/searchrule/searchrulenumerical.cpp
diff --git a/mailcommon/src/search/searchrule/searchrulenumerical.h b/src/search/searchrule/searchrulenumerical.h
similarity index 100%
rename from mailcommon/src/search/searchrule/searchrulenumerical.h
rename to src/search/searchrule/searchrulenumerical.h
diff --git a/mailcommon/src/search/searchrule/searchrulestatus.cpp b/src/search/searchrule/searchrulestatus.cpp
similarity index 100%
rename from mailcommon/src/search/searchrule/searchrulestatus.cpp
rename to src/search/searchrule/searchrulestatus.cpp
diff --git a/mailcommon/src/search/searchrule/searchrulestatus.h b/src/search/searchrule/searchrulestatus.h
similarity index 100%
rename from mailcommon/src/search/searchrule/searchrulestatus.h
rename to src/search/searchrule/searchrulestatus.h
diff --git a/mailcommon/src/search/searchrule/searchrulestring.cpp b/src/search/searchrule/searchrulestring.cpp
similarity index 100%
rename from mailcommon/src/search/searchrule/searchrulestring.cpp
rename to src/search/searchrule/searchrulestring.cpp
diff --git a/mailcommon/src/search/searchrule/searchrulestring.h b/src/search/searchrule/searchrulestring.h
similarity index 100%
rename from mailcommon/src/search/searchrule/searchrulestring.h
rename to src/search/searchrule/searchrulestring.h
diff --git a/mailcommon/src/search/widgethandler/daterulewidgethandler.cpp b/src/search/widgethandler/daterulewidgethandler.cpp
similarity index 100%
rename from mailcommon/src/search/widgethandler/daterulewidgethandler.cpp
rename to src/search/widgethandler/daterulewidgethandler.cpp
diff --git a/mailcommon/src/search/widgethandler/daterulewidgethandler.h b/src/search/widgethandler/daterulewidgethandler.h
similarity index 100%
rename from mailcommon/src/search/widgethandler/daterulewidgethandler.h
rename to src/search/widgethandler/daterulewidgethandler.h
diff --git a/mailcommon/src/search/widgethandler/headersrulerwidgethandler.cpp b/src/search/widgethandler/headersrulerwidgethandler.cpp
similarity index 100%
rename from mailcommon/src/search/widgethandler/headersrulerwidgethandler.cpp
rename to src/search/widgethandler/headersrulerwidgethandler.cpp
diff --git a/mailcommon/src/search/widgethandler/headersrulerwidgethandler.h b/src/search/widgethandler/headersrulerwidgethandler.h
similarity index 100%
rename from mailcommon/src/search/widgethandler/headersrulerwidgethandler.h
rename to src/search/widgethandler/headersrulerwidgethandler.h
diff --git a/mailcommon/src/search/widgethandler/messagerulewidgethandler.cpp b/src/search/widgethandler/messagerulewidgethandler.cpp
similarity index 100%
rename from mailcommon/src/search/widgethandler/messagerulewidgethandler.cpp
rename to src/search/widgethandler/messagerulewidgethandler.cpp
diff --git a/mailcommon/src/search/widgethandler/messagerulewidgethandler.h b/src/search/widgethandler/messagerulewidgethandler.h
similarity index 100%
rename from mailcommon/src/search/widgethandler/messagerulewidgethandler.h
rename to src/search/widgethandler/messagerulewidgethandler.h
diff --git a/mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.cpp b/src/search/widgethandler/numericdoublerulewidgethandler.cpp
similarity index 100%
rename from mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.cpp
rename to src/search/widgethandler/numericdoublerulewidgethandler.cpp
diff --git a/mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.h b/src/search/widgethandler/numericdoublerulewidgethandler.h
similarity index 100%
rename from mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.h
rename to src/search/widgethandler/numericdoublerulewidgethandler.h
diff --git a/mailcommon/src/search/widgethandler/numericrulewidgethandler.cpp b/src/search/widgethandler/numericrulewidgethandler.cpp
similarity index 100%
rename from mailcommon/src/search/widgethandler/numericrulewidgethandler.cpp
rename to src/search/widgethandler/numericrulewidgethandler.cpp
diff --git a/mailcommon/src/search/widgethandler/numericrulewidgethandler.h b/src/search/widgethandler/numericrulewidgethandler.h
similarity index 100%
rename from mailcommon/src/search/widgethandler/numericrulewidgethandler.h
rename to src/search/widgethandler/numericrulewidgethandler.h
diff --git a/mailcommon/src/search/widgethandler/rulewidgethandlermanager.cpp b/src/search/widgethandler/rulewidgethandlermanager.cpp
similarity index 100%
rename from mailcommon/src/search/widgethandler/rulewidgethandlermanager.cpp
rename to src/search/widgethandler/rulewidgethandlermanager.cpp
diff --git a/mailcommon/src/search/widgethandler/rulewidgethandlermanager.h b/src/search/widgethandler/rulewidgethandlermanager.h
similarity index 100%
rename from mailcommon/src/search/widgethandler/rulewidgethandlermanager.h
rename to src/search/widgethandler/rulewidgethandlermanager.h
diff --git a/mailcommon/src/search/widgethandler/statusrulewidgethandler.cpp b/src/search/widgethandler/statusrulewidgethandler.cpp
similarity index 100%
rename from mailcommon/src/search/widgethandler/statusrulewidgethandler.cpp
rename to src/search/widgethandler/statusrulewidgethandler.cpp
diff --git a/mailcommon/src/search/widgethandler/statusrulewidgethandler.h b/src/search/widgethandler/statusrulewidgethandler.h
similarity index 100%
rename from mailcommon/src/search/widgethandler/statusrulewidgethandler.h
rename to src/search/widgethandler/statusrulewidgethandler.h
diff --git a/mailcommon/src/search/widgethandler/tagrulewidgethandler.cpp b/src/search/widgethandler/tagrulewidgethandler.cpp
similarity index 100%
rename from mailcommon/src/search/widgethandler/tagrulewidgethandler.cpp
rename to src/search/widgethandler/tagrulewidgethandler.cpp
diff --git a/mailcommon/src/search/widgethandler/tagrulewidgethandler.h b/src/search/widgethandler/tagrulewidgethandler.h
similarity index 100%
rename from mailcommon/src/search/widgethandler/tagrulewidgethandler.h
rename to src/search/widgethandler/tagrulewidgethandler.h
diff --git a/mailcommon/src/search/widgethandler/textrulerwidgethandler.cpp b/src/search/widgethandler/textrulerwidgethandler.cpp
similarity index 100%
rename from mailcommon/src/search/widgethandler/textrulerwidgethandler.cpp
rename to src/search/widgethandler/textrulerwidgethandler.cpp
diff --git a/mailcommon/src/search/widgethandler/textrulerwidgethandler.h b/src/search/widgethandler/textrulerwidgethandler.h
similarity index 100%
rename from mailcommon/src/search/widgethandler/textrulerwidgethandler.h
rename to src/search/widgethandler/textrulerwidgethandler.h
diff --git a/mailcommon/src/settings.kcfg b/src/settings.kcfg
similarity index 100%
rename from mailcommon/src/settings.kcfg
rename to src/settings.kcfg
diff --git a/mailcommon/src/settings/mailcommon.kcfg b/src/settings/mailcommon.kcfg
similarity index 100%
rename from mailcommon/src/settings/mailcommon.kcfg
rename to src/settings/mailcommon.kcfg
diff --git a/mailcommon/src/settings/mailcommonsettings_base.kcfgc b/src/settings/mailcommonsettings_base.kcfgc
similarity index 100%
rename from mailcommon/src/settings/mailcommonsettings_base.kcfgc
rename to src/settings/mailcommonsettings_base.kcfgc
diff --git a/mailcommon/src/snippets/autotests/CMakeLists.txt b/src/snippets/autotests/CMakeLists.txt
similarity index 100%
rename from mailcommon/src/snippets/autotests/CMakeLists.txt
rename to src/snippets/autotests/CMakeLists.txt
diff --git a/mailcommon/src/snippets/autotests/snippetsmanagertest.cpp b/src/snippets/autotests/snippetsmanagertest.cpp
similarity index 100%
rename from mailcommon/src/snippets/autotests/snippetsmanagertest.cpp
rename to src/snippets/autotests/snippetsmanagertest.cpp
diff --git a/mailcommon/src/snippets/autotests/snippetsmanagertest.h b/src/snippets/autotests/snippetsmanagertest.h
similarity index 100%
rename from mailcommon/src/snippets/autotests/snippetsmanagertest.h
rename to src/snippets/autotests/snippetsmanagertest.h
diff --git a/mailcommon/src/snippets/snippetdialog.cpp b/src/snippets/snippetdialog.cpp
similarity index 100%
rename from mailcommon/src/snippets/snippetdialog.cpp
rename to src/snippets/snippetdialog.cpp
diff --git a/mailcommon/src/snippets/snippetdialog.h b/src/snippets/snippetdialog.h
similarity index 100%
rename from mailcommon/src/snippets/snippetdialog.h
rename to src/snippets/snippetdialog.h
diff --git a/mailcommon/src/snippets/snippetsmanager.cpp b/src/snippets/snippetsmanager.cpp
similarity index 100%
rename from mailcommon/src/snippets/snippetsmanager.cpp
rename to src/snippets/snippetsmanager.cpp
diff --git a/mailcommon/src/snippets/snippetsmanager.h b/src/snippets/snippetsmanager.h
similarity index 100%
rename from mailcommon/src/snippets/snippetsmanager.h
rename to src/snippets/snippetsmanager.h
diff --git a/mailcommon/src/snippets/snippetsmodel.cpp b/src/snippets/snippetsmodel.cpp
similarity index 100%
rename from mailcommon/src/snippets/snippetsmodel.cpp
rename to src/snippets/snippetsmodel.cpp
diff --git a/mailcommon/src/snippets/snippetsmodel.h b/src/snippets/snippetsmodel.h
similarity index 100%
rename from mailcommon/src/snippets/snippetsmodel.h
rename to src/snippets/snippetsmodel.h
diff --git a/mailcommon/src/snippets/snippetvariabledialog.cpp b/src/snippets/snippetvariabledialog.cpp
similarity index 100%
rename from mailcommon/src/snippets/snippetvariabledialog.cpp
rename to src/snippets/snippetvariabledialog.cpp
diff --git a/mailcommon/src/snippets/snippetvariabledialog.h b/src/snippets/snippetvariabledialog.h
similarity index 100%
rename from mailcommon/src/snippets/snippetvariabledialog.h
rename to src/snippets/snippetvariabledialog.h
diff --git a/mailcommon/src/snippets/ui/snippetdialog.ui b/src/snippets/ui/snippetdialog.ui
similarity index 100%
rename from mailcommon/src/snippets/ui/snippetdialog.ui
rename to src/snippets/ui/snippetdialog.ui
diff --git a/mailcommon/src/tag/addtagdialog.cpp b/src/tag/addtagdialog.cpp
similarity index 100%
rename from mailcommon/src/tag/addtagdialog.cpp
rename to src/tag/addtagdialog.cpp
diff --git a/mailcommon/src/tag/addtagdialog.h b/src/tag/addtagdialog.h
similarity index 100%
rename from mailcommon/src/tag/addtagdialog.h
rename to src/tag/addtagdialog.h
diff --git a/mailcommon/src/tag/tag.cpp b/src/tag/tag.cpp
similarity index 100%
rename from mailcommon/src/tag/tag.cpp
rename to src/tag/tag.cpp
diff --git a/mailcommon/src/tag/tag.h b/src/tag/tag.h
similarity index 100%
rename from mailcommon/src/tag/tag.h
rename to src/tag/tag.h
diff --git a/mailcommon/src/tag/tagwidget.cpp b/src/tag/tagwidget.cpp
similarity index 100%
rename from mailcommon/src/tag/tagwidget.cpp
rename to src/tag/tagwidget.cpp
diff --git a/mailcommon/src/tag/tagwidget.h b/src/tag/tagwidget.h
similarity index 100%
rename from mailcommon/src/tag/tagwidget.h
rename to src/tag/tagwidget.h
diff --git a/mailcommon/src/util/mailutil.cpp b/src/util/mailutil.cpp
similarity index 100%
rename from mailcommon/src/util/mailutil.cpp
rename to src/util/mailutil.cpp
diff --git a/mailcommon/src/util/mailutil.h b/src/util/mailutil.h
similarity index 100%
rename from mailcommon/src/util/mailutil.h
rename to src/util/mailutil.h
diff --git a/mailcommon/src/util/metatype.h b/src/util/metatype.h
similarity index 100%
rename from mailcommon/src/util/metatype.h
rename to src/util/metatype.h
diff --git a/mailcommon/src/util/resourcereadconfigfile.cpp b/src/util/resourcereadconfigfile.cpp
similarity index 100%
rename from mailcommon/src/util/resourcereadconfigfile.cpp
rename to src/util/resourcereadconfigfile.cpp
diff --git a/mailcommon/src/util/resourcereadconfigfile.h b/src/util/resourcereadconfigfile.h
similarity index 100%
rename from mailcommon/src/util/resourcereadconfigfile.h
rename to src/util/resourcereadconfigfile.h
diff --git a/mailcommon/src/widgets/favoritecollectionwidget.cpp b/src/widgets/favoritecollectionwidget.cpp
similarity index 100%
rename from mailcommon/src/widgets/favoritecollectionwidget.cpp
rename to src/widgets/favoritecollectionwidget.cpp
diff --git a/mailcommon/src/widgets/favoritecollectionwidget.h b/src/widgets/favoritecollectionwidget.h
similarity index 100%
rename from mailcommon/src/widgets/favoritecollectionwidget.h
rename to src/widgets/favoritecollectionwidget.h
diff --git a/mailcommon/src/widgets/redirectdialog.cpp b/src/widgets/redirectdialog.cpp
similarity index 100%
rename from mailcommon/src/widgets/redirectdialog.cpp
rename to src/widgets/redirectdialog.cpp
diff --git a/mailcommon/src/widgets/redirectdialog.h b/src/widgets/redirectdialog.h
similarity index 100%
rename from mailcommon/src/widgets/redirectdialog.h
rename to src/widgets/redirectdialog.h
diff --git a/mailcommon/src/widgets/redirectwidget.cpp b/src/widgets/redirectwidget.cpp
similarity index 100%
rename from mailcommon/src/widgets/redirectwidget.cpp
rename to src/widgets/redirectwidget.cpp
diff --git a/mailcommon/src/widgets/redirectwidget.h b/src/widgets/redirectwidget.h
similarity index 100%
rename from mailcommon/src/widgets/redirectwidget.h
rename to src/widgets/redirectwidget.h