diff --git a/core/libs/tags/CMakeLists.txt b/core/libs/tags/CMakeLists.txt
index da60eb8151..72d4c4ca93 100644
--- a/core/libs/tags/CMakeLists.txt
+++ b/core/libs/tags/CMakeLists.txt
@@ -1,55 +1,52 @@
 #
 # Copyright (c) 2010-2018 by Gilles Caulier, <caulier dot gilles at gmail dot com>
 # Copyright (c) 2015      by Veaceslav Munteanu, <veaceslav dot munteanu90 at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif (POLICY CMP0063)
 
 set(libtags_SRCS
-    addtagscombobox.cpp
-    tagscompleter.cpp
-    addtagslineedit.cpp
-    tagcheckview.cpp
-    tagfolderview.cpp
-    taggingaction.cpp
-    tagslineeditoverlay.cpp
-    tagspopupmenu.cpp
-    tageditdlg.cpp
-    tagmodificationhelper.cpp
-    tagsactionmngr.cpp
-    taggingactionfactory.cpp
-
-    tagsmanager/tagsmanager.cpp
-    tagsmanager/tagpropwidget.cpp
-    tagsmanager/taglist.cpp
-    tagsmanager/tagmngrtreeview.cpp
-    tagsmanager/models/tagmngrlistview.cpp
-    tagsmanager/models/tagmngrlistmodel.cpp
-    tagsmanager/models/tagmngrlistitem.cpp
-)
-
-include_directories(tagsmanager/
-                    tagsmanager/models/
+    widgets/addtagscombobox.cpp
+    widgets/addtagslineedit.cpp
+    widgets/tagcheckview.cpp
+    widgets/tagfolderview.cpp
+    widgets/tagslineeditoverlay.cpp
+    widgets/tagspopupmenu.cpp
+    widgets/tageditdlg.cpp
+
+    engine/tagscompleter.cpp
+    engine/tagmodificationhelper.cpp
+    engine/tagsactionmngr.cpp
+    engine/taggingaction.cpp
+    engine/taggingactionfactory.cpp
+
+    manager/tagsmanager.cpp
+    manager/tagpropwidget.cpp
+    manager/taglist.cpp
+    manager/tagmngrtreeview.cpp
+    manager/models/tagmngrlistview.cpp
+    manager/models/tagmngrlistmodel.cpp
+    manager/models/tagmngrlistitem.cpp
 )
 
 include_directories(
     $<TARGET_PROPERTY:Qt5::Sql,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:Qt5::Gui,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
 
     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:KF5::WidgetsAddons,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:KF5::Solid,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 if(KF5IconThemes_FOUND)
     include_directories($<TARGET_PROPERTY:KF5::IconThemes,INTERFACE_INCLUDE_DIRECTORIES>)
 endif()
 
 add_library(digikamtags_src OBJECT ${libtags_SRCS})
diff --git a/core/libs/tags/taggingaction.cpp b/core/libs/tags/engine/taggingaction.cpp
similarity index 100%
rename from core/libs/tags/taggingaction.cpp
rename to core/libs/tags/engine/taggingaction.cpp
diff --git a/core/libs/tags/taggingaction.h b/core/libs/tags/engine/taggingaction.h
similarity index 100%
rename from core/libs/tags/taggingaction.h
rename to core/libs/tags/engine/taggingaction.h
diff --git a/core/libs/tags/taggingactionfactory.cpp b/core/libs/tags/engine/taggingactionfactory.cpp
similarity index 100%
rename from core/libs/tags/taggingactionfactory.cpp
rename to core/libs/tags/engine/taggingactionfactory.cpp
diff --git a/core/libs/tags/taggingactionfactory.h b/core/libs/tags/engine/taggingactionfactory.h
similarity index 100%
rename from core/libs/tags/taggingactionfactory.h
rename to core/libs/tags/engine/taggingactionfactory.h
diff --git a/core/libs/tags/tagmodificationhelper.cpp b/core/libs/tags/engine/tagmodificationhelper.cpp
similarity index 100%
rename from core/libs/tags/tagmodificationhelper.cpp
rename to core/libs/tags/engine/tagmodificationhelper.cpp
diff --git a/core/libs/tags/tagmodificationhelper.h b/core/libs/tags/engine/tagmodificationhelper.h
similarity index 100%
rename from core/libs/tags/tagmodificationhelper.h
rename to core/libs/tags/engine/tagmodificationhelper.h
diff --git a/core/libs/tags/tagsactionmngr.cpp b/core/libs/tags/engine/tagsactionmngr.cpp
similarity index 100%
rename from core/libs/tags/tagsactionmngr.cpp
rename to core/libs/tags/engine/tagsactionmngr.cpp
diff --git a/core/libs/tags/tagsactionmngr.h b/core/libs/tags/engine/tagsactionmngr.h
similarity index 100%
rename from core/libs/tags/tagsactionmngr.h
rename to core/libs/tags/engine/tagsactionmngr.h
diff --git a/core/libs/tags/tagscompleter.cpp b/core/libs/tags/engine/tagscompleter.cpp
similarity index 100%
rename from core/libs/tags/tagscompleter.cpp
rename to core/libs/tags/engine/tagscompleter.cpp
diff --git a/core/libs/tags/tagscompleter.h b/core/libs/tags/engine/tagscompleter.h
similarity index 100%
rename from core/libs/tags/tagscompleter.h
rename to core/libs/tags/engine/tagscompleter.h
diff --git a/core/libs/tags/tagsmanager/TODO.TAGMNGR b/core/libs/tags/manager/TODO.TAGMNGR
similarity index 100%
rename from core/libs/tags/tagsmanager/TODO.TAGMNGR
rename to core/libs/tags/manager/TODO.TAGMNGR
diff --git a/core/libs/tags/tagsmanager/models/tagmngrlistitem.cpp b/core/libs/tags/manager/models/tagmngrlistitem.cpp
similarity index 100%
rename from core/libs/tags/tagsmanager/models/tagmngrlistitem.cpp
rename to core/libs/tags/manager/models/tagmngrlistitem.cpp
diff --git a/core/libs/tags/tagsmanager/models/tagmngrlistitem.h b/core/libs/tags/manager/models/tagmngrlistitem.h
similarity index 100%
rename from core/libs/tags/tagsmanager/models/tagmngrlistitem.h
rename to core/libs/tags/manager/models/tagmngrlistitem.h
diff --git a/core/libs/tags/tagsmanager/models/tagmngrlistmodel.cpp b/core/libs/tags/manager/models/tagmngrlistmodel.cpp
similarity index 100%
rename from core/libs/tags/tagsmanager/models/tagmngrlistmodel.cpp
rename to core/libs/tags/manager/models/tagmngrlistmodel.cpp
diff --git a/core/libs/tags/tagsmanager/models/tagmngrlistmodel.h b/core/libs/tags/manager/models/tagmngrlistmodel.h
similarity index 100%
rename from core/libs/tags/tagsmanager/models/tagmngrlistmodel.h
rename to core/libs/tags/manager/models/tagmngrlistmodel.h
diff --git a/core/libs/tags/tagsmanager/models/tagmngrlistview.cpp b/core/libs/tags/manager/models/tagmngrlistview.cpp
similarity index 100%
rename from core/libs/tags/tagsmanager/models/tagmngrlistview.cpp
rename to core/libs/tags/manager/models/tagmngrlistview.cpp
diff --git a/core/libs/tags/tagsmanager/models/tagmngrlistview.h b/core/libs/tags/manager/models/tagmngrlistview.h
similarity index 100%
rename from core/libs/tags/tagsmanager/models/tagmngrlistview.h
rename to core/libs/tags/manager/models/tagmngrlistview.h
diff --git a/core/libs/tags/tagsmanager/taglist.cpp b/core/libs/tags/manager/taglist.cpp
similarity index 100%
rename from core/libs/tags/tagsmanager/taglist.cpp
rename to core/libs/tags/manager/taglist.cpp
diff --git a/core/libs/tags/tagsmanager/taglist.h b/core/libs/tags/manager/taglist.h
similarity index 100%
rename from core/libs/tags/tagsmanager/taglist.h
rename to core/libs/tags/manager/taglist.h
diff --git a/core/libs/tags/tagsmanager/tagmngrtreeview.cpp b/core/libs/tags/manager/tagmngrtreeview.cpp
similarity index 100%
rename from core/libs/tags/tagsmanager/tagmngrtreeview.cpp
rename to core/libs/tags/manager/tagmngrtreeview.cpp
diff --git a/core/libs/tags/tagsmanager/tagmngrtreeview.h b/core/libs/tags/manager/tagmngrtreeview.h
similarity index 100%
rename from core/libs/tags/tagsmanager/tagmngrtreeview.h
rename to core/libs/tags/manager/tagmngrtreeview.h
diff --git a/core/libs/tags/tagsmanager/tagpropwidget.cpp b/core/libs/tags/manager/tagpropwidget.cpp
similarity index 100%
rename from core/libs/tags/tagsmanager/tagpropwidget.cpp
rename to core/libs/tags/manager/tagpropwidget.cpp
diff --git a/core/libs/tags/tagsmanager/tagpropwidget.h b/core/libs/tags/manager/tagpropwidget.h
similarity index 100%
rename from core/libs/tags/tagsmanager/tagpropwidget.h
rename to core/libs/tags/manager/tagpropwidget.h
diff --git a/core/libs/tags/tagsmanager/tagsmanager.cpp b/core/libs/tags/manager/tagsmanager.cpp
similarity index 100%
rename from core/libs/tags/tagsmanager/tagsmanager.cpp
rename to core/libs/tags/manager/tagsmanager.cpp
diff --git a/core/libs/tags/tagsmanager/tagsmanager.h b/core/libs/tags/manager/tagsmanager.h
similarity index 100%
rename from core/libs/tags/tagsmanager/tagsmanager.h
rename to core/libs/tags/manager/tagsmanager.h
diff --git a/core/libs/tags/addtagscombobox.cpp b/core/libs/tags/widgets/addtagscombobox.cpp
similarity index 100%
rename from core/libs/tags/addtagscombobox.cpp
rename to core/libs/tags/widgets/addtagscombobox.cpp
diff --git a/core/libs/tags/addtagscombobox.h b/core/libs/tags/widgets/addtagscombobox.h
similarity index 100%
rename from core/libs/tags/addtagscombobox.h
rename to core/libs/tags/widgets/addtagscombobox.h
diff --git a/core/libs/tags/addtagslineedit.cpp b/core/libs/tags/widgets/addtagslineedit.cpp
similarity index 100%
rename from core/libs/tags/addtagslineedit.cpp
rename to core/libs/tags/widgets/addtagslineedit.cpp
diff --git a/core/libs/tags/addtagslineedit.h b/core/libs/tags/widgets/addtagslineedit.h
similarity index 100%
rename from core/libs/tags/addtagslineedit.h
rename to core/libs/tags/widgets/addtagslineedit.h
diff --git a/core/libs/tags/tagcheckview.cpp b/core/libs/tags/widgets/tagcheckview.cpp
similarity index 100%
rename from core/libs/tags/tagcheckview.cpp
rename to core/libs/tags/widgets/tagcheckview.cpp
diff --git a/core/libs/tags/tagcheckview.h b/core/libs/tags/widgets/tagcheckview.h
similarity index 100%
rename from core/libs/tags/tagcheckview.h
rename to core/libs/tags/widgets/tagcheckview.h
diff --git a/core/libs/tags/tageditdlg.cpp b/core/libs/tags/widgets/tageditdlg.cpp
similarity index 100%
rename from core/libs/tags/tageditdlg.cpp
rename to core/libs/tags/widgets/tageditdlg.cpp
diff --git a/core/libs/tags/tageditdlg.h b/core/libs/tags/widgets/tageditdlg.h
similarity index 100%
rename from core/libs/tags/tageditdlg.h
rename to core/libs/tags/widgets/tageditdlg.h
diff --git a/core/libs/tags/tagfolderview.cpp b/core/libs/tags/widgets/tagfolderview.cpp
similarity index 100%
rename from core/libs/tags/tagfolderview.cpp
rename to core/libs/tags/widgets/tagfolderview.cpp
diff --git a/core/libs/tags/tagfolderview.h b/core/libs/tags/widgets/tagfolderview.h
similarity index 100%
rename from core/libs/tags/tagfolderview.h
rename to core/libs/tags/widgets/tagfolderview.h
diff --git a/core/libs/tags/tagslineeditoverlay.cpp b/core/libs/tags/widgets/tagslineeditoverlay.cpp
similarity index 100%
rename from core/libs/tags/tagslineeditoverlay.cpp
rename to core/libs/tags/widgets/tagslineeditoverlay.cpp
diff --git a/core/libs/tags/tagslineeditoverlay.h b/core/libs/tags/widgets/tagslineeditoverlay.h
similarity index 100%
rename from core/libs/tags/tagslineeditoverlay.h
rename to core/libs/tags/widgets/tagslineeditoverlay.h
diff --git a/core/libs/tags/tagspopupmenu.cpp b/core/libs/tags/widgets/tagspopupmenu.cpp
similarity index 100%
rename from core/libs/tags/tagspopupmenu.cpp
rename to core/libs/tags/widgets/tagspopupmenu.cpp
diff --git a/core/libs/tags/tagspopupmenu.h b/core/libs/tags/widgets/tagspopupmenu.h
similarity index 100%
rename from core/libs/tags/tagspopupmenu.h
rename to core/libs/tags/widgets/tagspopupmenu.h