diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/main.cpp b/share/qtcreator/templates/qtquick/qtquick_1_1/main.cpp
index 04db135b9f87be127e91bcd1b5ff50368a65795b..46d3ef8e8dd02cceb873981e5b52f573bac7d238 100644
--- a/share/qtcreator/templates/qtquick/qtquick_1_1/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquick_1_1/main.cpp
@@ -8,7 +8,7 @@ int main(int argc, char *argv[])
     QtQuick1ApplicationViewer viewer;
     viewer.addImportPath(QLatin1String("modules")); // ADDIMPORTPATH
     viewer.setOrientation(QtQuick1ApplicationViewer::ScreenOrientationAuto); // ORIENTATION
-    viewer.setMainQmlFile(QLatin1String("qrc:///qml/main.qml")); // MAINQML
+    viewer.setMainQmlFile(QLatin1String("qrc:///main.qml")); // MAINQML
     viewer.showExpanded();
 
     return app.exec();
diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/qml/main.qml b/share/qtcreator/templates/qtquick/qtquick_1_1/main.qml
similarity index 100%
rename from share/qtcreator/templates/qtquick/qtquick_1_1/qml/main.qml
rename to share/qtcreator/templates/qtquick/qtquick_1_1/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/qml.qrc b/share/qtcreator/templates/qtquick/qtquick_1_1/qml.qrc
index 69145a822f1f6a3a133b38da279dab003922da12..5f6483ac33f1881cc59e080e69bb033ebe2a7829 100644
--- a/share/qtcreator/templates/qtquick/qtquick_1_1/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquick_1_1/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/main.cpp b/share/qtcreator/templates/qtquick/qtquick_2_1/main.cpp
index 51f46ef65795cc990d3ee1580fe7595cc557677b..d6e3d99554d7fde9a3841b4ccd3c9f2a796f4cff 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_1/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquick_2_1/main.cpp
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
 
     return app.exec();
 }
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/qml/main.qml b/share/qtcreator/templates/qtquick/qtquick_2_1/main.qml
similarity index 100%
rename from share/qtcreator/templates/qtquick/qtquick_2_1/qml/main.qml
rename to share/qtcreator/templates/qtquick/qtquick_2_1/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/qml.qrc b/share/qtcreator/templates/qtquick/qtquick_2_1/qml.qrc
index 69145a822f1f6a3a133b38da279dab003922da12..5f6483ac33f1881cc59e080e69bb033ebe2a7829 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_1/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquick_2_1/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_2/main.cpp b/share/qtcreator/templates/qtquick/qtquick_2_2/main.cpp
index 51f46ef65795cc990d3ee1580fe7595cc557677b..d6e3d99554d7fde9a3841b4ccd3c9f2a796f4cff 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_2/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquick_2_2/main.cpp
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
 
     return app.exec();
 }
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_2/qml/main.qml b/share/qtcreator/templates/qtquick/qtquick_2_2/main.qml
similarity index 100%
rename from share/qtcreator/templates/qtquick/qtquick_2_2/qml/main.qml
rename to share/qtcreator/templates/qtquick/qtquick_2_2/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_2/qml.qrc b/share/qtcreator/templates/qtquick/qtquick_2_2/qml.qrc
index 69145a822f1f6a3a133b38da279dab003922da12..5f6483ac33f1881cc59e080e69bb033ebe2a7829 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_2/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquick_2_2/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.cpp b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.cpp
index 978245ab39900d2c2136b9feaae950dcea475169..a22e2e8d3c86fa6a61d7acad3b12fe3ef24b68c2 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.cpp
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
 
     return app.exec();
 }
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml/main.qml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.qml
similarity index 100%
rename from share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml/main.qml
rename to share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml.qrc b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml.qrc
index 69145a822f1f6a3a133b38da279dab003922da12..5f6483ac33f1881cc59e080e69bb033ebe2a7829 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.cpp b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.cpp
index 978245ab39900d2c2136b9feaae950dcea475169..a22e2e8d3c86fa6a61d7acad3b12fe3ef24b68c2 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.cpp
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
 
     return app.exec();
 }
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml/main.qml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.qml
similarity index 100%
rename from share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml/main.qml
rename to share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml.qrc b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml.qrc
index 69145a822f1f6a3a133b38da279dab003922da12..5f6483ac33f1881cc59e080e69bb033ebe2a7829 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtquickapp.cpp b/src/plugins/qmakeprojectmanager/wizards/qtquickapp.cpp
index 5ec279a266a67e83954ab1b319eab0867569bd58..7ae64696158fd7ce2e2e6c0c3da3e7500f8046d2 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/qtquickapp.cpp
@@ -208,7 +208,6 @@ void QtQuickApp::setTemplateInfo(const TemplateInfo &templateInfo)
 
 QString QtQuickApp::pathExtended(int fileType) const
 {
-    const QString qmlSubDir = QLatin1String("qml/");
     const QString appViewerTargetSubDir = appViewerOriginSubDir();
 
     const QString mainQmlFile = QLatin1String("main.qml");
@@ -219,8 +218,8 @@ QString QtQuickApp::pathExtended(int fileType) const
     const QString pathBase = outputPathBase();
 
     switch (fileType) {
-        case MainQml:                       return pathBase + qmlSubDir + mainQmlFile;
-        case MainQmlOrigin:                 return originsRoot() + qmlSubDir + mainQmlFile;
+        case MainQml:                       return pathBase + mainQmlFile;
+        case MainQmlOrigin:                 return originsRoot() + mainQmlFile;
         case MainQrc:                       return pathBase + mainQrcFile;
         case MainQrcOrigin:                 return originsRoot() + mainQrcFile;
         case QrcDeployment:                 return pathBase + qrcDeploymentFile;