diff --git a/qmlprofiler.pro b/qmlprofiler.pro
deleted file mode 100644
index 4cff3f101a0..00000000000
--- a/qmlprofiler.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-
-SUBDIRS += plugins/qmlprofiler
-
-QMAKE_EXTRA_TARGETS = docs install_docs # dummy targets for consistency
diff --git a/qtcreatorlibrary.pri b/qtcreatorlibrary.pri
deleted file mode 100644
index aa11abf7005..00000000000
--- a/qtcreatorlibrary.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-IDE_SOURCE_TREE=$$(QTC_SOURCE)
-IDE_BUILD_TREE=$$(QTC_BUILD)
-
-isEmpty(IDE_SOURCE_TREE):error(Set QTC_SOURCE environment variable)
-isEmpty(IDE_BUILD_TREE):error(Set QTC_BUILD environment variable)
-
-include($$IDE_SOURCE_TREE/src/qtcreatorlibrary.pri)
diff --git a/qtcreatorplugin.pri b/qtcreatorplugin.pri
deleted file mode 100644
index 190dbed1c3b..00000000000
--- a/qtcreatorplugin.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-isEmpty(IDE_SOURCE_TREE): IDE_SOURCE_TREE=$$(QTC_SOURCE)
-isEmpty(IDE_BUILD_TREE): IDE_BUILD_TREE=$$(QTC_BUILD)
-
-isEmpty(IDE_SOURCE_TREE):error(Set QTC_SOURCE environment variable)
-isEmpty(IDE_BUILD_TREE):error(Set QTC_BUILD environment variable)
-
-INCLUDEPATH+= $$PWD/plugins
-include($$IDE_SOURCE_TREE/src/qtcreatorplugin.pri)
diff --git a/plugins/qmlprofiler/FlameGraphText.qml b/src/plugins/qmlprofilerextension/FlameGraphText.qml
similarity index 100%
rename from plugins/qmlprofiler/FlameGraphText.qml
rename to src/plugins/qmlprofilerextension/FlameGraphText.qml
diff --git a/plugins/qmlprofiler/FlameGraphView.qml b/src/plugins/qmlprofilerextension/FlameGraphView.qml
similarity index 100%
rename from plugins/qmlprofiler/FlameGraphView.qml
rename to src/plugins/qmlprofilerextension/FlameGraphView.qml
diff --git a/plugins/qmlprofiler/QmlProfilerExtension.json.in b/src/plugins/qmlprofilerextension/QmlProfilerExtension.json.in
similarity index 100%
rename from plugins/qmlprofiler/QmlProfilerExtension.json.in
rename to src/plugins/qmlprofilerextension/QmlProfilerExtension.json.in
diff --git a/plugins/qmlprofiler/debugmessagesmodel.cpp b/src/plugins/qmlprofilerextension/debugmessagesmodel.cpp
similarity index 100%
rename from plugins/qmlprofiler/debugmessagesmodel.cpp
rename to src/plugins/qmlprofilerextension/debugmessagesmodel.cpp
diff --git a/plugins/qmlprofiler/debugmessagesmodel.h b/src/plugins/qmlprofilerextension/debugmessagesmodel.h
similarity index 100%
rename from plugins/qmlprofiler/debugmessagesmodel.h
rename to src/plugins/qmlprofilerextension/debugmessagesmodel.h
diff --git a/plugins/qmlprofiler/flamegraph.cpp b/src/plugins/qmlprofilerextension/flamegraph.cpp
similarity index 100%
rename from plugins/qmlprofiler/flamegraph.cpp
rename to src/plugins/qmlprofilerextension/flamegraph.cpp
diff --git a/plugins/qmlprofiler/flamegraph.h b/src/plugins/qmlprofilerextension/flamegraph.h
similarity index 100%
rename from plugins/qmlprofiler/flamegraph.h
rename to src/plugins/qmlprofilerextension/flamegraph.h
diff --git a/plugins/qmlprofiler/flamegraph.qrc b/src/plugins/qmlprofilerextension/flamegraph.qrc
similarity index 100%
rename from plugins/qmlprofiler/flamegraph.qrc
rename to src/plugins/qmlprofilerextension/flamegraph.qrc
diff --git a/plugins/qmlprofiler/flamegraphmodel.cpp b/src/plugins/qmlprofilerextension/flamegraphmodel.cpp
similarity index 100%
rename from plugins/qmlprofiler/flamegraphmodel.cpp
rename to src/plugins/qmlprofilerextension/flamegraphmodel.cpp
diff --git a/plugins/qmlprofiler/flamegraphmodel.h b/src/plugins/qmlprofilerextension/flamegraphmodel.h
similarity index 100%
rename from plugins/qmlprofiler/flamegraphmodel.h
rename to src/plugins/qmlprofilerextension/flamegraphmodel.h
diff --git a/plugins/qmlprofiler/flamegraphview.cpp b/src/plugins/qmlprofilerextension/flamegraphview.cpp
similarity index 100%
rename from plugins/qmlprofiler/flamegraphview.cpp
rename to src/plugins/qmlprofilerextension/flamegraphview.cpp
diff --git a/plugins/qmlprofiler/flamegraphview.h b/src/plugins/qmlprofilerextension/flamegraphview.h
similarity index 100%
rename from plugins/qmlprofiler/flamegraphview.h
rename to src/plugins/qmlprofilerextension/flamegraphview.h
diff --git a/plugins/qmlprofiler/inputeventsmodel.cpp b/src/plugins/qmlprofilerextension/inputeventsmodel.cpp
similarity index 100%
rename from plugins/qmlprofiler/inputeventsmodel.cpp
rename to src/plugins/qmlprofilerextension/inputeventsmodel.cpp
diff --git a/plugins/qmlprofiler/inputeventsmodel.h b/src/plugins/qmlprofilerextension/inputeventsmodel.h
similarity index 100%
rename from plugins/qmlprofiler/inputeventsmodel.h
rename to src/plugins/qmlprofilerextension/inputeventsmodel.h
diff --git a/plugins/qmlprofiler/memoryusagemodel.cpp b/src/plugins/qmlprofilerextension/memoryusagemodel.cpp
similarity index 100%
rename from plugins/qmlprofiler/memoryusagemodel.cpp
rename to src/plugins/qmlprofilerextension/memoryusagemodel.cpp
diff --git a/plugins/qmlprofiler/memoryusagemodel.h b/src/plugins/qmlprofilerextension/memoryusagemodel.h
similarity index 100%
rename from plugins/qmlprofiler/memoryusagemodel.h
rename to src/plugins/qmlprofilerextension/memoryusagemodel.h
diff --git a/plugins/qmlprofiler/pixmapcachemodel.cpp b/src/plugins/qmlprofilerextension/pixmapcachemodel.cpp
similarity index 100%
rename from plugins/qmlprofiler/pixmapcachemodel.cpp
rename to src/plugins/qmlprofilerextension/pixmapcachemodel.cpp
diff --git a/plugins/qmlprofiler/pixmapcachemodel.h b/src/plugins/qmlprofilerextension/pixmapcachemodel.h
similarity index 100%
rename from plugins/qmlprofiler/pixmapcachemodel.h
rename to src/plugins/qmlprofilerextension/pixmapcachemodel.h
diff --git a/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofilerextension/qmlprofilerextension.pro
similarity index 94%
rename from plugins/qmlprofiler/qmlprofiler.pro
rename to src/plugins/qmlprofilerextension/qmlprofilerextension.pro
index bf1e7f57ff8..bfe0d5996f0 100644
--- a/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofilerextension/qmlprofilerextension.pro
@@ -1,6 +1,3 @@
-TARGET = QmlProfilerExtension
-TEMPLATE = lib
-
 include(../../qtcreatorplugin.pri)
 
 QT += qml quick quickwidgets
diff --git a/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofilerextension/qmlprofilerextension.qbs
similarity index 97%
rename from plugins/qmlprofiler/qmlprofiler.qbs
rename to src/plugins/qmlprofilerextension/qmlprofilerextension.qbs
index 7196e648846..193cdc3bfbd 100644
--- a/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofilerextension/qmlprofilerextension.qbs
@@ -1,6 +1,6 @@
 import qbs
 
-QtcCommercialPlugin {
+QtcPlugin {
     name: "QmlProfilerExtension"
 
     Depends { name: "Core" }
diff --git a/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/src/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri
similarity index 100%
rename from plugins/qmlprofiler/qmlprofiler_dependencies.pri
rename to src/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri
diff --git a/plugins/qmlprofiler/qmlprofilerextension_global.h b/src/plugins/qmlprofilerextension/qmlprofilerextension_global.h
similarity index 100%
rename from plugins/qmlprofiler/qmlprofilerextension_global.h
rename to src/plugins/qmlprofilerextension/qmlprofilerextension_global.h
diff --git a/plugins/qmlprofiler/qmlprofilerextensionconstants.h b/src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h
similarity index 100%
rename from plugins/qmlprofiler/qmlprofilerextensionconstants.h
rename to src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h
diff --git a/plugins/qmlprofiler/qmlprofilerextensionplugin.cpp b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
similarity index 100%
rename from plugins/qmlprofiler/qmlprofilerextensionplugin.cpp
rename to src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
diff --git a/plugins/qmlprofiler/qmlprofilerextensionplugin.h b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h
similarity index 100%
rename from plugins/qmlprofiler/qmlprofilerextensionplugin.h
rename to src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h
diff --git a/plugins/qmlprofiler/scenegraphtimelinemodel.cpp b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
similarity index 100%
rename from plugins/qmlprofiler/scenegraphtimelinemodel.cpp
rename to src/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
diff --git a/plugins/qmlprofiler/scenegraphtimelinemodel.h b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
similarity index 100%
rename from plugins/qmlprofiler/scenegraphtimelinemodel.h
rename to src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h