diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50c67b0..ad6d478 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,115 +1 @@
-
-set(kitemmodels_SRCS
-  kbreadcrumbselectionmodel.cpp
-  kcheckableproxymodel.cpp
-  kconcatenaterowsproxymodel.cpp
-  kdescendantsproxymodel.cpp
-  kextracolumnsproxymodel.cpp
-  klinkitemselectionmodel.cpp
-  kmodelindexproxymapper.cpp
-  krearrangecolumnsproxymodel.cpp
-  krecursivefilterproxymodel.cpp
-  kselectionproxymodel.cpp
-)
-
-ecm_qt_declare_logging_category(kitemmodels_SRCS HEADER kitemmodels_debug.h IDENTIFIER KITEMMODELS_LOG CATEGORY_NAME kf5.kitemmodels)
-
-add_library(KF5ItemModels ${kitemmodels_SRCS})
-add_library(KF5::ItemModels ALIAS KF5ItemModels)
-ecm_generate_export_header(KF5ItemModels
-    BASE_NAME KItemModels
-    GROUP_BASE_NAME KF
-    VERSION ${KF5_VERSION}
-    DEPRECATED_BASE_VERSION 0
-    DEPRECATION_VERSIONS 4.8
-    EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT}
-)
-# reminder trigger to apply KITEMMODELS_ENABLE_DEPRECATED_SINCE & friends to KConcatenateRowsProxyModel when the time is there
-if (REQUIRED_QT_VERSION VERSION_GREATER 5.12.0)
-    message(WARNING "With Qt 5.13 as min dep, mark KConcatenateRowsProxyModel as deprecated to the compiler & remove this warning")
-endif()
-
-
-target_include_directories(KF5ItemModels INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KItemModels>")
-
-target_link_libraries(KF5ItemModels PUBLIC Qt5::Core)
-
-set_target_properties(KF5ItemModels PROPERTIES VERSION   ${KITEMMODELS_VERSION_STRING}
-                                               SOVERSION ${KITEMMODELS_SOVERSION}
-                                               EXPORT_NAME ItemModels
-)
-
-ecm_generate_headers(KItemModels_HEADERS
-  HEADER_NAMES
-  KBreadcrumbSelectionModel
-  KConcatenateRowsProxyModel
-  KCheckableProxyModel
-  KExtraColumnsProxyModel
-  KLinkItemSelectionModel
-  KRearrangeColumnsProxyModel
-  KRecursiveFilterProxyModel
-  KDescendantsProxyModel
-  KModelIndexProxyMapper
-  KSelectionProxyModel
-
-  REQUIRED_HEADERS KItemModels_HEADERS
-)
-
-find_package(PythonModuleGeneration)
-
-if (PythonModuleGeneration_FOUND)
-  ecm_generate_python_binding(
-    TARGET KF5::ItemModels
-    PYTHONNAMESPACE PyKF5
-    MODULENAME KItemModels
-    SIP_DEPENDS
-      QtCore/QtCoremod.sip
-    HEADERS
-      kbreadcrumbselectionmodel.h
-      kconcatenaterowsproxymodel.h
-      kcheckableproxymodel.h
-      kextracolumnsproxymodel.h
-      klinkitemselectionmodel.h
-      krearrangecolumnsproxymodel.h
-      krecursivefilterproxymodel.h
-      kdescendantsproxymodel.h
-      kmodelindexproxymapper.h
-      kselectionproxymodel.h
-  )
-endif()
-
-install(TARGETS KF5ItemModels EXPORT KF5ItemModelsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/kitemmodels_export.h
-  ${KItemModels_HEADERS}
-  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KItemModels COMPONENT Devel
-)
-
-if(BUILD_QCH)
-    ecm_add_qch(
-        KF5ItemModels_QCH
-        NAME KItemModels
-        BASE_NAME KF5ItemModels
-        VERSION ${KF5_VERSION}
-        ORG_DOMAIN org.kde
-        SOURCES # using only public headers, to cover only public API
-            ${KItemModels_HEADERS}
-        MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
-        IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics"
-        LINK_QCHS
-            Qt5Core_QCH
-        INCLUDE_DIRS
-            ${CMAKE_CURRENT_BINARY_DIR}
-        BLANK_MACROS
-            KITEMMODELS_EXPORT
-            "KITEMMODELS_DEPRECATED_VERSION(x, y, t)"
-        TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
-        QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
-        COMPONENT Devel
-    )
-endif()
-
-include(ECMGeneratePriFile)
-ecm_generate_pri_file(BASE_NAME KItemModels LIB_NAME KF5ItemModels DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KItemModels)
-install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+add_subdirectory(core)
diff --git a/src/CMakeLists.txt b/src/core/CMakeLists.txt
similarity index 100%
copy from src/CMakeLists.txt
copy to src/core/CMakeLists.txt
diff --git a/src/kbihash_p.h b/src/core/kbihash_p.h
similarity index 100%
rename from src/kbihash_p.h
rename to src/core/kbihash_p.h
diff --git a/src/kbreadcrumbselectionmodel.cpp b/src/core/kbreadcrumbselectionmodel.cpp
similarity index 100%
rename from src/kbreadcrumbselectionmodel.cpp
rename to src/core/kbreadcrumbselectionmodel.cpp
diff --git a/src/kbreadcrumbselectionmodel.h b/src/core/kbreadcrumbselectionmodel.h
similarity index 100%
rename from src/kbreadcrumbselectionmodel.h
rename to src/core/kbreadcrumbselectionmodel.h
diff --git a/src/kcheckableproxymodel.cpp b/src/core/kcheckableproxymodel.cpp
similarity index 100%
rename from src/kcheckableproxymodel.cpp
rename to src/core/kcheckableproxymodel.cpp
diff --git a/src/kcheckableproxymodel.h b/src/core/kcheckableproxymodel.h
similarity index 100%
rename from src/kcheckableproxymodel.h
rename to src/core/kcheckableproxymodel.h
diff --git a/src/kconcatenaterowsproxymodel.cpp b/src/core/kconcatenaterowsproxymodel.cpp
similarity index 100%
rename from src/kconcatenaterowsproxymodel.cpp
rename to src/core/kconcatenaterowsproxymodel.cpp
diff --git a/src/kconcatenaterowsproxymodel.h b/src/core/kconcatenaterowsproxymodel.h
similarity index 100%
rename from src/kconcatenaterowsproxymodel.h
rename to src/core/kconcatenaterowsproxymodel.h
diff --git a/src/kdescendantsproxymodel.cpp b/src/core/kdescendantsproxymodel.cpp
similarity index 100%
rename from src/kdescendantsproxymodel.cpp
rename to src/core/kdescendantsproxymodel.cpp
diff --git a/src/kdescendantsproxymodel.h b/src/core/kdescendantsproxymodel.h
similarity index 100%
rename from src/kdescendantsproxymodel.h
rename to src/core/kdescendantsproxymodel.h
diff --git a/src/kextracolumnsproxymodel.cpp b/src/core/kextracolumnsproxymodel.cpp
similarity index 100%
rename from src/kextracolumnsproxymodel.cpp
rename to src/core/kextracolumnsproxymodel.cpp
diff --git a/src/kextracolumnsproxymodel.h b/src/core/kextracolumnsproxymodel.h
similarity index 100%
rename from src/kextracolumnsproxymodel.h
rename to src/core/kextracolumnsproxymodel.h
diff --git a/src/klinkitemselectionmodel.cpp b/src/core/klinkitemselectionmodel.cpp
similarity index 100%
rename from src/klinkitemselectionmodel.cpp
rename to src/core/klinkitemselectionmodel.cpp
diff --git a/src/klinkitemselectionmodel.h b/src/core/klinkitemselectionmodel.h
similarity index 100%
rename from src/klinkitemselectionmodel.h
rename to src/core/klinkitemselectionmodel.h
diff --git a/src/kmodelindexproxymapper.cpp b/src/core/kmodelindexproxymapper.cpp
similarity index 100%
rename from src/kmodelindexproxymapper.cpp
rename to src/core/kmodelindexproxymapper.cpp
diff --git a/src/kmodelindexproxymapper.h b/src/core/kmodelindexproxymapper.h
similarity index 100%
rename from src/kmodelindexproxymapper.h
rename to src/core/kmodelindexproxymapper.h
diff --git a/src/krearrangecolumnsproxymodel.cpp b/src/core/krearrangecolumnsproxymodel.cpp
similarity index 100%
rename from src/krearrangecolumnsproxymodel.cpp
rename to src/core/krearrangecolumnsproxymodel.cpp
diff --git a/src/krearrangecolumnsproxymodel.h b/src/core/krearrangecolumnsproxymodel.h
similarity index 100%
rename from src/krearrangecolumnsproxymodel.h
rename to src/core/krearrangecolumnsproxymodel.h
diff --git a/src/krecursivefilterproxymodel.cpp b/src/core/krecursivefilterproxymodel.cpp
similarity index 100%
rename from src/krecursivefilterproxymodel.cpp
rename to src/core/krecursivefilterproxymodel.cpp
diff --git a/src/krecursivefilterproxymodel.h b/src/core/krecursivefilterproxymodel.h
similarity index 100%
rename from src/krecursivefilterproxymodel.h
rename to src/core/krecursivefilterproxymodel.h
diff --git a/src/kselectionproxymodel.cpp b/src/core/kselectionproxymodel.cpp
similarity index 100%
rename from src/kselectionproxymodel.cpp
rename to src/core/kselectionproxymodel.cpp
diff --git a/src/kselectionproxymodel.h b/src/core/kselectionproxymodel.h
similarity index 100%
rename from src/kselectionproxymodel.h
rename to src/core/kselectionproxymodel.h
diff --git a/src/kvoidpointerfactory_p.h b/src/core/kvoidpointerfactory_p.h
similarity index 100%
rename from src/kvoidpointerfactory_p.h
rename to src/core/kvoidpointerfactory_p.h