diff --git a/autotests/mergeutiltest.cpp b/autotests/mergeutiltest.cpp
index 6ed2821..a1fd3b3 100644
--- a/autotests/mergeutiltest.cpp
+++ b/autotests/mergeutiltest.cpp
@@ -1,117 +1,117 @@
 /*
     Copyright (C) 2019 Volker Krause <vkrause@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "../src/datatypes/mergeutil.cpp"
+#include "../src/lib/datatypes/mergeutil.cpp"
 
 #include <QDateTime>
 #include <QTest>
 
 using namespace KPublicTransport;
 
 class MergeUtilTest : public QObject
 {
     Q_OBJECT
 private Q_SLOTS:
     void initTestCase()
     {
         qputenv("TZ", "UTC-8"); // something far away from the test data, to be sure local TZ doesn't interfere
     }
 
     void testDateTimeDistance_data()
     {
         QTest::addColumn<QDateTime>("lhs");
         QTest::addColumn<QDateTime>("rhs");
         QTest::addColumn<int>("dist");
 
         QTest::newRow("empty") << QDateTime() << QDateTime() << 0;
         QTest::newRow("local vs tz eq") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul")) << 0;
         QTest::newRow("local vs tz diff") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {13, 23}, QTimeZone("Asia/Seoul")) << 3600;
         QTest::newRow("local vs offset eq") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 7200) << 0;
         QTest::newRow("local vs offset diff") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {13, 23}, Qt::OffsetFromUTC, 7200) << 3600;
         QTest::newRow("offset vs tz eq") << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 9 * 3600) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul")) << 0;
         QTest::newRow("offset vs tz diff") << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 9 * 3600) << QDateTime({1970, 1, 1}, {13, 23}, QTimeZone("Asia/Seoul")) << 3600;
     }
 
     void testDateTimeDistance()
     {
         QFETCH(QDateTime, lhs);
         QFETCH(QDateTime, rhs);
         QFETCH(int, dist);
 
         QCOMPARE(MergeUtil::distance(lhs, rhs), dist);
         QCOMPARE(MergeUtil::distance(rhs, lhs), dist);
 
         QCOMPARE(MergeUtil::isBefore(lhs, rhs), dist > 0);
         QCOMPARE(MergeUtil::isBefore(rhs, lhs), dist < 0);
     }
 
     void testDateTimeMerge_data()
     {
         QTest::addColumn<QDateTime>("lhs");
         QTest::addColumn<QDateTime>("rhs");
         QTest::addColumn<QDateTime>("result");
 
         QTest::newRow("empty") << QDateTime() << QDateTime() << QDateTime();
         QTest::newRow("invalid") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime() << QDateTime({1970, 1, 1}, {12, 23});
         QTest::newRow("local vs tz") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul")) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul"));
         QTest::newRow("local vs offset") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 7200) << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 7200);
         QTest::newRow("offset vs tz") << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 9 * 3600) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul")) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul"));
     }
 
     void testDateTimeMerge()
     {
         QFETCH(QDateTime, lhs);
         QFETCH(QDateTime, rhs);
         QFETCH(QDateTime, result);
 
         QCOMPARE(MergeUtil::mergeDateTimeEqual(lhs, rhs), result);
         QCOMPARE(MergeUtil::mergeDateTimeEqual(rhs, lhs), result);
     }
 
     void testDateTimeMax_data()
     {
         QTest::addColumn<QDateTime>("lhs");
         QTest::addColumn<QDateTime>("rhs");
         QTest::addColumn<QDateTime>("result");
 
         QTest::newRow("empty") << QDateTime() << QDateTime() << QDateTime();
         QTest::newRow("invalid") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime() << QDateTime({1970, 1, 1}, {12, 23});
         QTest::newRow("local vs tz eq") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul")) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul"));
         QTest::newRow("local vs tz gt") << QDateTime({1970, 1, 1}, {14, 23}) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul")) << QDateTime({1970, 1, 1}, {14, 23}, QTimeZone("Asia/Seoul"));
         QTest::newRow("local vs tz lt") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {14, 23}, QTimeZone("Asia/Seoul")) << QDateTime({1970, 1, 1}, {14, 23}, QTimeZone("Asia/Seoul"));
         QTest::newRow("local vs offset eq") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 7200) << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 7200);
         QTest::newRow("local vs offset gt") << QDateTime({1970, 1, 1}, {15, 23}) << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 7200) << QDateTime({1970, 1, 1}, {15, 23}, Qt::OffsetFromUTC, 7200);
         QTest::newRow("local vs offset lt") << QDateTime({1970, 1, 1}, {12, 23}) << QDateTime({1970, 1, 1}, {15, 23}, Qt::OffsetFromUTC, 7200) << QDateTime({1970, 1, 1}, {15, 23}, Qt::OffsetFromUTC, 7200);
         QTest::newRow("offset vs tz eq") << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 9 * 3600) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul")) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul"));
         QTest::newRow("offset vs tz gt") << QDateTime({1970, 1, 1}, {14, 23}, Qt::OffsetFromUTC, 9 * 3600) << QDateTime({1970, 1, 1}, {12, 23}, QTimeZone("Asia/Seoul")) << QDateTime({1970, 1, 1}, {14, 23}, QTimeZone("Asia/Seoul"));
         QTest::newRow("offset vs tz lt") << QDateTime({1970, 1, 1}, {12, 23}, Qt::OffsetFromUTC, 9 * 3600) << QDateTime({1970, 1, 1}, {14, 23}, QTimeZone("Asia/Seoul")) << QDateTime({1970, 1, 1}, {14, 23}, QTimeZone("Asia/Seoul"));
     }
 
     void testDateTimeMax()
     {
         QFETCH(QDateTime, lhs);
         QFETCH(QDateTime, rhs);
         QFETCH(QDateTime, result);
 
         QCOMPARE(MergeUtil::mergeDateTimeMax(lhs, rhs), result);
         QCOMPARE(MergeUtil::mergeDateTimeMax(rhs, lhs), result);
     }
 };
 
 QTEST_GUILESS_MAIN(MergeUtilTest)
 
 #include "mergeutiltest.moc"
diff --git a/autotests/notestest.cpp b/autotests/notestest.cpp
index f2213d0..d0ff713 100644
--- a/autotests/notestest.cpp
+++ b/autotests/notestest.cpp
@@ -1,126 +1,126 @@
 /*
     Copyright (C) 2019 Volker Krause <vkrause@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "../src/datatypes/notesutil.cpp"
+#include "../src/lib/datatypes/notesutil.cpp"
 
 #include <KPublicTransport/Departure>
 #include <KPublicTransport/Journey>
 
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QTest>
 
 #define s(x) QStringLiteral(x)
 
 using namespace KPublicTransport;
 
 class NotesTest : public QObject
 {
     Q_OBJECT
 private Q_SLOTS:
     void testSerialization()
     {
         Departure dep;
         dep.addNote(s("line1"));
         dep.addNote(s("line2"));
         QCOMPARE(dep.notes().size(), 2);
         const auto json = Departure::toJson(dep);
         //qDebug().noquote() << QJsonDocument(json).toJson();
         const auto dep2 = Departure::fromJson(json);
         QCOMPARE(dep.notes(), dep2.notes());
     }
 
     void testAddNotes_data()
     {
         QTest::addColumn<QStringList>("in");
         QTest::addColumn<QStringList>("res");
 
         QTest::newRow("empty") << QStringList() << QStringList();
         QTest::newRow("one") << QStringList({s("line1")}) << QStringList({s("line1")});
         QTest::newRow("two") << QStringList({s("line1"), s("line2")}) << QStringList({s("line1"), s("line2")});
         QTest::newRow("double") << QStringList({s("line1"), s("line2"), s("line1")}) << QStringList({s("line1"), s("line2")});
         QTest::newRow("substring first") << QStringList({s("note"), s("line2"), s("note - detail")}) << QStringList({s("note - detail"), s("line2")});
         QTest::newRow("substring second") << QStringList({s("note - detail"), s("line2"), s("note")}) << QStringList({s("note - detail"), s("line2")});
     }
 
     void testAddNotes()
     {
         QFETCH(QStringList, in);
         QFETCH(QStringList, res);
 
         JourneySection sec;
         sec.addNotes(in);
         QCOMPARE(sec.notes(), res);
         sec.addNotes(in);
         QCOMPARE(sec.notes(), res);
 
         Departure dep;
         for (const auto &note : in)
             dep.addNote(note);
         QCOMPARE(dep.notes(), res);
     }
 
     void testNotesMerge()
     {
         Departure dep1;
         Departure dep2;
         dep1.addNote(s("line1"));
         dep2.addNotes({s("line2"), s("line1")});
 
         const auto dep3 = Departure::merge(dep1, dep2);
         QCOMPARE(dep3.notes(), QStringList({s("line1"), s("line2")}));
     }
 
     void testNormalize_data()
     {
         QTest::addColumn<QString>("in");
         QTest::addColumn<QString>("out");
 
         QTest::newRow("empty") << QString() << QString();
         QTest::newRow("leading space") << s(" note") << s("note");
         QTest::newRow("trailing space") << s("note ") << s("note");
         QTest::newRow("double space") << s("note  1") << s("note 1");
     }
 
     void testNormalize()
     {
         QFETCH(QString, in);
         QFETCH(QString, out);
         QCOMPARE(NotesUtil::normalizeNote(in), out);
     }
 
     void testRichText_data()
     {
         QTest::addColumn<QString>("in");
         QTest::addColumn<QString>("out");
 
         QTest::newRow("full url") << s("Check-in here: http://www.kde.org") << s("Check-in here: <a href=\"http://www.kde.org\">http://www.kde.org</a>");
         QTest::newRow("existing link") << s("Check-in here: <a href=\"http://www.kde.org\">http://www.kde.org</a>") << s("Check-in here: <a href=\"http://www.kde.org\">http://www.kde.org</a>");
         QTest::newRow("missing scheme") << s("Check-in here: www.kde.org/donate") << s("Check-in here: <a href=\"https://www.kde.org/donate\">www.kde.org/donate</a>");
     }
 
     void testRichText()
     {
         QFETCH(QString, in);
         QFETCH(QString, out);
         QCOMPARE(NotesUtil::normalizeNote(in), out);
     }
 };
 
 QTEST_GUILESS_MAIN(NotesTest)
 
 #include "notestest.moc"
diff --git a/docs/Doxyfile.local b/docs/Doxyfile.local
index 08997b3..8228606 100644
--- a/docs/Doxyfile.local
+++ b/docs/Doxyfile.local
@@ -1,4 +1,4 @@
-EXCLUDE_PATTERNS += */backends/*
+EXCLUDE_PATTERNS += */lib/backends/* */graphql/* */quick/* */qmlplugin/* */tools/*
 PREDEFINED += \
     KPUBLICTRANSPORT_EXPORT="" \
     KPUBLICTRANSPORT_PROPERTY(type,name,setter)="Q_PROPERTY(type name READ name WRITE setter)"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22bbe01..c046277 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,156 +1,9 @@
 add_subdirectory(graphql)
-
-set(kpublictransport_srcs
-    departurereply.cpp
-    departurerequest.cpp
-    journeyreply.cpp
-    journeyrequest.cpp
-    locationreply.cpp
-    locationrequest.cpp
-    manager.cpp
-    reply.cpp
-    requestcontext.cpp
-    vehiclelayoutreply.cpp
-    vehiclelayoutrequest.cpp
-
-    backends/abstractbackend.cpp
-    backends/cache.cpp
-    backends/deutschebahnbackend.cpp
-    backends/deutschebahnvehiclelayoutparser.cpp
-    backends/efabackend.cpp
-    backends/efaparser.cpp
-    backends/efacompactparser.cpp
-    backends/efaxmlparser.cpp
-    backends/hafasbackend.cpp
-    backends/hafasparser.cpp
-    backends/hafasmgatebackend.cpp
-    backends/hafasmgateparser.cpp
-    backends/hafasquerybackend.cpp
-    backends/hafasqueryparser.cpp
-    backends/navitiabackend.cpp
-    backends/navitiaparser.cpp
-    backends/otp/otp.qrc
-    backends/scopedxmlstreamreader.cpp
-
-    datatypes/attribution.cpp
-    datatypes/attributionutil.cpp
-    datatypes/backend.cpp
-    datatypes/departure.cpp
-    datatypes/departureutil.cpp
-    datatypes/disruption.cpp
-    datatypes/journey.cpp
-    datatypes/journeyutil.cpp
-    datatypes/json.cpp
-    datatypes/line.cpp
-    datatypes/location.cpp
-    datatypes/locationutil.cpp
-    datatypes/mergeutil.cpp
-    datatypes/notesutil.cpp
-    datatypes/platform.cpp
-    datatypes/platformutils.cpp
-    datatypes/vehicle.cpp
-
-    models/abstractquerymodel.cpp
-    models/backendmodel.cpp
-    models/departurequerymodel.cpp
-    models/journeyquerymodel.cpp
-    models/locationquerymodel.cpp
-    models/vehiclelayoutquerymodel.cpp
-
-    networks/networks.qrc
-)
-ecm_qt_declare_logging_category(kpublictransport_srcs HEADER logging.h IDENTIFIER KPublicTransport::Log CATEGORY_NAME org.kde.kpublictransport)
-
-add_library(KPublicTransport ${kpublictransport_srcs})
-generate_export_header(KPublicTransport BASE_NAME KPublicTransport)
-set_target_properties(KPublicTransport PROPERTIES
-    VERSION ${KPUBLICTRANSPORT_VERSION_STRING}
-    SOVERSION ${KPUBLICTRANSPORT_SOVERSION}
-    EXPORT_NAME KPublicTransport
-)
-target_include_directories(KPublicTransport PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
-target_link_libraries(KPublicTransport
-    PUBLIC
-        Qt5::Gui
-    PRIVATE
-        Qt5::Network
-        ZLIB::ZLIB
-)
-
-ecm_generate_headers(KPublicTransport_FORWARDING_HEADERS
-    HEADER_NAMES
-        DepartureReply
-        DepartureRequest
-        JourneyReply
-        JourneyRequest
-        LocationReply
-        LocationRequest
-        Manager
-        Reply
-        VehicleLayoutReply
-        VehicleLayoutRequest
-    PREFIX KPublicTransport
-    REQUIRED_HEADERS KPublicTransport_HEADERS
-)
-# # ### for testing only
-ecm_generate_headers(KPublicTransport_Backends_FORWARDING_HEADERS
-    HEADER_NAMES
-        Cache
-        HafasMgateParser
-        NavitiaParser
-    PREFIX KPublicTransport
-    REQUIRED_HEADERS KPublicTransport_Backends_HEADERS
-    RELATIVE backends
-)
-ecm_generate_headers(KPublicTransport_Datatypes_FORWARDING_HEADERS
-    HEADER_NAMES
-        Attribution
-        Backend
-        Datatypes
-        Departure
-        Disruption
-        Journey
-        Line
-        Location
-        Platform
-        Vehicle
-    PREFIX KPublicTransport
-    REQUIRED_HEADERS KPublicTransport_Datatypes_HEADERS
-    RELATIVE datatypes
-)
-ecm_generate_headers(KPublicTransport_Models_FORWARDING_HEADERS
-    HEADER_NAMES
-        AbstractQueryModel
-        BackendModel
-        DepartureQueryModel
-        JourneyQueryModel
-        LocationQueryModel
-        VehicleLayoutQueryModel
-    PREFIX KPublicTransport
-    REQUIRED_HEADERS KPublicTransport_Models_HEADERS
-    RELATIVE models
-)
-
-install(TARGETS KPublicTransport EXPORT KPublicTransportTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES org_kde_kpublictransport.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-install(FILES
-    ${KPublicTransport_FORWARDING_HEADERS}
-    ${KPublicTransport_Datatypes_FORWARDING_HEADERS}
-    ${KPublicTransport_Models_FORWARDING_HEADERS}
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPublicTransport
-)
-install(FILES
-    ${KPublicTransport_HEADERS}
-    ${KPublicTransport_Datatypes_HEADERS}
-    ${KPublicTransport_Models_HEADERS}
-    ${CMAKE_CURRENT_BINARY_DIR}/kpublictransport_export.h
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kpublictransport
-)
-
+add_subdirectory(lib)
 add_subdirectory(qmlplugin)
 if (TARGET Qt5::Quick)
     add_subdirectory(quick)
 endif()
 if (NOT CROSS_COMPILING)
     add_subdirectory(tools)
 endif()
diff --git a/src/CMakeLists.txt b/src/lib/CMakeLists.txt
similarity index 96%
copy from src/CMakeLists.txt
copy to src/lib/CMakeLists.txt
index 22bbe01..34545f0 100644
--- a/src/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,156 +1,146 @@
-add_subdirectory(graphql)
-
 set(kpublictransport_srcs
     departurereply.cpp
     departurerequest.cpp
     journeyreply.cpp
     journeyrequest.cpp
     locationreply.cpp
     locationrequest.cpp
     manager.cpp
     reply.cpp
     requestcontext.cpp
     vehiclelayoutreply.cpp
     vehiclelayoutrequest.cpp
 
     backends/abstractbackend.cpp
     backends/cache.cpp
     backends/deutschebahnbackend.cpp
     backends/deutschebahnvehiclelayoutparser.cpp
     backends/efabackend.cpp
     backends/efaparser.cpp
     backends/efacompactparser.cpp
     backends/efaxmlparser.cpp
     backends/hafasbackend.cpp
     backends/hafasparser.cpp
     backends/hafasmgatebackend.cpp
     backends/hafasmgateparser.cpp
     backends/hafasquerybackend.cpp
     backends/hafasqueryparser.cpp
     backends/navitiabackend.cpp
     backends/navitiaparser.cpp
     backends/otp/otp.qrc
     backends/scopedxmlstreamreader.cpp
 
     datatypes/attribution.cpp
     datatypes/attributionutil.cpp
     datatypes/backend.cpp
     datatypes/departure.cpp
     datatypes/departureutil.cpp
     datatypes/disruption.cpp
     datatypes/journey.cpp
     datatypes/journeyutil.cpp
     datatypes/json.cpp
     datatypes/line.cpp
     datatypes/location.cpp
     datatypes/locationutil.cpp
     datatypes/mergeutil.cpp
     datatypes/notesutil.cpp
     datatypes/platform.cpp
     datatypes/platformutils.cpp
     datatypes/vehicle.cpp
 
     models/abstractquerymodel.cpp
     models/backendmodel.cpp
     models/departurequerymodel.cpp
     models/journeyquerymodel.cpp
     models/locationquerymodel.cpp
     models/vehiclelayoutquerymodel.cpp
 
     networks/networks.qrc
 )
 ecm_qt_declare_logging_category(kpublictransport_srcs HEADER logging.h IDENTIFIER KPublicTransport::Log CATEGORY_NAME org.kde.kpublictransport)
 
 add_library(KPublicTransport ${kpublictransport_srcs})
 generate_export_header(KPublicTransport BASE_NAME KPublicTransport)
 set_target_properties(KPublicTransport PROPERTIES
     VERSION ${KPUBLICTRANSPORT_VERSION_STRING}
     SOVERSION ${KPUBLICTRANSPORT_SOVERSION}
     EXPORT_NAME KPublicTransport
 )
 target_include_directories(KPublicTransport PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
 target_link_libraries(KPublicTransport
     PUBLIC
         Qt5::Gui
     PRIVATE
         Qt5::Network
         ZLIB::ZLIB
 )
 
 ecm_generate_headers(KPublicTransport_FORWARDING_HEADERS
     HEADER_NAMES
         DepartureReply
         DepartureRequest
         JourneyReply
         JourneyRequest
         LocationReply
         LocationRequest
         Manager
         Reply
         VehicleLayoutReply
         VehicleLayoutRequest
     PREFIX KPublicTransport
     REQUIRED_HEADERS KPublicTransport_HEADERS
 )
 # # ### for testing only
 ecm_generate_headers(KPublicTransport_Backends_FORWARDING_HEADERS
     HEADER_NAMES
         Cache
         HafasMgateParser
         NavitiaParser
     PREFIX KPublicTransport
     REQUIRED_HEADERS KPublicTransport_Backends_HEADERS
     RELATIVE backends
 )
 ecm_generate_headers(KPublicTransport_Datatypes_FORWARDING_HEADERS
     HEADER_NAMES
         Attribution
         Backend
         Datatypes
         Departure
         Disruption
         Journey
         Line
         Location
         Platform
         Vehicle
     PREFIX KPublicTransport
     REQUIRED_HEADERS KPublicTransport_Datatypes_HEADERS
     RELATIVE datatypes
 )
 ecm_generate_headers(KPublicTransport_Models_FORWARDING_HEADERS
     HEADER_NAMES
         AbstractQueryModel
         BackendModel
         DepartureQueryModel
         JourneyQueryModel
         LocationQueryModel
         VehicleLayoutQueryModel
     PREFIX KPublicTransport
     REQUIRED_HEADERS KPublicTransport_Models_HEADERS
     RELATIVE models
 )
 
 install(TARGETS KPublicTransport EXPORT KPublicTransportTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES org_kde_kpublictransport.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 install(FILES
     ${KPublicTransport_FORWARDING_HEADERS}
     ${KPublicTransport_Datatypes_FORWARDING_HEADERS}
     ${KPublicTransport_Models_FORWARDING_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPublicTransport
 )
 install(FILES
     ${KPublicTransport_HEADERS}
     ${KPublicTransport_Datatypes_HEADERS}
     ${KPublicTransport_Models_HEADERS}
     ${CMAKE_CURRENT_BINARY_DIR}/kpublictransport_export.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kpublictransport
 )
-
-add_subdirectory(qmlplugin)
-if (TARGET Qt5::Quick)
-    add_subdirectory(quick)
-endif()
-if (NOT CROSS_COMPILING)
-    add_subdirectory(tools)
-endif()
diff --git a/src/backends/abstractbackend.cpp b/src/lib/backends/abstractbackend.cpp
similarity index 100%
rename from src/backends/abstractbackend.cpp
rename to src/lib/backends/abstractbackend.cpp
diff --git a/src/backends/abstractbackend.h b/src/lib/backends/abstractbackend.h
similarity index 100%
rename from src/backends/abstractbackend.h
rename to src/lib/backends/abstractbackend.h
diff --git a/src/backends/cache.cpp b/src/lib/backends/cache.cpp
similarity index 100%
rename from src/backends/cache.cpp
rename to src/lib/backends/cache.cpp
diff --git a/src/backends/cache.h b/src/lib/backends/cache.h
similarity index 100%
rename from src/backends/cache.h
rename to src/lib/backends/cache.h
diff --git a/src/backends/deutschebahnbackend.cpp b/src/lib/backends/deutschebahnbackend.cpp
similarity index 100%
rename from src/backends/deutschebahnbackend.cpp
rename to src/lib/backends/deutschebahnbackend.cpp
diff --git a/src/backends/deutschebahnbackend.h b/src/lib/backends/deutschebahnbackend.h
similarity index 100%
rename from src/backends/deutschebahnbackend.h
rename to src/lib/backends/deutschebahnbackend.h
diff --git a/src/backends/deutschebahnvehiclelayoutparser.cpp b/src/lib/backends/deutschebahnvehiclelayoutparser.cpp
similarity index 100%
rename from src/backends/deutschebahnvehiclelayoutparser.cpp
rename to src/lib/backends/deutschebahnvehiclelayoutparser.cpp
diff --git a/src/backends/deutschebahnvehiclelayoutparser.h b/src/lib/backends/deutschebahnvehiclelayoutparser.h
similarity index 100%
rename from src/backends/deutschebahnvehiclelayoutparser.h
rename to src/lib/backends/deutschebahnvehiclelayoutparser.h
diff --git a/src/backends/efabackend.cpp b/src/lib/backends/efabackend.cpp
similarity index 100%
rename from src/backends/efabackend.cpp
rename to src/lib/backends/efabackend.cpp
diff --git a/src/backends/efabackend.h b/src/lib/backends/efabackend.h
similarity index 100%
rename from src/backends/efabackend.h
rename to src/lib/backends/efabackend.h
diff --git a/src/backends/efacompactparser.cpp b/src/lib/backends/efacompactparser.cpp
similarity index 100%
rename from src/backends/efacompactparser.cpp
rename to src/lib/backends/efacompactparser.cpp
diff --git a/src/backends/efacompactparser.h b/src/lib/backends/efacompactparser.h
similarity index 100%
rename from src/backends/efacompactparser.h
rename to src/lib/backends/efacompactparser.h
diff --git a/src/backends/efaparser.cpp b/src/lib/backends/efaparser.cpp
similarity index 100%
rename from src/backends/efaparser.cpp
rename to src/lib/backends/efaparser.cpp
diff --git a/src/backends/efaparser.h b/src/lib/backends/efaparser.h
similarity index 100%
rename from src/backends/efaparser.h
rename to src/lib/backends/efaparser.h
diff --git a/src/backends/efaxmlparser.cpp b/src/lib/backends/efaxmlparser.cpp
similarity index 100%
rename from src/backends/efaxmlparser.cpp
rename to src/lib/backends/efaxmlparser.cpp
diff --git a/src/backends/efaxmlparser.h b/src/lib/backends/efaxmlparser.h
similarity index 100%
rename from src/backends/efaxmlparser.h
rename to src/lib/backends/efaxmlparser.h
diff --git a/src/backends/hafasbackend.cpp b/src/lib/backends/hafasbackend.cpp
similarity index 100%
rename from src/backends/hafasbackend.cpp
rename to src/lib/backends/hafasbackend.cpp
diff --git a/src/backends/hafasbackend.h b/src/lib/backends/hafasbackend.h
similarity index 100%
rename from src/backends/hafasbackend.h
rename to src/lib/backends/hafasbackend.h
diff --git a/src/backends/hafasjourneyresponse_p.h b/src/lib/backends/hafasjourneyresponse_p.h
similarity index 100%
rename from src/backends/hafasjourneyresponse_p.h
rename to src/lib/backends/hafasjourneyresponse_p.h
diff --git a/src/backends/hafasmgatebackend.cpp b/src/lib/backends/hafasmgatebackend.cpp
similarity index 100%
rename from src/backends/hafasmgatebackend.cpp
rename to src/lib/backends/hafasmgatebackend.cpp
diff --git a/src/backends/hafasmgatebackend.h b/src/lib/backends/hafasmgatebackend.h
similarity index 100%
rename from src/backends/hafasmgatebackend.h
rename to src/lib/backends/hafasmgatebackend.h
diff --git a/src/backends/hafasmgateparser.cpp b/src/lib/backends/hafasmgateparser.cpp
similarity index 100%
rename from src/backends/hafasmgateparser.cpp
rename to src/lib/backends/hafasmgateparser.cpp
diff --git a/src/backends/hafasmgateparser.h b/src/lib/backends/hafasmgateparser.h
similarity index 100%
rename from src/backends/hafasmgateparser.h
rename to src/lib/backends/hafasmgateparser.h
diff --git a/src/backends/hafasparser.cpp b/src/lib/backends/hafasparser.cpp
similarity index 100%
rename from src/backends/hafasparser.cpp
rename to src/lib/backends/hafasparser.cpp
diff --git a/src/backends/hafasparser.h b/src/lib/backends/hafasparser.h
similarity index 100%
rename from src/backends/hafasparser.h
rename to src/lib/backends/hafasparser.h
diff --git a/src/backends/hafasquerybackend.cpp b/src/lib/backends/hafasquerybackend.cpp
similarity index 100%
rename from src/backends/hafasquerybackend.cpp
rename to src/lib/backends/hafasquerybackend.cpp
diff --git a/src/backends/hafasquerybackend.h b/src/lib/backends/hafasquerybackend.h
similarity index 100%
rename from src/backends/hafasquerybackend.h
rename to src/lib/backends/hafasquerybackend.h
diff --git a/src/backends/hafasqueryparser.cpp b/src/lib/backends/hafasqueryparser.cpp
similarity index 100%
rename from src/backends/hafasqueryparser.cpp
rename to src/lib/backends/hafasqueryparser.cpp
diff --git a/src/backends/hafasqueryparser.h b/src/lib/backends/hafasqueryparser.h
similarity index 100%
rename from src/backends/hafasqueryparser.h
rename to src/lib/backends/hafasqueryparser.h
diff --git a/src/backends/navitiabackend.cpp b/src/lib/backends/navitiabackend.cpp
similarity index 100%
rename from src/backends/navitiabackend.cpp
rename to src/lib/backends/navitiabackend.cpp
diff --git a/src/backends/navitiabackend.h b/src/lib/backends/navitiabackend.h
similarity index 100%
rename from src/backends/navitiabackend.h
rename to src/lib/backends/navitiabackend.h
diff --git a/src/backends/navitiaparser.cpp b/src/lib/backends/navitiaparser.cpp
similarity index 100%
rename from src/backends/navitiaparser.cpp
rename to src/lib/backends/navitiaparser.cpp
diff --git a/src/backends/navitiaparser.h b/src/lib/backends/navitiaparser.h
similarity index 100%
rename from src/backends/navitiaparser.h
rename to src/lib/backends/navitiaparser.h
diff --git a/src/backends/otp/.kateconfig b/src/lib/backends/otp/.kateconfig
similarity index 100%
rename from src/backends/otp/.kateconfig
rename to src/lib/backends/otp/.kateconfig
diff --git a/src/backends/otp/NOTES b/src/lib/backends/otp/NOTES
similarity index 100%
rename from src/backends/otp/NOTES
rename to src/lib/backends/otp/NOTES
diff --git a/src/backends/otp/departure.graphql b/src/lib/backends/otp/departure.graphql
similarity index 100%
rename from src/backends/otp/departure.graphql
rename to src/lib/backends/otp/departure.graphql
diff --git a/src/backends/otp/journey.graphql b/src/lib/backends/otp/journey.graphql
similarity index 100%
rename from src/backends/otp/journey.graphql
rename to src/lib/backends/otp/journey.graphql
diff --git a/src/backends/otp/otp.qrc b/src/lib/backends/otp/otp.qrc
similarity index 100%
rename from src/backends/otp/otp.qrc
rename to src/lib/backends/otp/otp.qrc
diff --git a/src/backends/otp/stationByCoordinate.graphql b/src/lib/backends/otp/stationByCoordinate.graphql
similarity index 100%
rename from src/backends/otp/stationByCoordinate.graphql
rename to src/lib/backends/otp/stationByCoordinate.graphql
diff --git a/src/backends/otp/stationByName.graphql b/src/lib/backends/otp/stationByName.graphql
similarity index 100%
rename from src/backends/otp/stationByName.graphql
rename to src/lib/backends/otp/stationByName.graphql
diff --git a/src/backends/scopedxmlstreamreader.cpp b/src/lib/backends/scopedxmlstreamreader.cpp
similarity index 100%
rename from src/backends/scopedxmlstreamreader.cpp
rename to src/lib/backends/scopedxmlstreamreader.cpp
diff --git a/src/backends/scopedxmlstreamreader.h b/src/lib/backends/scopedxmlstreamreader.h
similarity index 100%
rename from src/backends/scopedxmlstreamreader.h
rename to src/lib/backends/scopedxmlstreamreader.h
diff --git a/src/datatypes/attribution.cpp b/src/lib/datatypes/attribution.cpp
similarity index 100%
rename from src/datatypes/attribution.cpp
rename to src/lib/datatypes/attribution.cpp
diff --git a/src/datatypes/attribution.h b/src/lib/datatypes/attribution.h
similarity index 100%
rename from src/datatypes/attribution.h
rename to src/lib/datatypes/attribution.h
diff --git a/src/datatypes/attributionutil.cpp b/src/lib/datatypes/attributionutil.cpp
similarity index 100%
rename from src/datatypes/attributionutil.cpp
rename to src/lib/datatypes/attributionutil.cpp
diff --git a/src/datatypes/attributionutil_p.h b/src/lib/datatypes/attributionutil_p.h
similarity index 100%
rename from src/datatypes/attributionutil_p.h
rename to src/lib/datatypes/attributionutil_p.h
diff --git a/src/datatypes/backend.cpp b/src/lib/datatypes/backend.cpp
similarity index 100%
rename from src/datatypes/backend.cpp
rename to src/lib/datatypes/backend.cpp
diff --git a/src/datatypes/backend.h b/src/lib/datatypes/backend.h
similarity index 100%
rename from src/datatypes/backend.h
rename to src/lib/datatypes/backend.h
diff --git a/src/datatypes/datatypes.h b/src/lib/datatypes/datatypes.h
similarity index 100%
rename from src/datatypes/datatypes.h
rename to src/lib/datatypes/datatypes.h
diff --git a/src/datatypes/datatypes_p.h b/src/lib/datatypes/datatypes_p.h
similarity index 100%
rename from src/datatypes/datatypes_p.h
rename to src/lib/datatypes/datatypes_p.h
diff --git a/src/datatypes/departure.cpp b/src/lib/datatypes/departure.cpp
similarity index 100%
rename from src/datatypes/departure.cpp
rename to src/lib/datatypes/departure.cpp
diff --git a/src/datatypes/departure.h b/src/lib/datatypes/departure.h
similarity index 100%
rename from src/datatypes/departure.h
rename to src/lib/datatypes/departure.h
diff --git a/src/datatypes/departureutil.cpp b/src/lib/datatypes/departureutil.cpp
similarity index 100%
rename from src/datatypes/departureutil.cpp
rename to src/lib/datatypes/departureutil.cpp
diff --git a/src/datatypes/departureutil_p.h b/src/lib/datatypes/departureutil_p.h
similarity index 100%
rename from src/datatypes/departureutil_p.h
rename to src/lib/datatypes/departureutil_p.h
diff --git a/src/datatypes/disruption.cpp b/src/lib/datatypes/disruption.cpp
similarity index 100%
rename from src/datatypes/disruption.cpp
rename to src/lib/datatypes/disruption.cpp
diff --git a/src/datatypes/disruption.h b/src/lib/datatypes/disruption.h
similarity index 100%
rename from src/datatypes/disruption.h
rename to src/lib/datatypes/disruption.h
diff --git a/src/datatypes/journey.cpp b/src/lib/datatypes/journey.cpp
similarity index 100%
rename from src/datatypes/journey.cpp
rename to src/lib/datatypes/journey.cpp
diff --git a/src/datatypes/journey.h b/src/lib/datatypes/journey.h
similarity index 100%
rename from src/datatypes/journey.h
rename to src/lib/datatypes/journey.h
diff --git a/src/datatypes/journeyutil.cpp b/src/lib/datatypes/journeyutil.cpp
similarity index 100%
rename from src/datatypes/journeyutil.cpp
rename to src/lib/datatypes/journeyutil.cpp
diff --git a/src/datatypes/journeyutil_p.h b/src/lib/datatypes/journeyutil_p.h
similarity index 100%
rename from src/datatypes/journeyutil_p.h
rename to src/lib/datatypes/journeyutil_p.h
diff --git a/src/datatypes/json.cpp b/src/lib/datatypes/json.cpp
similarity index 100%
rename from src/datatypes/json.cpp
rename to src/lib/datatypes/json.cpp
diff --git a/src/datatypes/json_p.h b/src/lib/datatypes/json_p.h
similarity index 100%
rename from src/datatypes/json_p.h
rename to src/lib/datatypes/json_p.h
diff --git a/src/datatypes/line.cpp b/src/lib/datatypes/line.cpp
similarity index 100%
rename from src/datatypes/line.cpp
rename to src/lib/datatypes/line.cpp
diff --git a/src/datatypes/line.h b/src/lib/datatypes/line.h
similarity index 100%
rename from src/datatypes/line.h
rename to src/lib/datatypes/line.h
diff --git a/src/datatypes/location.cpp b/src/lib/datatypes/location.cpp
similarity index 100%
rename from src/datatypes/location.cpp
rename to src/lib/datatypes/location.cpp
diff --git a/src/datatypes/location.h b/src/lib/datatypes/location.h
similarity index 100%
rename from src/datatypes/location.h
rename to src/lib/datatypes/location.h
diff --git a/src/datatypes/locationutil.cpp b/src/lib/datatypes/locationutil.cpp
similarity index 100%
rename from src/datatypes/locationutil.cpp
rename to src/lib/datatypes/locationutil.cpp
diff --git a/src/datatypes/locationutil_p.h b/src/lib/datatypes/locationutil_p.h
similarity index 100%
rename from src/datatypes/locationutil_p.h
rename to src/lib/datatypes/locationutil_p.h
diff --git a/src/datatypes/mergeutil.cpp b/src/lib/datatypes/mergeutil.cpp
similarity index 100%
rename from src/datatypes/mergeutil.cpp
rename to src/lib/datatypes/mergeutil.cpp
diff --git a/src/datatypes/mergeutil_p.h b/src/lib/datatypes/mergeutil_p.h
similarity index 100%
rename from src/datatypes/mergeutil_p.h
rename to src/lib/datatypes/mergeutil_p.h
diff --git a/src/datatypes/notesutil.cpp b/src/lib/datatypes/notesutil.cpp
similarity index 100%
rename from src/datatypes/notesutil.cpp
rename to src/lib/datatypes/notesutil.cpp
diff --git a/src/datatypes/notesutil_p.h b/src/lib/datatypes/notesutil_p.h
similarity index 100%
rename from src/datatypes/notesutil_p.h
rename to src/lib/datatypes/notesutil_p.h
diff --git a/src/datatypes/platform.cpp b/src/lib/datatypes/platform.cpp
similarity index 100%
rename from src/datatypes/platform.cpp
rename to src/lib/datatypes/platform.cpp
diff --git a/src/datatypes/platform.h b/src/lib/datatypes/platform.h
similarity index 100%
rename from src/datatypes/platform.h
rename to src/lib/datatypes/platform.h
diff --git a/src/datatypes/platformutils.cpp b/src/lib/datatypes/platformutils.cpp
similarity index 100%
rename from src/datatypes/platformutils.cpp
rename to src/lib/datatypes/platformutils.cpp
diff --git a/src/datatypes/platformutils_p.h b/src/lib/datatypes/platformutils_p.h
similarity index 100%
rename from src/datatypes/platformutils_p.h
rename to src/lib/datatypes/platformutils_p.h
diff --git a/src/datatypes/vehicle.cpp b/src/lib/datatypes/vehicle.cpp
similarity index 100%
rename from src/datatypes/vehicle.cpp
rename to src/lib/datatypes/vehicle.cpp
diff --git a/src/datatypes/vehicle.h b/src/lib/datatypes/vehicle.h
similarity index 100%
rename from src/datatypes/vehicle.h
rename to src/lib/datatypes/vehicle.h
diff --git a/src/departurereply.cpp b/src/lib/departurereply.cpp
similarity index 100%
rename from src/departurereply.cpp
rename to src/lib/departurereply.cpp
diff --git a/src/departurereply.h b/src/lib/departurereply.h
similarity index 100%
rename from src/departurereply.h
rename to src/lib/departurereply.h
diff --git a/src/departurerequest.cpp b/src/lib/departurerequest.cpp
similarity index 100%
rename from src/departurerequest.cpp
rename to src/lib/departurerequest.cpp
diff --git a/src/departurerequest.h b/src/lib/departurerequest.h
similarity index 100%
rename from src/departurerequest.h
rename to src/lib/departurerequest.h
diff --git a/src/journeyreply.cpp b/src/lib/journeyreply.cpp
similarity index 100%
rename from src/journeyreply.cpp
rename to src/lib/journeyreply.cpp
diff --git a/src/journeyreply.h b/src/lib/journeyreply.h
similarity index 100%
rename from src/journeyreply.h
rename to src/lib/journeyreply.h
diff --git a/src/journeyrequest.cpp b/src/lib/journeyrequest.cpp
similarity index 100%
rename from src/journeyrequest.cpp
rename to src/lib/journeyrequest.cpp
diff --git a/src/journeyrequest.h b/src/lib/journeyrequest.h
similarity index 100%
rename from src/journeyrequest.h
rename to src/lib/journeyrequest.h
diff --git a/src/locationreply.cpp b/src/lib/locationreply.cpp
similarity index 100%
rename from src/locationreply.cpp
rename to src/lib/locationreply.cpp
diff --git a/src/locationreply.h b/src/lib/locationreply.h
similarity index 100%
rename from src/locationreply.h
rename to src/lib/locationreply.h
diff --git a/src/locationrequest.cpp b/src/lib/locationrequest.cpp
similarity index 100%
rename from src/locationrequest.cpp
rename to src/lib/locationrequest.cpp
diff --git a/src/locationrequest.h b/src/lib/locationrequest.h
similarity index 100%
rename from src/locationrequest.h
rename to src/lib/locationrequest.h
diff --git a/src/manager.cpp b/src/lib/manager.cpp
similarity index 100%
rename from src/manager.cpp
rename to src/lib/manager.cpp
diff --git a/src/manager.h b/src/lib/manager.h
similarity index 100%
rename from src/manager.h
rename to src/lib/manager.h
diff --git a/src/models/abstractquerymodel.cpp b/src/lib/models/abstractquerymodel.cpp
similarity index 100%
rename from src/models/abstractquerymodel.cpp
rename to src/lib/models/abstractquerymodel.cpp
diff --git a/src/models/abstractquerymodel.h b/src/lib/models/abstractquerymodel.h
similarity index 100%
rename from src/models/abstractquerymodel.h
rename to src/lib/models/abstractquerymodel.h
diff --git a/src/models/abstractquerymodel_p.h b/src/lib/models/abstractquerymodel_p.h
similarity index 100%
rename from src/models/abstractquerymodel_p.h
rename to src/lib/models/abstractquerymodel_p.h
diff --git a/src/models/backendmodel.cpp b/src/lib/models/backendmodel.cpp
similarity index 100%
rename from src/models/backendmodel.cpp
rename to src/lib/models/backendmodel.cpp
diff --git a/src/models/backendmodel.h b/src/lib/models/backendmodel.h
similarity index 100%
rename from src/models/backendmodel.h
rename to src/lib/models/backendmodel.h
diff --git a/src/models/departurequerymodel.cpp b/src/lib/models/departurequerymodel.cpp
similarity index 100%
rename from src/models/departurequerymodel.cpp
rename to src/lib/models/departurequerymodel.cpp
diff --git a/src/models/departurequerymodel.h b/src/lib/models/departurequerymodel.h
similarity index 100%
rename from src/models/departurequerymodel.h
rename to src/lib/models/departurequerymodel.h
diff --git a/src/models/journeyquerymodel.cpp b/src/lib/models/journeyquerymodel.cpp
similarity index 100%
rename from src/models/journeyquerymodel.cpp
rename to src/lib/models/journeyquerymodel.cpp
diff --git a/src/models/journeyquerymodel.h b/src/lib/models/journeyquerymodel.h
similarity index 100%
rename from src/models/journeyquerymodel.h
rename to src/lib/models/journeyquerymodel.h
diff --git a/src/models/locationquerymodel.cpp b/src/lib/models/locationquerymodel.cpp
similarity index 100%
rename from src/models/locationquerymodel.cpp
rename to src/lib/models/locationquerymodel.cpp
diff --git a/src/models/locationquerymodel.h b/src/lib/models/locationquerymodel.h
similarity index 100%
rename from src/models/locationquerymodel.h
rename to src/lib/models/locationquerymodel.h
diff --git a/src/models/vehiclelayoutquerymodel.cpp b/src/lib/models/vehiclelayoutquerymodel.cpp
similarity index 100%
rename from src/models/vehiclelayoutquerymodel.cpp
rename to src/lib/models/vehiclelayoutquerymodel.cpp
diff --git a/src/models/vehiclelayoutquerymodel.h b/src/lib/models/vehiclelayoutquerymodel.h
similarity index 100%
rename from src/models/vehiclelayoutquerymodel.h
rename to src/lib/models/vehiclelayoutquerymodel.h
diff --git a/src/networks/NOTES b/src/lib/networks/NOTES
similarity index 100%
rename from src/networks/NOTES
rename to src/lib/networks/NOTES
diff --git a/src/networks/at_3_vor.json b/src/lib/networks/at_3_vor.json
similarity index 100%
rename from src/networks/at_3_vor.json
rename to src/lib/networks/at_3_vor.json
diff --git a/src/networks/at_4_linz.json b/src/lib/networks/at_4_linz.json
similarity index 100%
rename from src/networks/at_4_linz.json
rename to src/lib/networks/at_4_linz.json
diff --git a/src/networks/at_4_ooevv.json b/src/lib/networks/at_4_ooevv.json
similarity index 100%
rename from src/networks/at_4_ooevv.json
rename to src/lib/networks/at_4_ooevv.json
diff --git a/src/networks/at_5_svv.json b/src/lib/networks/at_5_svv.json
similarity index 100%
rename from src/networks/at_5_svv.json
rename to src/lib/networks/at_5_svv.json
diff --git a/src/networks/at_6_vvst.json b/src/lib/networks/at_6_vvst.json
similarity index 100%
rename from src/networks/at_6_vvst.json
rename to src/lib/networks/at_6_vvst.json
diff --git a/src/networks/at_7_vvt.json b/src/lib/networks/at_7_vvt.json
similarity index 100%
rename from src/networks/at_7_vvt.json
rename to src/lib/networks/at_7_vvt.json
diff --git a/src/networks/at_8_vvv.json b/src/lib/networks/at_8_vvv.json
similarity index 100%
rename from src/networks/at_8_vvv.json
rename to src/lib/networks/at_8_vvv.json
diff --git a/src/networks/at_oebb.json b/src/lib/networks/at_oebb.json
similarity index 100%
rename from src/networks/at_oebb.json
rename to src/lib/networks/at_oebb.json
diff --git a/src/networks/au_nsw.json b/src/lib/networks/au_nsw.json
similarity index 100%
rename from src/networks/au_nsw.json
rename to src/lib/networks/au_nsw.json
diff --git a/src/networks/be_sncb.json b/src/lib/networks/be_sncb.json
similarity index 100%
rename from src/networks/be_sncb.json
rename to src/lib/networks/be_sncb.json
diff --git a/src/networks/ch_sbb.json b/src/lib/networks/ch_sbb.json
similarity index 100%
rename from src/networks/ch_sbb.json
rename to src/lib/networks/ch_sbb.json
diff --git a/src/networks/de_bb_vbb.json b/src/lib/networks/de_bb_vbb.json
similarity index 100%
rename from src/networks/de_bb_vbb.json
rename to src/lib/networks/de_bb_vbb.json
diff --git a/src/networks/de_be_bvg.json b/src/lib/networks/de_be_bvg.json
similarity index 100%
rename from src/networks/de_be_bvg.json
rename to src/lib/networks/de_be_bvg.json
diff --git a/src/networks/de_bw_kvv.json b/src/lib/networks/de_bw_kvv.json
similarity index 100%
rename from src/networks/de_bw_kvv.json
rename to src/lib/networks/de_bw_kvv.json
diff --git a/src/networks/de_bw_vvs.json b/src/lib/networks/de_bw_vvs.json
similarity index 100%
rename from src/networks/de_bw_vvs.json
rename to src/lib/networks/de_bw_vvs.json
diff --git a/src/networks/de_by_bayern.json b/src/lib/networks/de_by_bayern.json
similarity index 100%
rename from src/networks/de_by_bayern.json
rename to src/lib/networks/de_by_bayern.json
diff --git a/src/networks/de_by_mvv.json b/src/lib/networks/de_by_mvv.json
similarity index 100%
rename from src/networks/de_by_mvv.json
rename to src/lib/networks/de_by_mvv.json
diff --git a/src/networks/de_by_vgn.json b/src/lib/networks/de_by_vgn.json
similarity index 100%
rename from src/networks/de_by_vgn.json
rename to src/lib/networks/de_by_vgn.json
diff --git a/src/networks/de_db.json b/src/lib/networks/de_db.json
similarity index 100%
rename from src/networks/de_db.json
rename to src/lib/networks/de_db.json
diff --git a/src/networks/de_dbwagenreihung.json b/src/lib/networks/de_dbwagenreihung.json
similarity index 100%
rename from src/networks/de_dbwagenreihung.json
rename to src/lib/networks/de_dbwagenreihung.json
diff --git a/src/networks/de_he_rmv.json b/src/lib/networks/de_he_rmv.json
similarity index 100%
rename from src/networks/de_he_rmv.json
rename to src/lib/networks/de_he_rmv.json
diff --git a/src/networks/de_ni_gvh.json b/src/lib/networks/de_ni_gvh.json
similarity index 100%
rename from src/networks/de_ni_gvh.json
rename to src/lib/networks/de_ni_gvh.json
diff --git a/src/networks/de_nw_avv.json b/src/lib/networks/de_nw_avv.json
similarity index 100%
rename from src/networks/de_nw_avv.json
rename to src/lib/networks/de_nw_avv.json
diff --git a/src/networks/de_nw_muenster.json b/src/lib/networks/de_nw_muenster.json
similarity index 100%
rename from src/networks/de_nw_muenster.json
rename to src/lib/networks/de_nw_muenster.json
diff --git a/src/networks/de_nw_vrr.json b/src/lib/networks/de_nw_vrr.json
similarity index 100%
rename from src/networks/de_nw_vrr.json
rename to src/lib/networks/de_nw_vrr.json
diff --git a/src/networks/de_sh_sh.json b/src/lib/networks/de_sh_sh.json
similarity index 100%
rename from src/networks/de_sh_sh.json
rename to src/lib/networks/de_sh_sh.json
diff --git a/src/networks/de_st_insa.json b/src/lib/networks/de_st_insa.json
similarity index 100%
rename from src/networks/de_st_insa.json
rename to src/lib/networks/de_st_insa.json
diff --git a/src/networks/dk_dsb.json b/src/lib/networks/dk_dsb.json
similarity index 100%
rename from src/networks/dk_dsb.json
rename to src/lib/networks/dk_dsb.json
diff --git a/src/networks/fi_17_helsinki.json b/src/lib/networks/fi_17_helsinki.json
similarity index 100%
rename from src/networks/fi_17_helsinki.json
rename to src/lib/networks/fi_17_helsinki.json
diff --git a/src/networks/fi_digitransit.json b/src/lib/networks/fi_digitransit.json
similarity index 100%
rename from src/networks/fi_digitransit.json
rename to src/lib/networks/fi_digitransit.json
diff --git a/src/networks/fi_waltti.json b/src/lib/networks/fi_waltti.json
similarity index 100%
rename from src/networks/fi_waltti.json
rename to src/lib/networks/fi_waltti.json
diff --git a/src/networks/fr_sncf.json b/src/lib/networks/fr_sncf.json
similarity index 100%
rename from src/networks/fr_sncf.json
rename to src/lib/networks/fr_sncf.json
diff --git a/src/networks/ie_tfi.json b/src/lib/networks/ie_tfi.json
similarity index 100%
rename from src/networks/ie_tfi.json
rename to src/lib/networks/ie_tfi.json
diff --git a/src/networks/it_21_piemonte.json b/src/lib/networks/it_21_piemonte.json
similarity index 100%
rename from src/networks/it_21_piemonte.json
rename to src/lib/networks/it_21_piemonte.json
diff --git a/src/networks/it_21_torino.json b/src/lib/networks/it_21_torino.json
similarity index 100%
rename from src/networks/it_21_torino.json
rename to src/lib/networks/it_21_torino.json
diff --git a/src/networks/lu_mobiliteitszentral.json b/src/lib/networks/lu_mobiliteitszentral.json
similarity index 100%
rename from src/networks/lu_mobiliteitszentral.json
rename to src/lib/networks/lu_mobiliteitszentral.json
diff --git a/src/networks/navitia.json b/src/lib/networks/navitia.json
similarity index 100%
rename from src/networks/navitia.json
rename to src/lib/networks/navitia.json
diff --git a/src/networks/networks.qrc b/src/lib/networks/networks.qrc
similarity index 100%
rename from src/networks/networks.qrc
rename to src/lib/networks/networks.qrc
diff --git a/src/networks/nl_ns.json b/src/lib/networks/nl_ns.json
similarity index 100%
rename from src/networks/nl_ns.json
rename to src/lib/networks/nl_ns.json
diff --git a/src/networks/pl_pkp.json b/src/lib/networks/pl_pkp.json
similarity index 100%
rename from src/networks/pl_pkp.json
rename to src/lib/networks/pl_pkp.json
diff --git a/src/networks/railteam.json b/src/lib/networks/railteam.json
similarity index 100%
rename from src/networks/railteam.json
rename to src/lib/networks/railteam.json
diff --git a/src/networks/se_resrobot.json b/src/lib/networks/se_resrobot.json
similarity index 100%
rename from src/networks/se_resrobot.json
rename to src/lib/networks/se_resrobot.json
diff --git a/src/networks/uk_traveline.json b/src/lib/networks/uk_traveline.json
similarity index 100%
rename from src/networks/uk_traveline.json
rename to src/lib/networks/uk_traveline.json
diff --git a/src/networks/us_ca_bart.json b/src/lib/networks/us_ca_bart.json
similarity index 100%
rename from src/networks/us_ca_bart.json
rename to src/lib/networks/us_ca_bart.json
diff --git a/src/networks/us_ca_la_metro.json b/src/lib/networks/us_ca_la_metro.json
similarity index 100%
rename from src/networks/us_ca_la_metro.json
rename to src/lib/networks/us_ca_la_metro.json
diff --git a/src/networks/us_ga_marta.json b/src/lib/networks/us_ga_marta.json
similarity index 100%
rename from src/networks/us_ga_marta.json
rename to src/lib/networks/us_ga_marta.json
diff --git a/src/networks/us_il_chicago.json b/src/lib/networks/us_il_chicago.json
similarity index 100%
rename from src/networks/us_il_chicago.json
rename to src/lib/networks/us_il_chicago.json
diff --git a/src/org_kde_kpublictransport.categories b/src/lib/org_kde_kpublictransport.categories
similarity index 100%
rename from src/org_kde_kpublictransport.categories
rename to src/lib/org_kde_kpublictransport.categories
diff --git a/src/pointer_helper_p.h b/src/lib/pointer_helper_p.h
similarity index 100%
rename from src/pointer_helper_p.h
rename to src/lib/pointer_helper_p.h
diff --git a/src/reply.cpp b/src/lib/reply.cpp
similarity index 100%
rename from src/reply.cpp
rename to src/lib/reply.cpp
diff --git a/src/reply.h b/src/lib/reply.h
similarity index 100%
rename from src/reply.h
rename to src/lib/reply.h
diff --git a/src/reply_p.h b/src/lib/reply_p.h
similarity index 100%
rename from src/reply_p.h
rename to src/lib/reply_p.h
diff --git a/src/requestcontext.cpp b/src/lib/requestcontext.cpp
similarity index 100%
rename from src/requestcontext.cpp
rename to src/lib/requestcontext.cpp
diff --git a/src/requestcontext_p.h b/src/lib/requestcontext_p.h
similarity index 100%
rename from src/requestcontext_p.h
rename to src/lib/requestcontext_p.h
diff --git a/src/vehiclelayoutreply.cpp b/src/lib/vehiclelayoutreply.cpp
similarity index 100%
rename from src/vehiclelayoutreply.cpp
rename to src/lib/vehiclelayoutreply.cpp
diff --git a/src/vehiclelayoutreply.h b/src/lib/vehiclelayoutreply.h
similarity index 100%
rename from src/vehiclelayoutreply.h
rename to src/lib/vehiclelayoutreply.h
diff --git a/src/vehiclelayoutrequest.cpp b/src/lib/vehiclelayoutrequest.cpp
similarity index 100%
rename from src/vehiclelayoutrequest.cpp
rename to src/lib/vehiclelayoutrequest.cpp
diff --git a/src/vehiclelayoutrequest.h b/src/lib/vehiclelayoutrequest.h
similarity index 100%
rename from src/vehiclelayoutrequest.h
rename to src/lib/vehiclelayoutrequest.h