diff --git a/kdepim-apps-lib/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/kdepim-apps-lib/composereditor-ng/CMakeLists.txt b/composereditor-ng/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/CMakeLists.txt
rename to composereditor-ng/CMakeLists.txt
diff --git a/kdepim-apps-lib/composereditor-ng/KF5ComposerEditorNGConfig.cmake.in b/composereditor-ng/KF5ComposerEditorNGConfig.cmake.in
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/KF5ComposerEditorNGConfig.cmake.in
rename to composereditor-ng/KF5ComposerEditorNGConfig.cmake.in
diff --git a/kdepim-apps-lib/composereditor-ng/TODO b/composereditor-ng/TODO
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/TODO
rename to composereditor-ng/TODO
diff --git a/kdepim-apps-lib/composereditor-ng/src/CMakeLists.txt b/composereditor-ng/src/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/CMakeLists.txt
rename to composereditor-ng/src/CMakeLists.txt
diff --git a/kdepim-apps-lib/composereditor-ng/src/Messages.sh b/composereditor-ng/src/Messages.sh
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/Messages.sh
rename to composereditor-ng/src/Messages.sh
diff --git a/kdepim-apps-lib/composereditor-ng/src/composereditor-ng.kcfg b/composereditor-ng/src/composereditor-ng.kcfg
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/composereditor-ng.kcfg
rename to composereditor-ng/src/composereditor-ng.kcfg
diff --git a/kdepim-apps-lib/composereditor-ng/src/composereditor.cpp b/composereditor-ng/src/composereditor.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/composereditor.cpp
rename to composereditor-ng/src/composereditor.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/composereditor.h b/composereditor-ng/src/composereditor.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/composereditor.h
rename to composereditor-ng/src/composereditor.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/composerview.cpp b/composereditor-ng/src/composerview.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/composerview.cpp
rename to composereditor-ng/src/composerview.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/composerview.h b/composereditor-ng/src/composerview.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/composerview.h
rename to composereditor-ng/src/composerview.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/data/composereditorinitialhtml b/composereditor-ng/src/data/composereditorinitialhtml
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/data/composereditorinitialhtml
rename to composereditor-ng/src/data/composereditorinitialhtml
diff --git a/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.cpp b/composereditor-ng/src/extendattributes/extendattributesbutton.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.cpp
rename to composereditor-ng/src/extendattributes/extendattributesbutton.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.h b/composereditor-ng/src/extendattributes/extendattributesbutton.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.h
rename to composereditor-ng/src/extendattributes/extendattributesbutton.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.cpp b/composereditor-ng/src/extendattributes/extendattributesdialog.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.cpp
rename to composereditor-ng/src/extendattributes/extendattributesdialog.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.h b/composereditor-ng/src/extendattributes/extendattributesdialog.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.h
rename to composereditor-ng/src/extendattributes/extendattributesdialog.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils.cpp b/composereditor-ng/src/extendattributes/extendattributesutils.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils.cpp
rename to composereditor-ng/src/extendattributes/extendattributesutils.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils_p.h b/composereditor-ng/src/extendattributes/extendattributesutils_p.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils_p.h
rename to composereditor-ng/src/extendattributes/extendattributesutils_p.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.cpp b/composereditor-ng/src/extendattributes/extendattributeswidget.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.cpp
rename to composereditor-ng/src/extendattributes/extendattributeswidget.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.h b/composereditor-ng/src/extendattributes/extendattributeswidget.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.h
rename to composereditor-ng/src/extendattributes/extendattributeswidget.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/globalsetting_composereditorng.kcfgc b/composereditor-ng/src/globalsetting_composereditorng.kcfgc
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/globalsetting_composereditorng.kcfgc
rename to composereditor-ng/src/globalsetting_composereditorng.kcfgc
diff --git a/kdepim-apps-lib/composereditor-ng/src/helper/listhelper.cpp b/composereditor-ng/src/helper/listhelper.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/helper/listhelper.cpp
rename to composereditor-ng/src/helper/listhelper.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/helper/listhelper_p.h b/composereditor-ng/src/helper/listhelper_p.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/helper/listhelper_p.h
rename to composereditor-ng/src/helper/listhelper_p.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/helper/tablehelper.cpp b/composereditor-ng/src/helper/tablehelper.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/helper/tablehelper.cpp
rename to composereditor-ng/src/helper/tablehelper.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/helper/tablehelper_p.h b/composereditor-ng/src/helper/tablehelper_p.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/helper/tablehelper_p.h
rename to composereditor-ng/src/helper/tablehelper_p.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.cpp b/composereditor-ng/src/image/composerimagedialog.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.cpp
rename to composereditor-ng/src/image/composerimagedialog.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.h b/composereditor-ng/src/image/composerimagedialog.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.h
rename to composereditor-ng/src/image/composerimagedialog.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.cpp b/composereditor-ng/src/image/composerimageresizetooltip.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.cpp
rename to composereditor-ng/src/image/composerimageresizetooltip.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.h b/composereditor-ng/src/image/composerimageresizetooltip.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.h
rename to composereditor-ng/src/image/composerimageresizetooltip.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.cpp b/composereditor-ng/src/image/composerimageresizewidget.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.cpp
rename to composereditor-ng/src/image/composerimageresizewidget.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.h b/composereditor-ng/src/image/composerimageresizewidget.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.h
rename to composereditor-ng/src/image/composerimageresizewidget.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.cpp b/composereditor-ng/src/link/composeranchordialog.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.cpp
rename to composereditor-ng/src/link/composeranchordialog.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.h b/composereditor-ng/src/link/composeranchordialog.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.h
rename to composereditor-ng/src/link/composeranchordialog.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.cpp b/composereditor-ng/src/link/composerlinkdialog.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.cpp
rename to composereditor-ng/src/link/composerlinkdialog.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.h b/composereditor-ng/src/link/composerlinkdialog.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.h
rename to composereditor-ng/src/link/composerlinkdialog.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.cpp b/composereditor-ng/src/list/composerlistdialog.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.cpp
rename to composereditor-ng/src/list/composerlistdialog.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.h b/composereditor-ng/src/list/composerlistdialog.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.h
rename to composereditor-ng/src/list/composerlistdialog.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp b/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp
rename to composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h b/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h
rename to composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp b/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp
rename to composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h b/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h
rename to composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/private/composerview_p.cpp b/composereditor-ng/src/private/composerview_p.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/private/composerview_p.cpp
rename to composereditor-ng/src/private/composerview_p.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/private/composerview_p.h b/composereditor-ng/src/private/composerview_p.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/private/composerview_p.h
rename to composereditor-ng/src/private/composerview_p.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.cpp b/composereditor-ng/src/table/composercellsizewidget.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.cpp
rename to composereditor-ng/src/table/composercellsizewidget.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.h b/composereditor-ng/src/table/composercellsizewidget.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.h
rename to composereditor-ng/src/table/composercellsizewidget.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.cpp b/composereditor-ng/src/table/composertableactionmenu.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.cpp
rename to composereditor-ng/src/table/composertableactionmenu.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.h b/composereditor-ng/src/table/composertableactionmenu.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.h
rename to composereditor-ng/src/table/composertableactionmenu.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.cpp b/composereditor-ng/src/table/composertablecellformatdialog.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.cpp
rename to composereditor-ng/src/table/composertablecellformatdialog.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.h b/composereditor-ng/src/table/composertablecellformatdialog.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.h
rename to composereditor-ng/src/table/composertablecellformatdialog.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.cpp b/composereditor-ng/src/table/composertabledialog.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.cpp
rename to composereditor-ng/src/table/composertabledialog.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.h b/composereditor-ng/src/table/composertabledialog.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.h
rename to composereditor-ng/src/table/composertabledialog.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.cpp b/composereditor-ng/src/table/composertableformatdialog.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.cpp
rename to composereditor-ng/src/table/composertableformatdialog.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.h b/composereditor-ng/src/table/composertableformatdialog.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.h
rename to composereditor-ng/src/table/composertableformatdialog.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.cpp b/composereditor-ng/src/table/composertableresizewidget.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.cpp
rename to composereditor-ng/src/table/composertableresizewidget.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.h b/composereditor-ng/src/table/composertableresizewidget.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.h
rename to composereditor-ng/src/table/composertableresizewidget.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/ui/pagecolorbackgroundwidget.ui b/composereditor-ng/src/ui/pagecolorbackgroundwidget.ui
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/ui/pagecolorbackgroundwidget.ui
rename to composereditor-ng/src/ui/pagecolorbackgroundwidget.ui
diff --git a/kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils.cpp b/composereditor-ng/src/utils/composereditorutils.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils.cpp
rename to composereditor-ng/src/utils/composereditorutils.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils_p.h b/composereditor-ng/src/utils/composereditorutils_p.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils_p.h
rename to composereditor-ng/src/utils/composereditorutils_p.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.cpp b/composereditor-ng/src/widgets/domtreewidget.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.cpp
rename to composereditor-ng/src/widgets/domtreewidget.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.h b/composereditor-ng/src/widgets/domtreewidget.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.h
rename to composereditor-ng/src/widgets/domtreewidget.h
diff --git a/kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.cpp b/composereditor-ng/src/widgets/findreplacebar.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.cpp
rename to composereditor-ng/src/widgets/findreplacebar.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.h b/composereditor-ng/src/widgets/findreplacebar.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.h
rename to composereditor-ng/src/widgets/findreplacebar.h
diff --git a/kdepim-apps-lib/composereditor-ng/tests/CMakeLists.txt b/composereditor-ng/tests/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/tests/CMakeLists.txt
rename to composereditor-ng/tests/CMakeLists.txt
diff --git a/kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.cpp b/composereditor-ng/tests/composerhtmleditor.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.cpp
rename to composereditor-ng/tests/composerhtmleditor.cpp
diff --git a/kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.h b/composereditor-ng/tests/composerhtmleditor.h
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.h
rename to composereditor-ng/tests/composerhtmleditor.h
diff --git a/kdepim-apps-lib/composereditor-ng/tests/composerhtmleditorui.rc b/composereditor-ng/tests/composerhtmleditorui.rc
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/tests/composerhtmleditorui.rc
rename to composereditor-ng/tests/composerhtmleditorui.rc
diff --git a/kdepim-apps-lib/composereditor-ng/tests/main.cpp b/composereditor-ng/tests/main.cpp
similarity index 100%
rename from kdepim-apps-lib/composereditor-ng/tests/main.cpp
rename to composereditor-ng/tests/main.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/CMakeLists.txt b/kaddressbookgrantlee/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/CMakeLists.txt
rename to kaddressbookgrantlee/CMakeLists.txt
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in b/kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in
rename to kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/CMakeLists.txt b/kaddressbookgrantlee/src/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/CMakeLists.txt
rename to kaddressbookgrantlee/src/CMakeLists.txt
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/Messages.sh b/kaddressbookgrantlee/src/Messages.sh
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/Messages.sh
rename to kaddressbookgrantlee/src/Messages.sh
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp b/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
rename to kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h b/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h
rename to kaddressbookgrantlee/src/formatter/grantleecontactformatter.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp b/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
rename to kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h b/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h
rename to kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp b/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp
rename to kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.h b/kaddressbookgrantlee/src/formatter/grantleecontactutils.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.h
rename to kaddressbookgrantlee/src/formatter/grantleecontactutils.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt b/kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt
rename to kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp b/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp
rename to kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h b/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h
rename to kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp b/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h b/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp b/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h b/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp b/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h b/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp b/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h b/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp b/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h b/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp b/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.h b/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.h
rename to kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.cpp b/kaddressbookgrantlee/src/printing/grantleeprint.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.cpp
rename to kaddressbookgrantlee/src/printing/grantleeprint.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.h b/kaddressbookgrantlee/src/printing/grantleeprint.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.h
rename to kaddressbookgrantlee/src/printing/grantleeprint.h
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp b/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp
rename to kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp
diff --git a/kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.h b/kaddressbookgrantlee/src/widget/grantleecontactviewer.h
similarity index 100%
rename from kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.h
rename to kaddressbookgrantlee/src/widget/grantleecontactviewer.h
diff --git a/kdepim-apps-lib/kdepim-apps-lib.categories b/kdepim-apps-lib.categories
similarity index 100%
rename from kdepim-apps-lib/kdepim-apps-lib.categories
rename to kdepim-apps-lib.categories
diff --git a/kdepim-apps-lib/libfollowupreminder/CMakeLists.txt b/libfollowupreminder/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/CMakeLists.txt
rename to libfollowupreminder/CMakeLists.txt
diff --git a/kdepim-apps-lib/libfollowupreminder/KF5FollowupReminderConfig.cmake.in b/libfollowupreminder/KF5FollowupReminderConfig.cmake.in
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/KF5FollowupReminderConfig.cmake.in
rename to libfollowupreminder/KF5FollowupReminderConfig.cmake.in
diff --git a/kdepim-apps-lib/libfollowupreminder/KF5SendLaterConfig.cmake.in b/libfollowupreminder/KF5SendLaterConfig.cmake.in
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/KF5SendLaterConfig.cmake.in
rename to libfollowupreminder/KF5SendLaterConfig.cmake.in
diff --git a/kdepim-apps-lib/libfollowupreminder/src/CMakeLists.txt b/libfollowupreminder/src/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/src/CMakeLists.txt
rename to libfollowupreminder/src/CMakeLists.txt
diff --git a/kdepim-apps-lib/libfollowupreminder/src/Messages.sh b/libfollowupreminder/src/Messages.sh
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/src/Messages.sh
rename to libfollowupreminder/src/Messages.sh
diff --git a/kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.cpp b/libfollowupreminder/src/followupreminderinfo.cpp
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.cpp
rename to libfollowupreminder/src/followupreminderinfo.cpp
diff --git a/kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.h b/libfollowupreminder/src/followupreminderinfo.h
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.h
rename to libfollowupreminder/src/followupreminderinfo.h
diff --git a/kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.cpp b/libfollowupreminder/src/followupreminderutil.cpp
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.cpp
rename to libfollowupreminder/src/followupreminderutil.cpp
diff --git a/kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.h b/libfollowupreminder/src/followupreminderutil.h
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.h
rename to libfollowupreminder/src/followupreminderutil.h
diff --git a/kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfg b/libfollowupreminder/src/settings/followupreminderagentsettings.kcfg
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfg
rename to libfollowupreminder/src/settings/followupreminderagentsettings.kcfg
diff --git a/kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc b/libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc
similarity index 100%
rename from kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc
rename to libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/CMakeLists.txt b/libkdepimdbusinterfaces/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/CMakeLists.txt
rename to libkdepimdbusinterfaces/CMakeLists.txt
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in b/libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in
rename to libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/src/CMakeLists.txt b/libkdepimdbusinterfaces/src/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/src/CMakeLists.txt
rename to libkdepimdbusinterfaces/src/CMakeLists.txt
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h b/libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h
rename to libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml b/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml
rename to libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml b/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml
rename to libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.cpp b/libkdepimdbusinterfaces/src/reminderclient.cpp
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.cpp
rename to libkdepimdbusinterfaces/src/reminderclient.cpp
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.h b/libkdepimdbusinterfaces/src/reminderclient.h
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.h
rename to libkdepimdbusinterfaces/src/reminderclient.h
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.cpp b/libkdepimdbusinterfaces/src/urihandler.cpp
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.cpp
rename to libkdepimdbusinterfaces/src/urihandler.cpp
diff --git a/kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.h b/libkdepimdbusinterfaces/src/urihandler.h
similarity index 100%
rename from kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.h
rename to libkdepimdbusinterfaces/src/urihandler.h
diff --git a/kdepim-apps-lib/libsendlater/CMakeLists.txt b/libsendlater/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/libsendlater/CMakeLists.txt
rename to libsendlater/CMakeLists.txt
diff --git a/kdepim-apps-lib/libsendlater/KF5SendLaterConfig.cmake.in b/libsendlater/KF5SendLaterConfig.cmake.in
similarity index 100%
rename from kdepim-apps-lib/libsendlater/KF5SendLaterConfig.cmake.in
rename to libsendlater/KF5SendLaterConfig.cmake.in
diff --git a/kdepim-apps-lib/libsendlater/src/CMakeLists.txt b/libsendlater/src/CMakeLists.txt
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/CMakeLists.txt
rename to libsendlater/src/CMakeLists.txt
diff --git a/kdepim-apps-lib/libsendlater/src/Messages.sh b/libsendlater/src/Messages.sh
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/Messages.sh
rename to libsendlater/src/Messages.sh
diff --git a/kdepim-apps-lib/libsendlater/src/sendlaterdialog.cpp b/libsendlater/src/sendlaterdialog.cpp
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/sendlaterdialog.cpp
rename to libsendlater/src/sendlaterdialog.cpp
diff --git a/kdepim-apps-lib/libsendlater/src/sendlaterdialog.h b/libsendlater/src/sendlaterdialog.h
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/sendlaterdialog.h
rename to libsendlater/src/sendlaterdialog.h
diff --git a/kdepim-apps-lib/libsendlater/src/sendlaterinfo.cpp b/libsendlater/src/sendlaterinfo.cpp
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/sendlaterinfo.cpp
rename to libsendlater/src/sendlaterinfo.cpp
diff --git a/kdepim-apps-lib/libsendlater/src/sendlaterinfo.h b/libsendlater/src/sendlaterinfo.h
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/sendlaterinfo.h
rename to libsendlater/src/sendlaterinfo.h
diff --git a/kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.cpp b/libsendlater/src/sendlatertimedatewidget.cpp
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.cpp
rename to libsendlater/src/sendlatertimedatewidget.cpp
diff --git a/kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.h b/libsendlater/src/sendlatertimedatewidget.h
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.h
rename to libsendlater/src/sendlatertimedatewidget.h
diff --git a/kdepim-apps-lib/libsendlater/src/sendlaterutil.cpp b/libsendlater/src/sendlaterutil.cpp
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/sendlaterutil.cpp
rename to libsendlater/src/sendlaterutil.cpp
diff --git a/kdepim-apps-lib/libsendlater/src/sendlaterutil.h b/libsendlater/src/sendlaterutil.h
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/sendlaterutil.h
rename to libsendlater/src/sendlaterutil.h
diff --git a/kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfg b/libsendlater/src/settings/sendlateragentsettings.kcfg
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfg
rename to libsendlater/src/settings/sendlateragentsettings.kcfg
diff --git a/kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfgc b/libsendlater/src/settings/sendlateragentsettings.kcfgc
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfgc
rename to libsendlater/src/settings/sendlateragentsettings.kcfgc
diff --git a/kdepim-apps-lib/libsendlater/src/ui/sendlaterwidget.ui b/libsendlater/src/ui/sendlaterwidget.ui
similarity index 100%
rename from kdepim-apps-lib/libsendlater/src/ui/sendlaterwidget.ui
rename to libsendlater/src/ui/sendlaterwidget.ui