diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c5f72e36..011a33302 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,14 +163,14 @@ if(BUILD_COVERAGE)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
 endif()
 
-add_subdirectory( ui )
+add_subdirectory( icons ) # an own directory for multi-size icons retrieved by KIconThemeLoader
+add_subdirectory( part )
 if(BUILD_DESKTOP)
     add_subdirectory( shell )
 endif()
 add_subdirectory( generators )
 if(BUILD_TESTING)
    add_subdirectory( autotests )
-   add_subdirectory( conf/autotests )
 endif()
 
 if(KF5DocTools_FOUND)
@@ -230,7 +230,7 @@ qt5_add_resources(okularcore_SRCS
 )
 
 ki18n_wrap_ui(okularcore_SRCS
-   conf/textdocumentsettings.ui
+   part/textdocumentsettings.ui
 )
 
 install( FILES
@@ -351,90 +351,86 @@ install(FILES core/okularGenerator.desktop DESTINATION ${KDE_INSTALL_KSERVICETYP
 
 if(BUILD_DESKTOP)
   # okularpart
-  set(okularpart_conf_SRCS
-    conf/preferencesdialog.cpp
-    conf/dlgaccessibility.cpp
-    conf/dlgdebug.cpp
-    conf/dlgeditor.cpp
-    conf/dlggeneral.cpp
-    conf/dlgannotations.cpp
-    conf/dlgperformance.cpp
-    conf/dlgpresentation.cpp
-    conf/editannottooldialog.cpp
-    conf/editdrawingtooldialog.cpp
-    conf/widgetannottools.cpp
-    conf/widgetconfigurationtoolsbase.cpp
-    conf/widgetdrawingtools.cpp
-  )
-
   set(okularpart_SRCS
-    ${okularpart_conf_SRCS}
-    part.cpp
-    xmlgui_helper.cpp
-    extensions.cpp
-    ui/embeddedfilesdialog.cpp
-    ui/annotationactionhandler.cpp
-    ui/annotwindow.cpp
-    ui/annotationmodel.cpp
-    ui/annotationpopup.cpp
-    ui/annotationpropertiesdialog.cpp
-    ui/annotationproxymodels.cpp
-    ui/annotationtools.cpp
-    ui/annotationwidgets.cpp
-    ui/bookmarklist.cpp
-    ui/certificateviewer.cpp
-    ui/debug_ui.cpp
-    ui/drawingtoolactions.cpp
-    ui/fileprinterpreview.cpp
-    ui/findbar.cpp
-    ui/formwidgets.cpp
-    ui/guiutils.cpp
-    ui/ktreeviewsearchline.cpp
-    ui/latexrenderer.cpp
-    ui/minibar.cpp
-    ui/okmenutitle.cpp
-    ui/pageitemdelegate.cpp
-    ui/pagepainter.cpp
-    ui/pagesizelabel.cpp
-    ui/pageviewannotator.cpp
-    ui/pageviewmouseannotation.cpp
-    ui/pageview.cpp
-    ui/magnifierview.cpp
-    ui/pageviewutils.cpp
-    ui/presentationsearchbar.cpp
-    ui/presentationwidget.cpp
-    ui/propertiesdialog.cpp
-    ui/revisionviewer.cpp
-    ui/searchlineedit.cpp
-    ui/searchwidget.cpp
-    ui/sidebar.cpp
-    ui/side_reviews.cpp
-    ui/snapshottaker.cpp
-    ui/thumbnaillist.cpp
-    ui/toc.cpp
-    ui/tocmodel.cpp
-    ui/toggleactionmenu.cpp
-    ui/videowidget.cpp
-    ui/layers.cpp
-    ui/signatureguiutils.cpp
-    ui/signaturepropertiesdialog.cpp
-    ui/signaturemodel.cpp
-    ui/signaturepanel.cpp
+    part/preferencesdialog.cpp
+    part/dlgaccessibility.cpp
+    part/dlgdebug.cpp
+    part/dlgeditor.cpp
+    part/dlggeneral.cpp
+    part/dlgannotations.cpp
+    part/dlgperformance.cpp
+    part/dlgpresentation.cpp
+    part/editannottooldialog.cpp
+    part/editdrawingtooldialog.cpp
+    part/widgetannottools.cpp
+    part/widgetconfigurationtoolsbase.cpp
+    part/widgetdrawingtools.cpp
+    part/part.cpp
+    part/xmlgui_helper.cpp
+    part/extensions.cpp
+    part/embeddedfilesdialog.cpp
+    part/annotationactionhandler.cpp
+    part/annotwindow.cpp
+    part/annotationmodel.cpp
+    part/annotationpopup.cpp
+    part/annotationpropertiesdialog.cpp
+    part/annotationproxymodels.cpp
+    part/annotationtools.cpp
+    part/annotationwidgets.cpp
+    part/bookmarklist.cpp
+    part/certificateviewer.cpp
+    part/debug_ui.cpp
+    part/drawingtoolactions.cpp
+    part/fileprinterpreview.cpp
+    part/findbar.cpp
+    part/formwidgets.cpp
+    part/guiutils.cpp
+    part/ktreeviewsearchline.cpp
+    part/latexrenderer.cpp
+    part/minibar.cpp
+    part/okmenutitle.cpp
+    part/pageitemdelegate.cpp
+    part/pagepainter.cpp
+    part/pagesizelabel.cpp
+    part/pageviewannotator.cpp
+    part/pageviewmouseannotation.cpp
+    part/pageview.cpp
+    part/magnifierview.cpp
+    part/pageviewutils.cpp
+    part/presentationsearchbar.cpp
+    part/presentationwidget.cpp
+    part/propertiesdialog.cpp
+    part/revisionviewer.cpp
+    part/searchlineedit.cpp
+    part/searchwidget.cpp
+    part/sidebar.cpp
+    part/side_reviews.cpp
+    part/snapshottaker.cpp
+    part/thumbnaillist.cpp
+    part/toc.cpp
+    part/tocmodel.cpp
+    part/toggleactionmenu.cpp
+    part/videowidget.cpp
+    part/layers.cpp
+    part/signatureguiutils.cpp
+    part/signaturepropertiesdialog.cpp
+    part/signaturemodel.cpp
+    part/signaturepanel.cpp
   )
 endif()
 
 if (Qt5TextToSpeech_FOUND)
    set(okularpart_SRCS ${okularpart_SRCS}
-      ui/tts.cpp)
+      part/tts.cpp)
 endif()
 
 ki18n_wrap_ui(okularpart_SRCS
-   conf/dlgaccessibilitybase.ui
-   conf/dlgeditorbase.ui
-   conf/dlggeneralbase.ui
-   conf/dlgannotationsbase.ui
-   conf/dlgperformancebase.ui
-   conf/dlgpresentationbase.ui
+   part/dlgaccessibilitybase.ui
+   part/dlgeditorbase.ui
+   part/dlggeneralbase.ui
+   part/dlgannotationsbase.ui
+   part/dlgperformancebase.ui
+   part/dlgpresentationbase.ui
 )
 
 kconfig_add_kcfg_files(okularpart_SRCS GENERATE_MOC conf/settings.kcfgc)
@@ -480,7 +476,7 @@ install(TARGETS okularpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
 install(FILES okular.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
 
 install( FILES okular_part.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
-install( FILES part.rc part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
+install( FILES part/part.rc part/part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
 
 if (${ECM_VERSION} STRGREATER "5.58.0")
     install(FILES okular.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
diff --git a/Messages.sh b/Messages.sh
index 5431a4e98..db2ec7ea4 100644
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 $EXTRACTRC *.rc */*.rc >> rc.cpp || exit 11
-$EXTRACTRC $(find conf/ -name "*.ui") $(find core/ -name "*.ui") $(find ui/ -name "*.ui") $(ls . | grep -E '\.ui') >> rc.cpp || exit 12
-$EXTRACTATTR --attr=tool,name ui/data/drawingtools.xml >> rc.cpp || exit 13
-$XGETTEXT $(find conf/ -name "*.cpp" -o -name "*.h") $(find core/ -name "*.cpp" -o -name "*.h") $(find ui/ -name "*.cpp" -o -name "*.h") $(find shell/ -name "*.cpp" -o -name "*.h") $(ls . | grep -E '\.cpp$') $(ls . | grep -E '\.h$') -o $podir/okular.pot
+$EXTRACTRC $(find conf/ -name "*.ui") $(find core/ -name "*.ui") $(find part/ -name "*.ui") $(ls . | grep -E '\.ui') >> rc.cpp || exit 12
+$EXTRACTATTR --attr=tool,name part/data/drawingtools.xml >> rc.cpp || exit 13
+$XGETTEXT $(find conf/ -name "*.cpp" -o -name "*.h") $(find core/ -name "*.cpp" -o -name "*.h") $(find part/ -name "*.cpp" -o -name "*.h") $(find shell/ -name "*.cpp" -o -name "*.h") $(ls . | grep -E '\.cpp$') $(ls . | grep -E '\.h$') -o $podir/okular.pot
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 334b8eadf..64b5d7d57 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -2,6 +2,24 @@ add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
 
+macro(add_conf_unittest _source)
+  set(_test ${_source} ../part/editdrawingtooldialog.cpp)
+  get_filename_component(_name ${_source} NAME_WE)
+  add_executable( ${_name} ${_test} )
+  add_test( NAME ${_name} COMMAND ${_name} )
+  ecm_mark_as_test(${_name})
+  target_link_libraries( ${_name}
+    Qt5::Test
+    Qt5::Widgets
+    Qt5::Xml
+    KF5::I18n
+    KF5::Completion
+    KF5::WidgetsAddons
+  )
+endmacro ()
+
+add_conf_unittest(editdrawingtooldialogtest.cpp)
+
 ecm_add_test(shelltest.cpp ../shell/shellutils.cpp
     TEST_NAME "shelltest"
     LINK_LIBRARIES Qt5::Test okularcore
diff --git a/autotests/annotationtoolbartest.cpp b/autotests/annotationtoolbartest.cpp
index 7b31bf5cf..cd730df86 100644
--- a/autotests/annotationtoolbartest.cpp
+++ b/autotests/annotationtoolbartest.cpp
@@ -20,12 +20,12 @@
 #include <KSelectAction>
 
 #include "../core/page.h"
-#include "../part.h"
+#include "../part/pageview.h"
+#include "../part/part.h"
 #include "../settings.h"
 #include "../shell/okular_main.h"
 #include "../shell/shell.h"
 #include "../shell/shellutils.h"
-#include "../ui/pageview.h"
 #include "closedialoghelper.h"
 
 namespace Okular
diff --git a/autotests/closedialoghelper.h b/autotests/closedialoghelper.h
index aad759d4b..4fbef842b 100644
--- a/autotests/closedialoghelper.h
+++ b/autotests/closedialoghelper.h
@@ -1,10 +1,11 @@
 #ifndef CLOSEDIALOGHELPER_H
 #define CLOSEDIALOGHELPER_H
 
-#include <../part.h>
 #include <QDialogButtonBox>
 #include <QObject>
 
+#include "../part/part.h"
+
 namespace TestingUtils
 {
 /*
diff --git a/conf/autotests/editdrawingtooldialogtest.cpp b/autotests/editdrawingtooldialogtest.cpp
similarity index 97%
rename from conf/autotests/editdrawingtooldialogtest.cpp
rename to autotests/editdrawingtooldialogtest.cpp
index 9806e06a8..4ab1927ac 100644
--- a/conf/autotests/editdrawingtooldialogtest.cpp
+++ b/autotests/editdrawingtooldialogtest.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 
 #include "editdrawingtooldialogtest.h"
-#include "../editdrawingtooldialog.h"
+#include "../part/editdrawingtooldialog.h"
 
 #include <KColorButton>
 #include <KLineEdit>
diff --git a/conf/autotests/editdrawingtooldialogtest.h b/autotests/editdrawingtooldialogtest.h
similarity index 100%
rename from conf/autotests/editdrawingtooldialogtest.h
rename to autotests/editdrawingtooldialogtest.h
diff --git a/autotests/mainshelltest.cpp b/autotests/mainshelltest.cpp
index 750cbcf6d..0994f5bbe 100644
--- a/autotests/mainshelltest.cpp
+++ b/autotests/mainshelltest.cpp
@@ -21,13 +21,13 @@
 #include <qwidget.h>
 
 #include "../core/document_p.h"
-#include "../part.h"
+#include "../part/findbar.h"
+#include "../part/part.h"
+#include "../part/presentationwidget.h"
 #include "../settings.h"
 #include "../shell/okular_main.h"
 #include "../shell/shell.h"
 #include "../shell/shellutils.h"
-#include "../ui/findbar.h"
-#include "../ui/presentationwidget.h"
 #include "closedialoghelper.h"
 
 #include <sys/types.h>
diff --git a/autotests/parttest.cpp b/autotests/parttest.cpp
index 6eddbd86c..15c5cf5dc 100644
--- a/autotests/parttest.cpp
+++ b/autotests/parttest.cpp
@@ -17,13 +17,13 @@
 #include "../core/annotations.h"
 #include "../core/form.h"
 #include "../core/page.h"
-#include "../part.h"
+#include "../part/pageview.h"
+#include "../part/part.h"
+#include "../part/presentationwidget.h"
+#include "../part/sidebar.h"
+#include "../part/toc.h"
+#include "../part/toggleactionmenu.h"
 #include "../settings.h"
-#include "../ui/pageview.h"
-#include "../ui/presentationwidget.h"
-#include "../ui/sidebar.h"
-#include "../ui/toc.h"
-#include "../ui/toggleactionmenu.h"
 #include "closedialoghelper.h"
 
 #include "../generators/poppler/config-okular-poppler.h"
diff --git a/autotests/urldetecttest.cpp b/autotests/urldetecttest.cpp
index 9ef1ccfa1..59474e860 100644
--- a/autotests/urldetecttest.cpp
+++ b/autotests/urldetecttest.cpp
@@ -9,7 +9,7 @@
 
 #include <QtTest>
 
-#include "../ui/url_utils.h"
+#include "../part/url_utils.h"
 
 namespace Okular
 {
diff --git a/conf/autotests/CMakeLists.txt b/conf/autotests/CMakeLists.txt
deleted file mode 100644
index 14ed7ae49..000000000
--- a/conf/autotests/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-macro(add_conf_unittest _source)
-  set(_test ${_source} ../editdrawingtooldialog.cpp)
-  get_filename_component(_name ${_source} NAME_WE)
-  add_executable( ${_name} ${_test} )
-  add_test( NAME ${_name} COMMAND ${_name} )
-  ecm_mark_as_test(${_name})
-  target_link_libraries( ${_name}
-    Qt5::Test
-    Qt5::Widgets
-    Qt5::Xml
-    KF5::I18n
-    KF5::Completion
-    KF5::WidgetsAddons
-  )
-endmacro ()
-
-add_conf_unittest(editdrawingtooldialogtest.cpp)
-
diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
index b8cac76df..db14d741f 100644
--- a/generators/kimgio/CMakeLists.txt
+++ b/generators/kimgio/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
 
 if(BUILD_TESTING)
     add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
-    set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
+    set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp )
     ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
     target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
 endif()
diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp
index 3d3ab3bc4..2b507ed79 100644
--- a/generators/kimgio/tests/kimgiotest.cpp
+++ b/generators/kimgio/tests/kimgiotest.cpp
@@ -12,7 +12,7 @@
 
 #include <core/observer.h>
 #include <core/page.h>
-#include <ui/pagepainter.h>
+#include <part/pagepainter.h>
 
 #include <QtTest>
 
diff --git a/ui/data/icons/128-apps-okular.png b/icons/128-apps-okular.png
similarity index 100%
rename from ui/data/icons/128-apps-okular.png
rename to icons/128-apps-okular.png
diff --git a/ui/data/icons/150-apps-okular.png b/icons/150-apps-okular.png
similarity index 100%
rename from ui/data/icons/150-apps-okular.png
rename to icons/150-apps-okular.png
diff --git a/ui/data/icons/16-apps-okular.png b/icons/16-apps-okular.png
similarity index 100%
rename from ui/data/icons/16-apps-okular.png
rename to icons/16-apps-okular.png
diff --git a/ui/data/icons/22-apps-okular.png b/icons/22-apps-okular.png
similarity index 100%
rename from ui/data/icons/22-apps-okular.png
rename to icons/22-apps-okular.png
diff --git a/ui/data/icons/310-apps-okular.png b/icons/310-apps-okular.png
similarity index 100%
rename from ui/data/icons/310-apps-okular.png
rename to icons/310-apps-okular.png
diff --git a/ui/data/icons/32-apps-okular.png b/icons/32-apps-okular.png
similarity index 100%
rename from ui/data/icons/32-apps-okular.png
rename to icons/32-apps-okular.png
diff --git a/ui/data/icons/44-apps-okular.png b/icons/44-apps-okular.png
similarity index 100%
rename from ui/data/icons/44-apps-okular.png
rename to icons/44-apps-okular.png
diff --git a/ui/data/icons/48-apps-okular.png b/icons/48-apps-okular.png
similarity index 100%
rename from ui/data/icons/48-apps-okular.png
rename to icons/48-apps-okular.png
diff --git a/ui/data/icons/64-apps-okular.png b/icons/64-apps-okular.png
similarity index 100%
rename from ui/data/icons/64-apps-okular.png
rename to icons/64-apps-okular.png
diff --git a/ui/data/icons/CMakeLists.txt b/icons/CMakeLists.txt
similarity index 100%
rename from ui/data/icons/CMakeLists.txt
rename to icons/CMakeLists.txt
diff --git a/ui/data/icons/hisc-apps-okular.svgz b/icons/hisc-apps-okular.svgz
similarity index 100%
rename from ui/data/icons/hisc-apps-okular.svgz
rename to icons/hisc-apps-okular.svgz
diff --git a/ui/data/icons/small/hi16-apps-okular.svgz b/icons/small/hi16-apps-okular.svgz
similarity index 100%
rename from ui/data/icons/small/hi16-apps-okular.svgz
rename to icons/small/hi16-apps-okular.svgz
diff --git a/ui/data/icons/small/hi22-apps-okular.svgz b/icons/small/hi22-apps-okular.svgz
similarity index 100%
rename from ui/data/icons/small/hi22-apps-okular.svgz
rename to icons/small/hi22-apps-okular.svgz
diff --git a/metainfo.yaml b/metainfo.yaml
index a68cdaafa..b2d449f4d 100644
--- a/metainfo.yaml
+++ b/metainfo.yaml
@@ -11,6 +11,6 @@ public_source_dirs:
         - core
         - interfaces
         - Mainpage.dox 
-logo: ui/data/icons/128-apps-okular.png
+logo: icons/128-apps-okular.png
 irc: okular
 mailinglist: okular-devel
diff --git a/mobile/components/CMakeLists.txt b/mobile/components/CMakeLists.txt
index ccad4c9fc..2da2f9d3c 100644
--- a/mobile/components/CMakeLists.txt
+++ b/mobile/components/CMakeLists.txt
@@ -10,10 +10,10 @@ include_directories(
 
 set(okular_SRCS
     okularplugin.cpp
-    ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp
-    ${CMAKE_SOURCE_DIR}/ui/tocmodel.cpp
-    ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp
-    ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp
+    ${CMAKE_SOURCE_DIR}/part/guiutils.cpp
+    ${CMAKE_SOURCE_DIR}/part/tocmodel.cpp
+    ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp
+    ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp
     pageitem.cpp
     documentitem.cpp
     thumbnailitem.cpp
diff --git a/mobile/components/documentitem.cpp b/mobile/components/documentitem.cpp
index 9b0da4d7c..b9fc842c9 100644
--- a/mobile/components/documentitem.cpp
+++ b/mobile/components/documentitem.cpp
@@ -31,7 +31,7 @@
 #include <core/document_p.h>
 #include <core/page.h>
 
-#include "ui/tocmodel.h"
+#include "part/tocmodel.h"
 
 DocumentItem::DocumentItem(QObject *parent)
     : QObject(parent)
diff --git a/mobile/components/pageitem.cpp b/mobile/components/pageitem.cpp
index b198c5e2c..1018f84a6 100644
--- a/mobile/components/pageitem.cpp
+++ b/mobile/components/pageitem.cpp
@@ -30,9 +30,9 @@
 #include <core/generator.h>
 #include <core/page.h>
 
+#include "part/pagepainter.h"
+#include "part/priorities.h"
 #include "settings.h"
-#include "ui/pagepainter.h"
-#include "ui/priorities.h"
 
 #define REDRAW_TIMEOUT 250
 
diff --git a/ui/CMakeLists.txt b/part/CMakeLists.txt
similarity index 100%
rename from ui/CMakeLists.txt
rename to part/CMakeLists.txt
diff --git a/ui/annotationactionhandler.cpp b/part/annotationactionhandler.cpp
similarity index 100%
rename from ui/annotationactionhandler.cpp
rename to part/annotationactionhandler.cpp
diff --git a/ui/annotationactionhandler.h b/part/annotationactionhandler.h
similarity index 100%
rename from ui/annotationactionhandler.h
rename to part/annotationactionhandler.h
diff --git a/ui/annotationmodel.cpp b/part/annotationmodel.cpp
similarity index 99%
rename from ui/annotationmodel.cpp
rename to part/annotationmodel.cpp
index dcdbefd1a..b587bf3af 100644
--- a/ui/annotationmodel.cpp
+++ b/part/annotationmodel.cpp
@@ -23,7 +23,7 @@
 #include "core/document.h"
 #include "core/observer.h"
 #include "core/page.h"
-#include "ui/guiutils.h"
+#include "guiutils.h"
 
 struct AnnItem {
     AnnItem();
diff --git a/ui/annotationmodel.h b/part/annotationmodel.h
similarity index 100%
rename from ui/annotationmodel.h
rename to part/annotationmodel.h
diff --git a/ui/annotationpopup.cpp b/part/annotationpopup.cpp
similarity index 100%
rename from ui/annotationpopup.cpp
rename to part/annotationpopup.cpp
diff --git a/ui/annotationpopup.h b/part/annotationpopup.h
similarity index 100%
rename from ui/annotationpopup.h
rename to part/annotationpopup.h
diff --git a/ui/annotationpropertiesdialog.cpp b/part/annotationpropertiesdialog.cpp
similarity index 100%
rename from ui/annotationpropertiesdialog.cpp
rename to part/annotationpropertiesdialog.cpp
diff --git a/ui/annotationpropertiesdialog.h b/part/annotationpropertiesdialog.h
similarity index 100%
rename from ui/annotationpropertiesdialog.h
rename to part/annotationpropertiesdialog.h
diff --git a/ui/annotationproxymodels.cpp b/part/annotationproxymodels.cpp
similarity index 100%
rename from ui/annotationproxymodels.cpp
rename to part/annotationproxymodels.cpp
diff --git a/ui/annotationproxymodels.h b/part/annotationproxymodels.h
similarity index 100%
rename from ui/annotationproxymodels.h
rename to part/annotationproxymodels.h
diff --git a/ui/annotationtools.cpp b/part/annotationtools.cpp
similarity index 100%
rename from ui/annotationtools.cpp
rename to part/annotationtools.cpp
diff --git a/ui/annotationtools.h b/part/annotationtools.h
similarity index 100%
rename from ui/annotationtools.h
rename to part/annotationtools.h
diff --git a/ui/annotationwidgets.cpp b/part/annotationwidgets.cpp
similarity index 100%
rename from ui/annotationwidgets.cpp
rename to part/annotationwidgets.cpp
diff --git a/ui/annotationwidgets.h b/part/annotationwidgets.h
similarity index 100%
rename from ui/annotationwidgets.h
rename to part/annotationwidgets.h
diff --git a/ui/annotwindow.cpp b/part/annotwindow.cpp
similarity index 100%
rename from ui/annotwindow.cpp
rename to part/annotwindow.cpp
diff --git a/ui/annotwindow.h b/part/annotwindow.h
similarity index 100%
rename from ui/annotwindow.h
rename to part/annotwindow.h
diff --git a/ui/bookmarklist.cpp b/part/bookmarklist.cpp
similarity index 100%
rename from ui/bookmarklist.cpp
rename to part/bookmarklist.cpp
diff --git a/ui/bookmarklist.h b/part/bookmarklist.h
similarity index 100%
rename from ui/bookmarklist.h
rename to part/bookmarklist.h
diff --git a/ui/certificateviewer.cpp b/part/certificateviewer.cpp
similarity index 100%
rename from ui/certificateviewer.cpp
rename to part/certificateviewer.cpp
diff --git a/ui/certificateviewer.h b/part/certificateviewer.h
similarity index 100%
rename from ui/certificateviewer.h
rename to part/certificateviewer.h
diff --git a/ui/data/CMakeLists.txt b/part/data/CMakeLists.txt
similarity index 93%
rename from ui/data/CMakeLists.txt
rename to part/data/CMakeLists.txt
index e1d810e97..17c092602 100644
--- a/ui/data/CMakeLists.txt
+++ b/part/data/CMakeLists.txt
@@ -1,6 +1,3 @@
-# an own directory for multi-size icons retrieved by KIconThemeLoader
-add_subdirectory(icons)
-
 # install annotator xml tools description
 install(FILES
    tools.xml
diff --git a/ui/data/README.Icons b/part/data/README.Icons
similarity index 100%
rename from ui/data/README.Icons
rename to part/data/README.Icons
diff --git a/ui/data/checkmark.png b/part/data/checkmark.png
similarity index 100%
rename from ui/data/checkmark.png
rename to part/data/checkmark.png
diff --git a/ui/data/circle.png b/part/data/circle.png
similarity index 100%
rename from ui/data/circle.png
rename to part/data/circle.png
diff --git a/ui/data/comment.png b/part/data/comment.png
similarity index 100%
rename from ui/data/comment.png
rename to part/data/comment.png
diff --git a/ui/data/cross.png b/part/data/cross.png
similarity index 100%
rename from ui/data/cross.png
rename to part/data/cross.png
diff --git a/ui/data/drawingtools.xml b/part/data/drawingtools.xml
similarity index 100%
rename from ui/data/drawingtools.xml
rename to part/data/drawingtools.xml
diff --git a/ui/data/help.png b/part/data/help.png
similarity index 100%
rename from ui/data/help.png
rename to part/data/help.png
diff --git a/ui/data/insert.png b/part/data/insert.png
similarity index 100%
rename from ui/data/insert.png
rename to part/data/insert.png
diff --git a/ui/data/key.png b/part/data/key.png
similarity index 100%
rename from ui/data/key.png
rename to part/data/key.png
diff --git a/ui/data/newparagraph.png b/part/data/newparagraph.png
similarity index 100%
rename from ui/data/newparagraph.png
rename to part/data/newparagraph.png
diff --git a/ui/data/note.png b/part/data/note.png
similarity index 100%
rename from ui/data/note.png
rename to part/data/note.png
diff --git a/ui/data/okular.knsrc b/part/data/okular.knsrc
similarity index 100%
rename from ui/data/okular.knsrc
rename to part/data/okular.knsrc
diff --git a/ui/data/paperclip.png b/part/data/paperclip.png
similarity index 100%
rename from ui/data/paperclip.png
rename to part/data/paperclip.png
diff --git a/ui/data/paragraph.png b/part/data/paragraph.png
similarity index 100%
rename from ui/data/paragraph.png
rename to part/data/paragraph.png
diff --git a/ui/data/pushpin.png b/part/data/pushpin.png
similarity index 100%
rename from ui/data/pushpin.png
rename to part/data/pushpin.png
diff --git a/ui/data/rightarrow.png b/part/data/rightarrow.png
similarity index 100%
rename from ui/data/rightarrow.png
rename to part/data/rightarrow.png
diff --git a/ui/data/rightpointer.png b/part/data/rightpointer.png
similarity index 100%
rename from ui/data/rightpointer.png
rename to part/data/rightpointer.png
diff --git a/ui/data/sources/checkmark.svgz b/part/data/sources/checkmark.svgz
similarity index 100%
rename from ui/data/sources/checkmark.svgz
rename to part/data/sources/checkmark.svgz
diff --git a/ui/data/sources/circle.svgz b/part/data/sources/circle.svgz
similarity index 100%
rename from ui/data/sources/circle.svgz
rename to part/data/sources/circle.svgz
diff --git a/ui/data/sources/comment.svgz b/part/data/sources/comment.svgz
similarity index 100%
rename from ui/data/sources/comment.svgz
rename to part/data/sources/comment.svgz
diff --git a/ui/data/sources/cross.svgz b/part/data/sources/cross.svgz
similarity index 100%
rename from ui/data/sources/cross.svgz
rename to part/data/sources/cross.svgz
diff --git a/ui/data/sources/ghns.svg b/part/data/sources/ghns.svg
similarity index 100%
rename from ui/data/sources/ghns.svg
rename to part/data/sources/ghns.svg
diff --git a/ui/data/sources/help.svgz b/part/data/sources/help.svgz
similarity index 100%
rename from ui/data/sources/help.svgz
rename to part/data/sources/help.svgz
diff --git a/ui/data/sources/insert.svgz b/part/data/sources/insert.svgz
similarity index 100%
rename from ui/data/sources/insert.svgz
rename to part/data/sources/insert.svgz
diff --git a/ui/data/sources/key.svgz b/part/data/sources/key.svgz
similarity index 100%
rename from ui/data/sources/key.svgz
rename to part/data/sources/key.svgz
diff --git a/ui/data/sources/newparagraph.svgz b/part/data/sources/newparagraph.svgz
similarity index 100%
rename from ui/data/sources/newparagraph.svgz
rename to part/data/sources/newparagraph.svgz
diff --git a/ui/data/sources/note.svgz b/part/data/sources/note.svgz
similarity index 100%
rename from ui/data/sources/note.svgz
rename to part/data/sources/note.svgz
diff --git a/ui/data/sources/paragraph.svgz b/part/data/sources/paragraph.svgz
similarity index 100%
rename from ui/data/sources/paragraph.svgz
rename to part/data/sources/paragraph.svgz
diff --git a/ui/data/sources/rightarrow.svgz b/part/data/sources/rightarrow.svgz
similarity index 100%
rename from ui/data/sources/rightarrow.svgz
rename to part/data/sources/rightarrow.svgz
diff --git a/ui/data/sources/rightpointer.svgz b/part/data/sources/rightpointer.svgz
similarity index 100%
rename from ui/data/sources/rightpointer.svgz
rename to part/data/sources/rightpointer.svgz
diff --git a/ui/data/sources/star.svgz b/part/data/sources/star.svgz
similarity index 100%
rename from ui/data/sources/star.svgz
rename to part/data/sources/star.svgz
diff --git a/ui/data/sources/tool-base-okular.svgz b/part/data/sources/tool-base-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-base-okular.svgz
rename to part/data/sources/tool-base-okular.svgz
diff --git a/ui/data/sources/tool-ellipse-okular.svgz b/part/data/sources/tool-ellipse-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-ellipse-okular.svgz
rename to part/data/sources/tool-ellipse-okular.svgz
diff --git a/ui/data/sources/tool-highlighter-okular-colorizable.svgz b/part/data/sources/tool-highlighter-okular-colorizable.svgz
similarity index 100%
rename from ui/data/sources/tool-highlighter-okular-colorizable.svgz
rename to part/data/sources/tool-highlighter-okular-colorizable.svgz
diff --git a/ui/data/sources/tool-highlighter-okular.svgz b/part/data/sources/tool-highlighter-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-highlighter-okular.svgz
rename to part/data/sources/tool-highlighter-okular.svgz
diff --git a/ui/data/sources/tool-ink-okular-colorizable.svgz b/part/data/sources/tool-ink-okular-colorizable.svgz
similarity index 100%
rename from ui/data/sources/tool-ink-okular-colorizable.svgz
rename to part/data/sources/tool-ink-okular-colorizable.svgz
diff --git a/ui/data/sources/tool-ink-okular.svgz b/part/data/sources/tool-ink-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-ink-okular.svgz
rename to part/data/sources/tool-ink-okular.svgz
diff --git a/ui/data/sources/tool-line-okular.svgz b/part/data/sources/tool-line-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-line-okular.svgz
rename to part/data/sources/tool-line-okular.svgz
diff --git a/ui/data/sources/tool-note-inline-okular-colorizable.svgz b/part/data/sources/tool-note-inline-okular-colorizable.svgz
similarity index 100%
rename from ui/data/sources/tool-note-inline-okular-colorizable.svgz
rename to part/data/sources/tool-note-inline-okular-colorizable.svgz
diff --git a/ui/data/sources/tool-note-inline-okular.svgz b/part/data/sources/tool-note-inline-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-note-inline-okular.svgz
rename to part/data/sources/tool-note-inline-okular.svgz
diff --git a/ui/data/sources/tool-note-okular-colorizable.svgz b/part/data/sources/tool-note-okular-colorizable.svgz
similarity index 100%
rename from ui/data/sources/tool-note-okular-colorizable.svgz
rename to part/data/sources/tool-note-okular-colorizable.svgz
diff --git a/ui/data/sources/tool-note-okular.svgz b/part/data/sources/tool-note-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-note-okular.svgz
rename to part/data/sources/tool-note-okular.svgz
diff --git a/ui/data/sources/tool-polygon-okular.svgz b/part/data/sources/tool-polygon-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-polygon-okular.svgz
rename to part/data/sources/tool-polygon-okular.svgz
diff --git a/ui/data/sources/tool-stamp-okular.svgz b/part/data/sources/tool-stamp-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-stamp-okular.svgz
rename to part/data/sources/tool-stamp-okular.svgz
diff --git a/ui/data/sources/tool-typewriter-okular-colorizable.svgz b/part/data/sources/tool-typewriter-okular-colorizable.svgz
similarity index 100%
rename from ui/data/sources/tool-typewriter-okular-colorizable.svgz
rename to part/data/sources/tool-typewriter-okular-colorizable.svgz
diff --git a/ui/data/sources/tool-underline-okular.svgz b/part/data/sources/tool-underline-okular.svgz
similarity index 100%
rename from ui/data/sources/tool-underline-okular.svgz
rename to part/data/sources/tool-underline-okular.svgz
diff --git a/ui/data/sources/uparrow.svgz b/part/data/sources/uparrow.svgz
similarity index 100%
rename from ui/data/sources/uparrow.svgz
rename to part/data/sources/uparrow.svgz
diff --git a/ui/data/sources/upleftarrow.svgz b/part/data/sources/upleftarrow.svgz
similarity index 100%
rename from ui/data/sources/upleftarrow.svgz
rename to part/data/sources/upleftarrow.svgz
diff --git a/ui/data/stamps.svg b/part/data/stamps.svg
similarity index 100%
rename from ui/data/stamps.svg
rename to part/data/stamps.svg
diff --git a/ui/data/star.png b/part/data/star.png
similarity index 100%
rename from ui/data/star.png
rename to part/data/star.png
diff --git a/ui/data/tool-base-okular.png b/part/data/tool-base-okular.png
similarity index 100%
rename from ui/data/tool-base-okular.png
rename to part/data/tool-base-okular.png
diff --git a/ui/data/tool-base-okular@2x.png b/part/data/tool-base-okular@2x.png
similarity index 100%
rename from ui/data/tool-base-okular@2x.png
rename to part/data/tool-base-okular@2x.png
diff --git a/ui/data/tool-highlighter-okular-colorizable.png b/part/data/tool-highlighter-okular-colorizable.png
similarity index 100%
rename from ui/data/tool-highlighter-okular-colorizable.png
rename to part/data/tool-highlighter-okular-colorizable.png
diff --git a/ui/data/tool-highlighter-okular-colorizable@2x.png b/part/data/tool-highlighter-okular-colorizable@2x.png
similarity index 100%
rename from ui/data/tool-highlighter-okular-colorizable@2x.png
rename to part/data/tool-highlighter-okular-colorizable@2x.png
diff --git a/ui/data/tool-ink-okular-colorizable.png b/part/data/tool-ink-okular-colorizable.png
similarity index 100%
rename from ui/data/tool-ink-okular-colorizable.png
rename to part/data/tool-ink-okular-colorizable.png
diff --git a/ui/data/tool-ink-okular-colorizable@2x.png b/part/data/tool-ink-okular-colorizable@2x.png
similarity index 100%
rename from ui/data/tool-ink-okular-colorizable@2x.png
rename to part/data/tool-ink-okular-colorizable@2x.png
diff --git a/ui/data/tool-note-inline-okular-colorizable.png b/part/data/tool-note-inline-okular-colorizable.png
similarity index 100%
rename from ui/data/tool-note-inline-okular-colorizable.png
rename to part/data/tool-note-inline-okular-colorizable.png
diff --git a/ui/data/tool-note-inline-okular-colorizable@2x.png b/part/data/tool-note-inline-okular-colorizable@2x.png
similarity index 100%
rename from ui/data/tool-note-inline-okular-colorizable@2x.png
rename to part/data/tool-note-inline-okular-colorizable@2x.png
diff --git a/ui/data/tool-note-inline.png b/part/data/tool-note-inline.png
similarity index 100%
rename from ui/data/tool-note-inline.png
rename to part/data/tool-note-inline.png
diff --git a/ui/data/tool-note-okular-colorizable.png b/part/data/tool-note-okular-colorizable.png
similarity index 100%
rename from ui/data/tool-note-okular-colorizable.png
rename to part/data/tool-note-okular-colorizable.png
diff --git a/ui/data/tool-note-okular-colorizable@2x.png b/part/data/tool-note-okular-colorizable@2x.png
similarity index 100%
rename from ui/data/tool-note-okular-colorizable@2x.png
rename to part/data/tool-note-okular-colorizable@2x.png
diff --git a/ui/data/tool-note.png b/part/data/tool-note.png
similarity index 100%
rename from ui/data/tool-note.png
rename to part/data/tool-note.png
diff --git a/ui/data/tool-typewriter-okular-colorizable.png b/part/data/tool-typewriter-okular-colorizable.png
similarity index 100%
rename from ui/data/tool-typewriter-okular-colorizable.png
rename to part/data/tool-typewriter-okular-colorizable.png
diff --git a/ui/data/tool-typewriter-okular-colorizable@2x.png b/part/data/tool-typewriter-okular-colorizable@2x.png
similarity index 100%
rename from ui/data/tool-typewriter-okular-colorizable@2x.png
rename to part/data/tool-typewriter-okular-colorizable@2x.png
diff --git a/ui/data/tool_hl_orange.png b/part/data/tool_hl_orange.png
similarity index 100%
rename from ui/data/tool_hl_orange.png
rename to part/data/tool_hl_orange.png
diff --git a/ui/data/tool_hl_pink.png b/part/data/tool_hl_pink.png
similarity index 100%
rename from ui/data/tool_hl_pink.png
rename to part/data/tool_hl_pink.png
diff --git a/ui/data/tool_hl_yellow.png b/part/data/tool_hl_yellow.png
similarity index 100%
rename from ui/data/tool_hl_yellow.png
rename to part/data/tool_hl_yellow.png
diff --git a/ui/data/tool_ink_green.png b/part/data/tool_ink_green.png
similarity index 100%
rename from ui/data/tool_ink_green.png
rename to part/data/tool_ink_green.png
diff --git a/ui/data/tool_note.png b/part/data/tool_note.png
similarity index 100%
rename from ui/data/tool_note.png
rename to part/data/tool_note.png
diff --git a/ui/data/tools.xml b/part/data/tools.xml
similarity index 100%
rename from ui/data/tools.xml
rename to part/data/tools.xml
diff --git a/ui/data/toolsQuick.xml b/part/data/toolsQuick.xml
similarity index 100%
rename from ui/data/toolsQuick.xml
rename to part/data/toolsQuick.xml
diff --git a/ui/data/uparrow.png b/part/data/uparrow.png
similarity index 100%
rename from ui/data/uparrow.png
rename to part/data/uparrow.png
diff --git a/ui/data/upleftarrow.png b/part/data/upleftarrow.png
similarity index 100%
rename from ui/data/upleftarrow.png
rename to part/data/upleftarrow.png
diff --git a/ui/debug_ui.cpp b/part/debug_ui.cpp
similarity index 100%
rename from ui/debug_ui.cpp
rename to part/debug_ui.cpp
diff --git a/ui/debug_ui.h b/part/debug_ui.h
similarity index 100%
rename from ui/debug_ui.h
rename to part/debug_ui.h
diff --git a/conf/dlgaccessibility.cpp b/part/dlgaccessibility.cpp
similarity index 100%
rename from conf/dlgaccessibility.cpp
rename to part/dlgaccessibility.cpp
diff --git a/conf/dlgaccessibility.h b/part/dlgaccessibility.h
similarity index 100%
rename from conf/dlgaccessibility.h
rename to part/dlgaccessibility.h
diff --git a/conf/dlgaccessibilitybase.ui b/part/dlgaccessibilitybase.ui
similarity index 100%
rename from conf/dlgaccessibilitybase.ui
rename to part/dlgaccessibilitybase.ui
diff --git a/conf/dlgannotations.cpp b/part/dlgannotations.cpp
similarity index 100%
rename from conf/dlgannotations.cpp
rename to part/dlgannotations.cpp
diff --git a/conf/dlgannotations.h b/part/dlgannotations.h
similarity index 100%
rename from conf/dlgannotations.h
rename to part/dlgannotations.h
diff --git a/conf/dlgannotationsbase.ui b/part/dlgannotationsbase.ui
similarity index 100%
rename from conf/dlgannotationsbase.ui
rename to part/dlgannotationsbase.ui
diff --git a/conf/dlgdebug.cpp b/part/dlgdebug.cpp
similarity index 100%
rename from conf/dlgdebug.cpp
rename to part/dlgdebug.cpp
diff --git a/conf/dlgdebug.h b/part/dlgdebug.h
similarity index 100%
rename from conf/dlgdebug.h
rename to part/dlgdebug.h
diff --git a/conf/dlgeditor.cpp b/part/dlgeditor.cpp
similarity index 100%
rename from conf/dlgeditor.cpp
rename to part/dlgeditor.cpp
diff --git a/conf/dlgeditor.h b/part/dlgeditor.h
similarity index 100%
rename from conf/dlgeditor.h
rename to part/dlgeditor.h
diff --git a/conf/dlgeditorbase.ui b/part/dlgeditorbase.ui
similarity index 100%
rename from conf/dlgeditorbase.ui
rename to part/dlgeditorbase.ui
diff --git a/conf/dlggeneral.cpp b/part/dlggeneral.cpp
similarity index 100%
rename from conf/dlggeneral.cpp
rename to part/dlggeneral.cpp
diff --git a/conf/dlggeneral.h b/part/dlggeneral.h
similarity index 100%
rename from conf/dlggeneral.h
rename to part/dlggeneral.h
diff --git a/conf/dlggeneralbase.ui b/part/dlggeneralbase.ui
similarity index 100%
rename from conf/dlggeneralbase.ui
rename to part/dlggeneralbase.ui
diff --git a/conf/dlgperformance.cpp b/part/dlgperformance.cpp
similarity index 100%
rename from conf/dlgperformance.cpp
rename to part/dlgperformance.cpp
diff --git a/conf/dlgperformance.h b/part/dlgperformance.h
similarity index 100%
rename from conf/dlgperformance.h
rename to part/dlgperformance.h
diff --git a/conf/dlgperformancebase.ui b/part/dlgperformancebase.ui
similarity index 100%
rename from conf/dlgperformancebase.ui
rename to part/dlgperformancebase.ui
diff --git a/conf/dlgpresentation.cpp b/part/dlgpresentation.cpp
similarity index 100%
rename from conf/dlgpresentation.cpp
rename to part/dlgpresentation.cpp
diff --git a/conf/dlgpresentation.h b/part/dlgpresentation.h
similarity index 100%
rename from conf/dlgpresentation.h
rename to part/dlgpresentation.h
diff --git a/conf/dlgpresentationbase.ui b/part/dlgpresentationbase.ui
similarity index 100%
rename from conf/dlgpresentationbase.ui
rename to part/dlgpresentationbase.ui
diff --git a/ui/drawingtoolactions.cpp b/part/drawingtoolactions.cpp
similarity index 100%
rename from ui/drawingtoolactions.cpp
rename to part/drawingtoolactions.cpp
diff --git a/ui/drawingtoolactions.h b/part/drawingtoolactions.h
similarity index 100%
rename from ui/drawingtoolactions.h
rename to part/drawingtoolactions.h
diff --git a/conf/editannottooldialog.cpp b/part/editannottooldialog.cpp
similarity index 99%
rename from conf/editannottooldialog.cpp
rename to part/editannottooldialog.cpp
index 80f2ce491..1ef262d2c 100644
--- a/conf/editannottooldialog.cpp
+++ b/part/editannottooldialog.cpp
@@ -28,9 +28,9 @@
 #include <QStackedWidget>
 #include <QVBoxLayout>
 
+#include "annotationwidgets.h"
 #include "core/annotations.h"
-#include "ui/annotationwidgets.h"
-#include "ui/pageviewannotator.h"
+#include "pageviewannotator.h"
 
 EditAnnotToolDialog::EditAnnotToolDialog(QWidget *parent, const QDomElement &initialState, bool builtinTool)
     : QDialog(parent)
diff --git a/conf/editannottooldialog.h b/part/editannottooldialog.h
similarity index 100%
rename from conf/editannottooldialog.h
rename to part/editannottooldialog.h
diff --git a/conf/editdrawingtooldialog.cpp b/part/editdrawingtooldialog.cpp
similarity index 100%
rename from conf/editdrawingtooldialog.cpp
rename to part/editdrawingtooldialog.cpp
diff --git a/conf/editdrawingtooldialog.h b/part/editdrawingtooldialog.h
similarity index 100%
rename from conf/editdrawingtooldialog.h
rename to part/editdrawingtooldialog.h
diff --git a/ui/embeddedfilesdialog.cpp b/part/embeddedfilesdialog.cpp
similarity index 100%
rename from ui/embeddedfilesdialog.cpp
rename to part/embeddedfilesdialog.cpp
diff --git a/ui/embeddedfilesdialog.h b/part/embeddedfilesdialog.h
similarity index 100%
rename from ui/embeddedfilesdialog.h
rename to part/embeddedfilesdialog.h
diff --git a/extensions.cpp b/part/extensions.cpp
similarity index 100%
rename from extensions.cpp
rename to part/extensions.cpp
diff --git a/extensions.h b/part/extensions.h
similarity index 100%
rename from extensions.h
rename to part/extensions.h
diff --git a/ui/fileprinterpreview.cpp b/part/fileprinterpreview.cpp
similarity index 100%
rename from ui/fileprinterpreview.cpp
rename to part/fileprinterpreview.cpp
diff --git a/ui/fileprinterpreview.h b/part/fileprinterpreview.h
similarity index 100%
rename from ui/fileprinterpreview.h
rename to part/fileprinterpreview.h
diff --git a/ui/findbar.cpp b/part/findbar.cpp
similarity index 100%
rename from ui/findbar.cpp
rename to part/findbar.cpp
diff --git a/ui/findbar.h b/part/findbar.h
similarity index 100%
rename from ui/findbar.h
rename to part/findbar.h
diff --git a/ui/formwidgets.cpp b/part/formwidgets.cpp
similarity index 100%
rename from ui/formwidgets.cpp
rename to part/formwidgets.cpp
diff --git a/ui/formwidgets.h b/part/formwidgets.h
similarity index 100%
rename from ui/formwidgets.h
rename to part/formwidgets.h
diff --git a/ui/guiutils.cpp b/part/guiutils.cpp
similarity index 100%
rename from ui/guiutils.cpp
rename to part/guiutils.cpp
diff --git a/ui/guiutils.h b/part/guiutils.h
similarity index 100%
rename from ui/guiutils.h
rename to part/guiutils.h
diff --git a/ui/ktreeviewsearchline.cpp b/part/ktreeviewsearchline.cpp
similarity index 100%
rename from ui/ktreeviewsearchline.cpp
rename to part/ktreeviewsearchline.cpp
diff --git a/ui/ktreeviewsearchline.h b/part/ktreeviewsearchline.h
similarity index 100%
rename from ui/ktreeviewsearchline.h
rename to part/ktreeviewsearchline.h
diff --git a/ui/latexrenderer.cpp b/part/latexrenderer.cpp
similarity index 100%
rename from ui/latexrenderer.cpp
rename to part/latexrenderer.cpp
diff --git a/ui/latexrenderer.h b/part/latexrenderer.h
similarity index 100%
rename from ui/latexrenderer.h
rename to part/latexrenderer.h
diff --git a/ui/layers.cpp b/part/layers.cpp
similarity index 99%
rename from ui/layers.cpp
rename to part/layers.cpp
index 7c287e407..e58d7a057 100644
--- a/ui/layers.cpp
+++ b/part/layers.cpp
@@ -22,7 +22,7 @@
 // local includes
 #include "core/document.h"
 #include "ktreeviewsearchline.h"
-#include "ui/pageview.h"
+#include "pageview.h"
 
 Layers::Layers(QWidget *parent, Okular::Document *document)
     : QWidget(parent)
diff --git a/ui/layers.h b/part/layers.h
similarity index 100%
rename from ui/layers.h
rename to part/layers.h
diff --git a/ui/magnifierview.cpp b/part/magnifierview.cpp
similarity index 100%
rename from ui/magnifierview.cpp
rename to part/magnifierview.cpp
diff --git a/ui/magnifierview.h b/part/magnifierview.h
similarity index 100%
rename from ui/magnifierview.h
rename to part/magnifierview.h
diff --git a/ui/minibar.cpp b/part/minibar.cpp
similarity index 100%
rename from ui/minibar.cpp
rename to part/minibar.cpp
diff --git a/ui/minibar.h b/part/minibar.h
similarity index 100%
rename from ui/minibar.h
rename to part/minibar.h
diff --git a/ui/okmenutitle.cpp b/part/okmenutitle.cpp
similarity index 100%
rename from ui/okmenutitle.cpp
rename to part/okmenutitle.cpp
diff --git a/ui/okmenutitle.h b/part/okmenutitle.h
similarity index 100%
rename from ui/okmenutitle.h
rename to part/okmenutitle.h
diff --git a/ui/pageitemdelegate.cpp b/part/pageitemdelegate.cpp
similarity index 100%
rename from ui/pageitemdelegate.cpp
rename to part/pageitemdelegate.cpp
diff --git a/ui/pageitemdelegate.h b/part/pageitemdelegate.h
similarity index 100%
rename from ui/pageitemdelegate.h
rename to part/pageitemdelegate.h
diff --git a/ui/pagepainter.cpp b/part/pagepainter.cpp
similarity index 99%
rename from ui/pagepainter.cpp
rename to part/pagepainter.cpp
index 71c8bdfd0..499d9176d 100644
--- a/ui/pagepainter.cpp
+++ b/part/pagepainter.cpp
@@ -30,10 +30,10 @@
 #include "core/page_p.h"
 #include "core/tile.h"
 #include "core/utils.h"
+#include "debug_ui.h"
 #include "guiutils.h"
 #include "settings.h"
 #include "settings_core.h"
-#include "ui/debug_ui.h"
 
 Q_GLOBAL_STATIC_WITH_ARGS(QPixmap, busyPixmap, (KIconLoader::global()->loadIcon(QLatin1String("okular"), KIconLoader::NoGroup, KIconLoader::SizeLarge, KIconLoader::DefaultState, QStringList(), nullptr, true)))
 
diff --git a/ui/pagepainter.h b/part/pagepainter.h
similarity index 100%
rename from ui/pagepainter.h
rename to part/pagepainter.h
diff --git a/ui/pagesizelabel.cpp b/part/pagesizelabel.cpp
similarity index 100%
rename from ui/pagesizelabel.cpp
rename to part/pagesizelabel.cpp
diff --git a/ui/pagesizelabel.h b/part/pagesizelabel.h
similarity index 100%
rename from ui/pagesizelabel.h
rename to part/pagesizelabel.h
diff --git a/ui/pageview.cpp b/part/pageview.cpp
similarity index 100%
rename from ui/pageview.cpp
rename to part/pageview.cpp
diff --git a/ui/pageview.h b/part/pageview.h
similarity index 99%
rename from ui/pageview.h
rename to part/pageview.h
index 0fd55b7aa..e836ef88f 100644
--- a/ui/pageview.h
+++ b/part/pageview.h
@@ -25,7 +25,7 @@
 #include "core/area.h"
 #include "core/observer.h"
 #include "core/view.h"
-#include "ui/pageviewutils.h"
+#include "pageviewutils.h"
 #include <QAbstractScrollArea>
 #include <QList>
 #include <QVector>
diff --git a/ui/pageviewannotator.cpp b/part/pageviewannotator.cpp
similarity index 99%
rename from ui/pageviewannotator.cpp
rename to part/pageviewannotator.cpp
index 3b37ec58a..fe09bda12 100644
--- a/ui/pageviewannotator.cpp
+++ b/part/pageviewannotator.cpp
@@ -35,16 +35,16 @@
 #include <memory>
 
 // local includes
-#include "conf/editannottooldialog.h"
+#include "annotationactionhandler.h"
 #include "core/annotations.h"
 #include "core/area.h"
 #include "core/document.h"
 #include "core/page.h"
 #include "debug_ui.h"
+#include "editannottooldialog.h"
 #include "guiutils.h"
 #include "pageview.h"
 #include "settings.h"
-#include "ui/annotationactionhandler.h"
 
 /** @short PickPointEngine */
 class PickPointEngine : public AnnotatorEngine
diff --git a/ui/pageviewannotator.h b/part/pageviewannotator.h
similarity index 100%
rename from ui/pageviewannotator.h
rename to part/pageviewannotator.h
diff --git a/ui/pageviewmouseannotation.cpp b/part/pageviewmouseannotation.cpp
similarity index 99%
rename from ui/pageviewmouseannotation.cpp
rename to part/pageviewmouseannotation.cpp
index 5928336e2..9bb9837a8 100644
--- a/ui/pageviewmouseannotation.cpp
+++ b/part/pageviewmouseannotation.cpp
@@ -29,9 +29,9 @@
 
 #include "core/document.h"
 #include "core/page.h"
-#include "ui/guiutils.h"
-#include "ui/pageview.h"
-#include "ui/videowidget.h"
+#include "guiutils.h"
+#include "pageview.h"
+#include "videowidget.h"
 
 static const int handleSize = 10;
 static const int handleSizeHalf = handleSize / 2;
diff --git a/ui/pageviewmouseannotation.h b/part/pageviewmouseannotation.h
similarity index 100%
rename from ui/pageviewmouseannotation.h
rename to part/pageviewmouseannotation.h
diff --git a/ui/pageviewutils.cpp b/part/pageviewutils.cpp
similarity index 100%
rename from ui/pageviewutils.cpp
rename to part/pageviewutils.cpp
diff --git a/ui/pageviewutils.h b/part/pageviewutils.h
similarity index 100%
rename from ui/pageviewutils.h
rename to part/pageviewutils.h
diff --git a/part-viewermode.rc b/part/part-viewermode.rc
similarity index 100%
rename from part-viewermode.rc
rename to part/part-viewermode.rc
diff --git a/part.cpp b/part/part.cpp
similarity index 99%
rename from part.cpp
rename to part/part.cpp
index a84d1b0e1..9570c6393 100644
--- a/part.cpp
+++ b/part/part.cpp
@@ -83,7 +83,7 @@
 
 // local includes
 #include "aboutdata.h"
-#include "conf/preferencesdialog.h"
+#include "bookmarklist.h"
 #include "core/action.h"
 #include "core/annotations.h"
 #include "core/bookmarkmanager.h"
@@ -93,29 +93,29 @@
 #include "core/generator.h"
 #include "core/page.h"
 #include "core/printoptionswidget.h"
+#include "debug_ui.h"
+#include "drawingtoolactions.h"
+#include "embeddedfilesdialog.h"
 #include "extensions.h"
+#include "fileprinterpreview.h"
+#include "findbar.h"
+#include "guiutils.h"
+#include "layers.h"
+#include "minibar.h"
+#include "okmenutitle.h"
+#include "pagesizelabel.h"
+#include "pageview.h"
+#include "preferencesdialog.h"
+#include "presentationwidget.h"
+#include "propertiesdialog.h"
+#include "searchwidget.h"
 #include "settings.h"
-#include "ui/bookmarklist.h"
-#include "ui/debug_ui.h"
-#include "ui/drawingtoolactions.h"
-#include "ui/embeddedfilesdialog.h"
-#include "ui/fileprinterpreview.h"
-#include "ui/findbar.h"
-#include "ui/guiutils.h"
-#include "ui/layers.h"
-#include "ui/minibar.h"
-#include "ui/okmenutitle.h"
-#include "ui/pagesizelabel.h"
-#include "ui/pageview.h"
-#include "ui/presentationwidget.h"
-#include "ui/propertiesdialog.h"
-#include "ui/searchwidget.h"
-#include "ui/side_reviews.h"
-#include "ui/sidebar.h"
-#include "ui/signatureguiutils.h"
-#include "ui/signaturepanel.h"
-#include "ui/thumbnaillist.h"
-#include "ui/toc.h"
+#include "side_reviews.h"
+#include "sidebar.h"
+#include "signatureguiutils.h"
+#include "signaturepanel.h"
+#include "thumbnaillist.h"
+#include "toc.h"
 #include "xmlgui_helper.h"
 #include <memory>
 
diff --git a/part.h b/part/part.h
similarity index 99%
rename from part.h
rename to part/part.h
index 54ab40020..8b3b474cd 100644
--- a/part.h
+++ b/part/part.h
@@ -32,10 +32,10 @@
 #include <KParts/ReadWritePart>
 #include <KPluginFactory>
 
-#include "core/document.h"
-#include "core/observer.h"
-#include "interfaces/viewerinterface.h"
-#include "kdocumentviewer.h"
+#include "../core/document.h"
+#include "../core/observer.h"
+#include "../interfaces/viewerinterface.h"
+#include "../kdocumentviewer.h"
 
 #include "okularpart_export.h"
 
diff --git a/part.rc b/part/part.rc
similarity index 100%
rename from part.rc
rename to part/part.rc
diff --git a/conf/preferencesdialog.cpp b/part/preferencesdialog.cpp
similarity index 100%
rename from conf/preferencesdialog.cpp
rename to part/preferencesdialog.cpp
diff --git a/conf/preferencesdialog.h b/part/preferencesdialog.h
similarity index 100%
rename from conf/preferencesdialog.h
rename to part/preferencesdialog.h
diff --git a/ui/presentationsearchbar.cpp b/part/presentationsearchbar.cpp
similarity index 100%
rename from ui/presentationsearchbar.cpp
rename to part/presentationsearchbar.cpp
diff --git a/ui/presentationsearchbar.h b/part/presentationsearchbar.h
similarity index 100%
rename from ui/presentationsearchbar.h
rename to part/presentationsearchbar.h
diff --git a/ui/presentationwidget.cpp b/part/presentationwidget.cpp
similarity index 100%
rename from ui/presentationwidget.cpp
rename to part/presentationwidget.cpp
diff --git a/ui/presentationwidget.h b/part/presentationwidget.h
similarity index 100%
rename from ui/presentationwidget.h
rename to part/presentationwidget.h
diff --git a/ui/priorities.h b/part/priorities.h
similarity index 100%
rename from ui/priorities.h
rename to part/priorities.h
diff --git a/ui/propertiesdialog.cpp b/part/propertiesdialog.cpp
similarity index 100%
rename from ui/propertiesdialog.cpp
rename to part/propertiesdialog.cpp
diff --git a/ui/propertiesdialog.h b/part/propertiesdialog.h
similarity index 100%
rename from ui/propertiesdialog.h
rename to part/propertiesdialog.h
diff --git a/ui/revisionviewer.cpp b/part/revisionviewer.cpp
similarity index 100%
rename from ui/revisionviewer.cpp
rename to part/revisionviewer.cpp
diff --git a/ui/revisionviewer.h b/part/revisionviewer.h
similarity index 100%
rename from ui/revisionviewer.h
rename to part/revisionviewer.h
diff --git a/ui/searchlineedit.cpp b/part/searchlineedit.cpp
similarity index 100%
rename from ui/searchlineedit.cpp
rename to part/searchlineedit.cpp
diff --git a/ui/searchlineedit.h b/part/searchlineedit.h
similarity index 100%
rename from ui/searchlineedit.h
rename to part/searchlineedit.h
diff --git a/ui/searchwidget.cpp b/part/searchwidget.cpp
similarity index 100%
rename from ui/searchwidget.cpp
rename to part/searchwidget.cpp
diff --git a/ui/searchwidget.h b/part/searchwidget.h
similarity index 100%
rename from ui/searchwidget.h
rename to part/searchwidget.h
diff --git a/ui/side_reviews.cpp b/part/side_reviews.cpp
similarity index 100%
rename from ui/side_reviews.cpp
rename to part/side_reviews.cpp
diff --git a/ui/side_reviews.h b/part/side_reviews.h
similarity index 100%
rename from ui/side_reviews.h
rename to part/side_reviews.h
diff --git a/ui/sidebar.cpp b/part/sidebar.cpp
similarity index 100%
rename from ui/sidebar.cpp
rename to part/sidebar.cpp
diff --git a/ui/sidebar.h b/part/sidebar.h
similarity index 100%
rename from ui/sidebar.h
rename to part/sidebar.h
diff --git a/ui/signatureguiutils.cpp b/part/signatureguiutils.cpp
similarity index 100%
rename from ui/signatureguiutils.cpp
rename to part/signatureguiutils.cpp
diff --git a/ui/signatureguiutils.h b/part/signatureguiutils.h
similarity index 100%
rename from ui/signatureguiutils.h
rename to part/signatureguiutils.h
diff --git a/ui/signaturemodel.cpp b/part/signaturemodel.cpp
similarity index 100%
rename from ui/signaturemodel.cpp
rename to part/signaturemodel.cpp
diff --git a/ui/signaturemodel.h b/part/signaturemodel.h
similarity index 100%
rename from ui/signaturemodel.h
rename to part/signaturemodel.h
diff --git a/ui/signaturepanel.cpp b/part/signaturepanel.cpp
similarity index 100%
rename from ui/signaturepanel.cpp
rename to part/signaturepanel.cpp
diff --git a/ui/signaturepanel.h b/part/signaturepanel.h
similarity index 100%
rename from ui/signaturepanel.h
rename to part/signaturepanel.h
diff --git a/ui/signaturepropertiesdialog.cpp b/part/signaturepropertiesdialog.cpp
similarity index 100%
rename from ui/signaturepropertiesdialog.cpp
rename to part/signaturepropertiesdialog.cpp
diff --git a/ui/signaturepropertiesdialog.h b/part/signaturepropertiesdialog.h
similarity index 100%
rename from ui/signaturepropertiesdialog.h
rename to part/signaturepropertiesdialog.h
diff --git a/ui/snapshottaker.cpp b/part/snapshottaker.cpp
similarity index 100%
rename from ui/snapshottaker.cpp
rename to part/snapshottaker.cpp
diff --git a/ui/snapshottaker.h b/part/snapshottaker.h
similarity index 100%
rename from ui/snapshottaker.h
rename to part/snapshottaker.h
diff --git a/conf/textdocumentsettings.ui b/part/textdocumentsettings.ui
similarity index 100%
rename from conf/textdocumentsettings.ui
rename to part/textdocumentsettings.ui
diff --git a/ui/thumbnaillist.cpp b/part/thumbnaillist.cpp
similarity index 100%
rename from ui/thumbnaillist.cpp
rename to part/thumbnaillist.cpp
diff --git a/ui/thumbnaillist.h b/part/thumbnaillist.h
similarity index 100%
rename from ui/thumbnaillist.h
rename to part/thumbnaillist.h
diff --git a/ui/toc.cpp b/part/toc.cpp
similarity index 100%
rename from ui/toc.cpp
rename to part/toc.cpp
diff --git a/ui/toc.h b/part/toc.h
similarity index 100%
rename from ui/toc.h
rename to part/toc.h
diff --git a/ui/tocmodel.cpp b/part/tocmodel.cpp
similarity index 100%
rename from ui/tocmodel.cpp
rename to part/tocmodel.cpp
diff --git a/ui/tocmodel.h b/part/tocmodel.h
similarity index 100%
rename from ui/tocmodel.h
rename to part/tocmodel.h
diff --git a/ui/toggleactionmenu.cpp b/part/toggleactionmenu.cpp
similarity index 100%
rename from ui/toggleactionmenu.cpp
rename to part/toggleactionmenu.cpp
diff --git a/ui/toggleactionmenu.h b/part/toggleactionmenu.h
similarity index 100%
rename from ui/toggleactionmenu.h
rename to part/toggleactionmenu.h
diff --git a/ui/tts.cpp b/part/tts.cpp
similarity index 100%
rename from ui/tts.cpp
rename to part/tts.cpp
diff --git a/ui/tts.h b/part/tts.h
similarity index 100%
rename from ui/tts.h
rename to part/tts.h
diff --git a/ui/url_utils.h b/part/url_utils.h
similarity index 100%
rename from ui/url_utils.h
rename to part/url_utils.h
diff --git a/ui/videowidget.cpp b/part/videowidget.cpp
similarity index 100%
rename from ui/videowidget.cpp
rename to part/videowidget.cpp
diff --git a/ui/videowidget.h b/part/videowidget.h
similarity index 100%
rename from ui/videowidget.h
rename to part/videowidget.h
diff --git a/conf/widgetannottools.cpp b/part/widgetannottools.cpp
similarity index 99%
rename from conf/widgetannottools.cpp
rename to part/widgetannottools.cpp
index 31aa81368..5dfb55dd2 100644
--- a/conf/widgetannottools.cpp
+++ b/part/widgetannottools.cpp
@@ -24,7 +24,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "ui/pageviewannotator.h"
+#include "pageviewannotator.h"
 
 // Used to store tools' XML description in m_list's items
 static const int ToolXmlRole = Qt::UserRole;
diff --git a/conf/widgetannottools.h b/part/widgetannottools.h
similarity index 100%
rename from conf/widgetannottools.h
rename to part/widgetannottools.h
diff --git a/conf/widgetconfigurationtoolsbase.cpp b/part/widgetconfigurationtoolsbase.cpp
similarity index 100%
rename from conf/widgetconfigurationtoolsbase.cpp
rename to part/widgetconfigurationtoolsbase.cpp
diff --git a/conf/widgetconfigurationtoolsbase.h b/part/widgetconfigurationtoolsbase.h
similarity index 100%
rename from conf/widgetconfigurationtoolsbase.h
rename to part/widgetconfigurationtoolsbase.h
diff --git a/conf/widgetdrawingtools.cpp b/part/widgetdrawingtools.cpp
similarity index 100%
rename from conf/widgetdrawingtools.cpp
rename to part/widgetdrawingtools.cpp
diff --git a/conf/widgetdrawingtools.h b/part/widgetdrawingtools.h
similarity index 100%
rename from conf/widgetdrawingtools.h
rename to part/widgetdrawingtools.h
diff --git a/xmlgui_helper.cpp b/part/xmlgui_helper.cpp
similarity index 100%
rename from xmlgui_helper.cpp
rename to part/xmlgui_helper.cpp
diff --git a/xmlgui_helper.h b/part/xmlgui_helper.h
similarity index 100%
rename from xmlgui_helper.h
rename to part/xmlgui_helper.h
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 628f74be1..c73de5760 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -13,7 +13,7 @@ set(okular_SRCS
    shellutils.cpp
 )
 
-file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/data/icons/*-apps-okular.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/*-apps-okular.png")
 ecm_add_app_icon(okular_SRCS ICONS ${ICONS_SRCS})
 
 add_executable(okular ${okular_SRCS})