diff --git a/share/qtcreator/templates/wizards/plaincapp-cmake/CMakeLists.txt b/share/qtcreator/templates/wizards/plaincapp/cmake/CMakeLists.txt
similarity index 100%
rename from share/qtcreator/templates/wizards/plaincapp-cmake/CMakeLists.txt
rename to share/qtcreator/templates/wizards/plaincapp/cmake/CMakeLists.txt
diff --git a/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml b/share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml
similarity index 94%
rename from share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
rename to share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml
index 75de53e3db9..0c9ae22b1b3 100644
--- a/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml
@@ -31,12 +31,12 @@
 -->
 <wizard version="1" kind="project" firstpage="10" id="S.Plain C (CMake)" category="I.Projects"
         platformIndependent="true" featuresRequired="CMake.CMakeSupport">
-    <icon>console.png</icon>
+    <icon>../common/console.png</icon>
     <description>Creates a plain C project using CMake, not using the Qt library.</description>
     <displayname>Plain C Project (CMake Build)</displayname>;
     <displaycategory>Non-Qt Project</displaycategory>
     <files>
-        <file source="main.c" openeditor="true"/>
+        <file source="../common/main.c" target="main.c" openeditor="true"/>
         <file source="CMakeLists.txt" openproject="true"/>
     </files>
 </wizard>
diff --git a/share/qtcreator/templates/wizards/plaincapp-cmake/console.png b/share/qtcreator/templates/wizards/plaincapp/common/console.png
similarity index 100%
rename from share/qtcreator/templates/wizards/plaincapp-cmake/console.png
rename to share/qtcreator/templates/wizards/plaincapp/common/console.png
diff --git a/share/qtcreator/templates/wizards/plaincapp-cmake/main.c b/share/qtcreator/templates/wizards/plaincapp/common/main.c
similarity index 100%
rename from share/qtcreator/templates/wizards/plaincapp-cmake/main.c
rename to share/qtcreator/templates/wizards/plaincapp/common/main.c
diff --git a/share/qtcreator/templates/wizards/plaincapp/main.c b/share/qtcreator/templates/wizards/plaincapp/main.c
deleted file mode 100644
index 8f1edd610c6..00000000000
--- a/share/qtcreator/templates/wizards/plaincapp/main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int main(void)
-{
-    printf("Hello World!\n");
-    return 0;
-}
diff --git a/share/qtcreator/templates/wizards/plaincapp/project.pro b/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro
similarity index 100%
rename from share/qtcreator/templates/wizards/plaincapp/project.pro
rename to share/qtcreator/templates/wizards/plaincapp/qmake/project.pro
diff --git a/share/qtcreator/templates/wizards/plaincapp/wizard.xml b/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml
similarity index 95%
rename from share/qtcreator/templates/wizards/plaincapp/wizard.xml
rename to share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml
index b8d3ae87245..389f156fc18 100644
--- a/share/qtcreator/templates/wizards/plaincapp/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml
@@ -38,12 +38,12 @@ leave room for the Qt 4 target page.
         class="qt4project" firstpage="10"
         id="R.Plain C" category="I.Projects"
         featuresRequired="QtSupport.Wizards.FeatureQt">
-    <icon>console.png</icon>
+    <icon>../common/console.png</icon>
     <description>Creates a plain C project using qmake, not using the Qt library.</description>
     <displayname>Plain C Project</displayname>;
     <displaycategory>Non-Qt Project</displaycategory>
     <files>
-        <file source="main.c" openeditor="true"/>
+        <file source="../common/main.c" target="main.c" openeditor="true"/>
         <file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
     </files>
 </wizard>
diff --git a/share/qtcreator/templates/wizards/plaincppapp-cmake/console.png b/share/qtcreator/templates/wizards/plaincppapp-cmake/console.png
deleted file mode 100644
index 7569a988f4a..00000000000
Binary files a/share/qtcreator/templates/wizards/plaincppapp-cmake/console.png and /dev/null differ
diff --git a/share/qtcreator/templates/wizards/plaincppapp-cmake/CMakeLists.txt b/share/qtcreator/templates/wizards/plaincppapp/cmake/CMakeLists.txt
similarity index 100%
rename from share/qtcreator/templates/wizards/plaincppapp-cmake/CMakeLists.txt
rename to share/qtcreator/templates/wizards/plaincppapp/cmake/CMakeLists.txt
diff --git a/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml b/share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml
similarity index 94%
rename from share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
rename to share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml
index 7bce30db613..d5212bd4cda 100644
--- a/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml
@@ -31,12 +31,12 @@
 -->
 <wizard version="1" kind="project" firstpage="10" id="S.Plain C++ (CMake)" category="I.Projects"
         platformIndependent="true" featuresRequired="CMake.CMakeSupport">
-    <icon>console.png</icon>
+    <icon>../common/console.png</icon>
     <description>Creates a plain C++ project using CMake, not using the Qt library.</description>
     <displayname>Plain C++ Project (CMake Build)</displayname>;
     <displaycategory>Non-Qt Project</displaycategory>
     <files>
-        <file source="main.cpp" openeditor="true"/>
+        <file source="../common/main.cpp" target="main.cpp" openeditor="true"/>
         <file source="CMakeLists.txt" openproject="true"/>
     </files>
 </wizard>
diff --git a/share/qtcreator/templates/wizards/plaincapp/console.png b/share/qtcreator/templates/wizards/plaincppapp/common/console.png
similarity index 100%
rename from share/qtcreator/templates/wizards/plaincapp/console.png
rename to share/qtcreator/templates/wizards/plaincppapp/common/console.png
diff --git a/share/qtcreator/templates/wizards/plaincppapp-cmake/main.cpp b/share/qtcreator/templates/wizards/plaincppapp/common/main.cpp
similarity index 100%
rename from share/qtcreator/templates/wizards/plaincppapp-cmake/main.cpp
rename to share/qtcreator/templates/wizards/plaincppapp/common/main.cpp
diff --git a/share/qtcreator/templates/wizards/plaincppapp/console.png b/share/qtcreator/templates/wizards/plaincppapp/console.png
deleted file mode 100644
index 7569a988f4a..00000000000
Binary files a/share/qtcreator/templates/wizards/plaincppapp/console.png and /dev/null differ
diff --git a/share/qtcreator/templates/wizards/plaincppapp/main.cpp b/share/qtcreator/templates/wizards/plaincppapp/main.cpp
deleted file mode 100644
index 3129fb9dd95..00000000000
--- a/share/qtcreator/templates/wizards/plaincppapp/main.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <iostream>
-
-using namespace std;
-
-int main()
-{
-    cout << "Hello World!" << endl;
-    return 0;
-}
diff --git a/share/qtcreator/templates/wizards/plaincppapp/project.pro b/share/qtcreator/templates/wizards/plaincppapp/qmake/project.pro
similarity index 100%
rename from share/qtcreator/templates/wizards/plaincppapp/project.pro
rename to share/qtcreator/templates/wizards/plaincppapp/qmake/project.pro
diff --git a/share/qtcreator/templates/wizards/plaincppapp/wizard.xml b/share/qtcreator/templates/wizards/plaincppapp/qmake/wizard.xml
similarity index 94%
rename from share/qtcreator/templates/wizards/plaincppapp/wizard.xml
rename to share/qtcreator/templates/wizards/plaincppapp/qmake/wizard.xml
index bba186cecd5..a9e3640b8ed 100644
--- a/share/qtcreator/templates/wizards/plaincppapp/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincppapp/qmake/wizard.xml
@@ -38,12 +38,12 @@ leave room for the Qt 4 target page.
         class="qt4project" firstpage="10"
         id="R.Plain C++" category="I.Projects"
         featuresRequired="QtSupport.Wizards.FeatureQt">
-    <icon>console.png</icon>
+    <icon>../common/console.png</icon>
     <description>Creates a plain C++ project using qmake, not using the Qt library.</description>
     <displayname>Plain C++ Project</displayname>;
     <displaycategory>Non-Qt Project</displaycategory>
     <files>
-        <file source="main.cpp" openeditor="true"/>
+        <file source="../common/main.cpp" target="main.cpp" openeditor="true"/>
         <file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
     </files>
 </wizard>
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index cd3c717ffcb..88c1805a3d4 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -450,7 +450,8 @@ QList<CustomWizard*> CustomWizard::createWizards()
     const QString configFile = QLatin1String(configFileC);
     // Check and parse config file in each directory.
 
-    foreach (const QFileInfo &dirFi, dirs) {
+    while (!dirs.isEmpty()) {
+        const QFileInfo dirFi = dirs.takeFirst();
         const QDir dir(dirFi.absoluteFilePath());
         if (CustomWizardPrivate::verbose)
             verboseLog += QString::fromLatin1("CustomWizard: Scanning %1\n").arg(dirFi.absoluteFilePath());
@@ -481,9 +482,14 @@ QList<CustomWizard*> CustomWizard::createWizards()
                 break;
             }
         } else {
-            if (CustomWizardPrivate::verbose)
-                if (CustomWizardPrivate::verbose)
-                    verboseLog += QString::fromLatin1("CustomWizard: '%1' not found\n").arg(configFile);
+            QList<QFileInfo> subDirs = dir.entryInfoList(filters, sortflags);
+            if (!subDirs.isEmpty()) {
+                // There is no QList::prepend(QList)...
+                dirs.swap(subDirs);
+                dirs.append(subDirs);
+            } else if (CustomWizardPrivate::verbose) {
+                verboseLog += QString::fromLatin1("CustomWizard: '%1' not found\n").arg(configFile);
+            }
         }
     }
     if (CustomWizardPrivate::verbose) { // Print to output pane for Windows.