diff --git a/examples/minimalqmake/Page1.qml b/examples/minimalqmake/src/Page1.qml
similarity index 100%
rename from examples/minimalqmake/Page1.qml
rename to examples/minimalqmake/src/Page1.qml
diff --git a/examples/minimalqmake/Page1Form.ui.qml b/examples/minimalqmake/src/Page1Form.ui.qml
similarity index 100%
rename from examples/minimalqmake/Page1Form.ui.qml
rename to examples/minimalqmake/src/Page1Form.ui.qml
diff --git a/examples/minimalqmake/kirigami-icons.qrc b/examples/minimalqmake/src/kirigami-icons.qrc
similarity index 100%
rename from examples/minimalqmake/kirigami-icons.qrc
rename to examples/minimalqmake/src/kirigami-icons.qrc
diff --git a/examples/minimalqmake/main.cpp b/examples/minimalqmake/src/main.cpp
similarity index 94%
rename from examples/minimalqmake/main.cpp
rename to examples/minimalqmake/src/main.cpp
index 887d4ced..65688104 100644
--- a/examples/minimalqmake/main.cpp
+++ b/examples/minimalqmake/src/main.cpp
@@ -1,42 +1,43 @@
 /*
  *   Copyright 2017 Marco Martin <mart@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 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 Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
+
 #ifdef Q_OS_ANDROID
 #include "./3rdparty/kirigami/src/kirigamiplugin.h"
 #endif
 
+#include <QtPlugin>
+
+Q_IMPORT_PLUGIN(KirigamiPlugin)
+
 int main(int argc, char *argv[])
 {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
 
-#ifdef Q_OS_ANDROID
-    KirigamiPlugin::getInstance().registerTypes();
-#endif
-
     engine.load(QUrl(QLatin1String("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty())
         return -1;
 
     return app.exec();
 }
diff --git a/examples/minimalqmake/main.qml b/examples/minimalqmake/src/main.qml
similarity index 100%
rename from examples/minimalqmake/main.qml
rename to examples/minimalqmake/src/main.qml
diff --git a/examples/minimalqmake/qml.qrc b/examples/minimalqmake/src/qml.qrc
similarity index 100%
rename from examples/minimalqmake/qml.qrc
rename to examples/minimalqmake/src/qml.qrc
diff --git a/examples/minimalqmake/qtquickcontrols2.conf b/examples/minimalqmake/src/qtquickcontrols2.conf
similarity index 100%
rename from examples/minimalqmake/qtquickcontrols2.conf
rename to examples/minimalqmake/src/qtquickcontrols2.conf
diff --git a/examples/minimalqmake/minimalqmake.pro b/examples/minimalqmake/src/src.pro
similarity index 87%
rename from examples/minimalqmake/minimalqmake.pro
rename to examples/minimalqmake/src/src.pro
index fdd0e182..f84882a5 100644
--- a/examples/minimalqmake/minimalqmake.pro
+++ b/examples/minimalqmake/src/src.pro
@@ -1,35 +1,37 @@
 TEMPLATE = app
 
-QT += qml quick
+QT += qml quick quickcontrols2
 
-android: {
-    include(3rdparty/kirigami/kirigami.pri)
-}
+#android: {
+#    include(3rdparty/kirigami/kirigami.pri)
+#}
 
 CONFIG += c++11
 
 SOURCES += main.cpp
 
 RESOURCES += qml.qrc
 
+LIBS += ../3rdparty/kirigami/org/kde/kirigami.2/libkirigamiplugin.a
+
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =
 
 # Additional import path used to resolve QML modules just for Qt Quick Designer
 QML_DESIGNER_IMPORT_PATH =
 
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which as been marked deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
 # deprecated API in order to know how to port your code away from it.
 DEFINES += QT_DEPRECATED_WARNINGS
 
 # You can also make your code fail to compile if you use deprecated APIs.
 # In order to do so, uncomment the following line.
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target