diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index c2c40ad073..2e8683b3d0 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -30,14 +30,9 @@ file(GLOB qfield_qmlfiles_editorwidgets
 file(GLOB qfield_qmlfiles_theme
      "${CMAKE_SOURCE_DIR}/src/qml/imports/Theme/*.qml")
 
-list(
-  APPEND
-  qfield_qmlfiles
-  ${qfield_qmlfiles_geometryeditors}
-  ${qfield_qmlfiles_editorwidgets}
-  ${qfield_qmlfiles_theme}
-  ${qfield_qmlfiles_theme_extra}
-  ${qfield_qmlfiles_qfieldcontrols})
+list(APPEND qfield_qmlfiles ${qfield_qmlfiles_geometryeditors}
+     ${qfield_qmlfiles_editorwidgets} ${qfield_qmlfiles_theme}
+     ${qfield_qmlfiles_theme_extra})
 
 set_property(TARGET qfield_qml PROPERTY QML_FILES ${qfield_qmlfiles})
 
diff --git a/src/qml/imports/QFieldControls/CodeReader.qml b/src/qml/CodeReader.qml
similarity index 100%
rename from src/qml/imports/QFieldControls/CodeReader.qml
rename to src/qml/CodeReader.qml
diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
index b407a0e7e4..656ea3fbcf 100644
--- a/src/qml/FeatureForm.qml
+++ b/src/qml/FeatureForm.qml
@@ -10,7 +10,6 @@ import QtWebView 1.14
 import org.qgis 1.0
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 Page {
   id: form
diff --git a/src/qml/FeatureListForm.qml b/src/qml/FeatureListForm.qml
index 0c8087f7f3..8b9883d6a7 100644
--- a/src/qml/FeatureListForm.qml
+++ b/src/qml/FeatureListForm.qml
@@ -24,7 +24,6 @@ import QtQuick.Controls.Material.impl 2.14
 import org.qgis 1.0
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 Rectangle {
   id: featureForm
diff --git a/src/qml/imports/QFieldControls/QFieldAudioRecorder.qml b/src/qml/QFieldAudioRecorder.qml
similarity index 100%
rename from src/qml/imports/QFieldControls/QFieldAudioRecorder.qml
rename to src/qml/QFieldAudioRecorder.qml
diff --git a/src/qml/imports/QFieldControls/QFieldCamera.qml b/src/qml/QFieldCamera.qml
similarity index 100%
rename from src/qml/imports/QFieldControls/QFieldCamera.qml
rename to src/qml/QFieldCamera.qml
diff --git a/src/qml/TemporalProperties.qml b/src/qml/TemporalProperties.qml
index 6ed41c09a7..f6be20c358 100644
--- a/src/qml/TemporalProperties.qml
+++ b/src/qml/TemporalProperties.qml
@@ -5,7 +5,6 @@ import QtQuick.Layouts 1.14
 import org.qgis 1.0
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 Popup {
     id: popup
@@ -155,7 +154,7 @@ Popup {
         }
     }
 
-    CalendarPanel {
+    QfCalendarPanel {
         id: calendarPanel
 
         property string temporalField: ''
diff --git a/src/qml/editorwidgets/DateTime.qml b/src/qml/editorwidgets/DateTime.qml
index 4ac4e55db7..15ed727eb8 100644
--- a/src/qml/editorwidgets/DateTime.qml
+++ b/src/qml/editorwidgets/DateTime.qml
@@ -4,7 +4,6 @@ import QtQuick.Layouts 1.14
 
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 import "."
 import ".."
@@ -230,7 +229,7 @@ EditorWidgetBase {
     font: label.font
   }
 
-  CalendarPanel {
+  QfCalendarPanel {
     id: calendarPanel
     isDateTime: !main.fieldIsDate
     onDateTimePicked: {
diff --git a/src/qml/editorwidgets/ExternalResource.qml b/src/qml/editorwidgets/ExternalResource.qml
index fef35211d2..4e490a2ab3 100644
--- a/src/qml/editorwidgets/ExternalResource.qml
+++ b/src/qml/editorwidgets/ExternalResource.qml
@@ -7,7 +7,6 @@ import QtMultimedia
 import org.qgis 1.0
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 import "."
 import ".."
diff --git a/src/qml/imports/QFieldControls/qmldir b/src/qml/imports/QFieldControls/qmldir
deleted file mode 100644
index c7827272e0..0000000000
--- a/src/qml/imports/QFieldControls/qmldir
+++ /dev/null
@@ -1,8 +0,0 @@
-module QFieldControls
-TextEdit 1.0 ../../editorwidgets/TextEdit.qml
-Range 1.0 ../../editorwidgets/Range.qml
-DateTime 1.0 ../../editorwidgets/DateTime.qml
-CodeReader 1.0 CodeReader.qml
-CalendarPanel 1.0 CalendarPanel.qml
-QFieldAudioRecorder 1.0 QFieldAudioRecorder.qml
-QFieldCamera 1.0 QFieldCamera.qml
diff --git a/src/qml/imports/QFieldControls/CalendarPanel.qml b/src/qml/imports/Theme/QfCalendarPanel.qml
similarity index 100%
rename from src/qml/imports/QFieldControls/CalendarPanel.qml
rename to src/qml/imports/Theme/QfCalendarPanel.qml
diff --git a/src/qml/imports/Theme/qmldir b/src/qml/imports/Theme/qmldir
index 810bd613f5..6d36cdb5d5 100644
--- a/src/qml/imports/Theme/qmldir
+++ b/src/qml/imports/Theme/qmldir
@@ -10,3 +10,4 @@ QfTextField 1.0 QfTextField.qml
 QfCollapsibleMessage 1.0 QfCollapsibleMessage.qml
 QfDropShadow 1.0 QfDropShadow.qml
 QfOpacityMask 1.0 QfOpacityMask.qml
+QfCalendarPanel 1.0 QfCalendarPanel.qml
diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
index 390c237049..2d72a6d818 100644
--- a/src/qml/qgismobileapp.qml
+++ b/src/qml/qgismobileapp.qml
@@ -27,7 +27,6 @@ import org.qgis 1.0
 import org.qfield 1.0
 
 import Theme 1.0
-import QFieldControls 1.0
 
 ApplicationWindow {
   id: mainWindow
diff --git a/src/qml/qml.qrc b/src/qml/qml.qrc
index 6149be6995..ad637350a1 100644
--- a/src/qml/qml.qrc
+++ b/src/qml/qml.qrc
@@ -8,6 +8,7 @@
         <file>BookmarkRenderer.qml</file>
         <file>BrowserPanel.qml</file>
         <file>BusyOverlay.qml</file>
+        <file>CodeReader.qml</file>
         <file>ConfirmationToolbar.qml</file>
         <file>CoordinateLocator.qml</file>
         <file>DashBoard.qml</file>
@@ -28,6 +29,8 @@
         <file>PositioningSettings.qml</file>
         <file>PositioningInformationView.qml</file>
         <file>PositioningPreciseView.qml</file>
+        <file>QFieldAudioRecorder.qml</file>
+        <file>QFieldCamera.qml</file>
         <file>QFieldSettings.qml</file>
         <file>ScaleBar.qml</file>
         <file>SensorInformationView.qml</file>
@@ -81,12 +84,9 @@
         <file>imports/Theme/QfSwitch.qml</file>
         <file>imports/Theme/QfTextField.qml</file>
         <file>imports/Theme/QfCollapsibleMessage.qml</file>
+        <file>imports/Theme/QfSlider.qml</file>
+        <file>imports/Theme/QfCalendarPanel.qml</file>
         <file>imports/Theme/qmldir</file>
-        <file>imports/QFieldControls/qmldir</file>
-        <file>imports/QFieldControls/CodeReader.qml</file>
-        <file>imports/QFieldControls/CalendarPanel.qml</file>
-        <file>imports/QFieldControls/QFieldAudioRecorder.qml</file>
-        <file>imports/QFieldControls/QFieldCamera.qml</file>
         <file>PageHeader.qml</file>
         <file>TrackerSettings.qml</file>
         <file>TrackingSession.qml</file>
@@ -101,6 +101,5 @@
         <file>QFieldCloudPackageLayersFeedback.qml</file>
         <file>QFieldLocalDataPickerScreen.qml</file>
         <file>QFieldSketcher.qml</file>
-        <file>imports/Theme/QfSlider.qml</file>
     </qresource>
 </RCC>
diff --git a/src/qml/qmlqt6.qrc b/src/qml/qmlqt6.qrc
deleted file mode 100644
index 60dd1e564e..0000000000
--- a/src/qml/qmlqt6.qrc
+++ /dev/null
@@ -1,4 +0,0 @@
-<RCC>
-    <qresource prefix="/qml">
-    </qresource>
-</RCC>
diff --git a/test/qml/tst_editorwidgets.qml b/test/qml/tst_editorwidgets.qml
index d2c03eb18b..69e0ba3292 100644
--- a/test/qml/tst_editorwidgets.qml
+++ b/test/qml/tst_editorwidgets.qml
@@ -3,26 +3,28 @@ import QtTest 1.0
 
 import org.qfield 1.0
 
-import QFieldControls 1.0
+import Theme 1.0
+
+import "../../src/qml/editorwidgets" as EditorWidgets
 
 TestCase {
     name: "EditorWidgets"
 
-    TextEdit {
+    EditorWidgets.TextEdit {
         id: textEdit
         property var value: 'one'
         property var config: undefined
         property bool isEnabled: true
     }
 
-    Range {
+    EditorWidgets.Range {
         id: range
         property var value: 1
         property var config: undefined
         property bool isEnabled: true
     }
 
-    DateTime {
+    EditorWidgets.DateTime {
         id: dateTime
 
         property var value: '2022-01-01'
diff --git a/test/qml/tst_positioning.qml b/test/qml/tst_positioning.qml
index 153ff7a99c..8121be9b86 100644
--- a/test/qml/tst_positioning.qml
+++ b/test/qml/tst_positioning.qml
@@ -3,8 +3,6 @@ import QtTest 1.0
 
 import org.qfield 1.0
 
-import QFieldControls 1.0
-
 TestCase {
     name: "Positioning"