diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 02f6b3e425a396d7a4daef89d68a5ad14ccfc783..4db510299fd0d789690d5bee2662d5bf2f2326d5 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -42,7 +42,8 @@ SUBDIRS   = plugin_coreplugin \
             plugin_qmljstools \
             plugin_macros \
             debugger/dumper.pro \
-            plugin_qmlprofiler
+            plugin_qmlprofiler \
+            plugin_remotelinux
 
 !win32 {
      SUBDIRS += plugin_valgrind
@@ -149,7 +150,13 @@ plugin_qt4projectmanager.depends += plugin_qtsupport
 plugin_qt4projectmanager.depends += plugin_cpptools
 plugin_qt4projectmanager.depends += plugin_debugger
 plugin_qt4projectmanager.depends += plugin_qmljseditor
-plugin_qt4projectmanager.depends += plugin_analyzerbase
+
+plugin_remotelinux.subdir = remotelinux
+plugin_remotelinux.depends = plugin_analyzerbase
+plugin_remotelinux.depends += plugin_coreplugin
+plugin_remotelinux.depends += plugin_debugger
+plugin_remotelinux.depends += plugin_projectexplorer
+plugin_remotelinux.depends += plugin_qt4projectmanager
 
 plugin_locator.subdir = locator
 plugin_locator.depends = plugin_coreplugin
diff --git a/src/plugins/qt4projectmanager/findqt4profiles.h b/src/plugins/qt4projectmanager/findqt4profiles.h
index 6a2ba3efddb6f407ed444d65634e8ce454c72bc1..9231d356e1846345db4e2cdaf49e3d762480fd67 100644
--- a/src/plugins/qt4projectmanager/findqt4profiles.h
+++ b/src/plugins/qt4projectmanager/findqt4profiles.h
@@ -36,9 +36,8 @@
 #include <projectexplorer/nodesvisitor.h>
 
 namespace Qt4ProjectManager {
-namespace Internal {
-
 class Qt4ProFileNode;
+namespace Internal {
 
 class FindQt4ProFiles: protected ProjectExplorer::NodesVisitor {
 
diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.h b/src/plugins/qt4projectmanager/librarydetailscontroller.h
index 4151dfdf1f29298dd4d823e73c8e1103fba24b99..a52c04b5208aaf8ed896537cb5a46c061aa4e8b3 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.h
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.h
@@ -37,14 +37,13 @@
 #include "addlibrarywizard.h"
 
 namespace Qt4ProjectManager {
+class Qt4ProFileNode;
 namespace Internal {
 
 namespace Ui {
     class LibraryDetailsWidget;
 }
 
-class Qt4ProFileNode;
-
 class LibraryDetailsController : public QObject
 {
     Q_OBJECT
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index de216f62384263711d56fc9b45c22ab6bf69b75d..2187f59184c4aa60016ccbd5b86ba5c250f0a7d5 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -31,6 +31,7 @@
 **************************************************************************/
 
 #include "qmakestep.h"
+#include "ui_qmakestep.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include "qmakeparser.h"
@@ -465,16 +466,17 @@ bool QMakeStep::fromMap(const QVariantMap &map)
 ////
 
 QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
-    : BuildStepConfigWidget(), m_step(step), m_ignoreChange(false)
+    : BuildStepConfigWidget(), m_ui(new Ui::QMakeStep), m_step(step),
+      m_ignoreChange(false)
 {
-    m_ui.setupUi(this);
-    connect(m_ui.qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(const QString&)),
+    m_ui->setupUi(this);
+    connect(m_ui->qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(const QString&)),
             this, SLOT(qmakeArgumentsLineEdited()));
-    connect(m_ui.buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)),
+    connect(m_ui->buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)),
             this, SLOT(buildConfigurationSelected()));
-    connect(m_ui.qmlDebuggingLibraryCheckBox, SIGNAL(toggled(bool)),
+    connect(m_ui->qmlDebuggingLibraryCheckBox, SIGNAL(toggled(bool)),
             this, SLOT(linkQmlDebuggingLibraryChecked(bool)));
-    connect(m_ui.qmlDebuggingWarningText, SIGNAL(linkActivated(QString)),
+    connect(m_ui->qmlDebuggingWarningText, SIGNAL(linkActivated(QString)),
             this, SLOT(buildQmlDebuggingHelper()));
     connect(step, SIGNAL(userArgumentsChanged()),
             this, SLOT(userArgumentsChanged()));
@@ -490,10 +492,15 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
             this, SLOT(qtVersionsDumpUpdated(QString)));
 }
 
+QMakeStepConfigWidget::~QMakeStepConfigWidget()
+{
+    delete m_ui;
+}
+
 void QMakeStepConfigWidget::init()
 {
-    m_ui.qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
-    m_ui.qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
+    m_ui->qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
+    m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
 
     qmakeBuildConfigChanged();
 
@@ -531,7 +538,7 @@ void QMakeStepConfigWidget::qmakeBuildConfigChanged()
     Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
     bool debug = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;
     m_ignoreChange = true;
-    m_ui.buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1);
+    m_ui->buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1);
     m_ignoreChange = false;
     updateSummaryLabel();
     updateEffectiveQMakeCall();
@@ -541,7 +548,7 @@ void QMakeStepConfigWidget::userArgumentsChanged()
 {
     if (m_ignoreChange)
         return;
-    m_ui.qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
+    m_ui->qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
     updateSummaryLabel();
     updateEffectiveQMakeCall();
 }
@@ -550,7 +557,7 @@ void QMakeStepConfigWidget::linkQmlDebuggingLibraryChanged()
 {
     if (m_ignoreChange)
         return;
-    m_ui.qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
+    m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
 
     updateSummaryLabel();
     updateEffectiveQMakeCall();
@@ -560,7 +567,7 @@ void QMakeStepConfigWidget::linkQmlDebuggingLibraryChanged()
 void QMakeStepConfigWidget::qmakeArgumentsLineEdited()
 {
     m_ignoreChange = true;
-    m_step->setUserArguments(m_ui.qmakeAdditonalArgumentsLineEdit->text());
+    m_step->setUserArguments(m_ui->qmakeAdditonalArgumentsLineEdit->text());
     m_ignoreChange = false;
 
     updateSummaryLabel();
@@ -573,7 +580,7 @@ void QMakeStepConfigWidget::buildConfigurationSelected()
         return;
     Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
     QtSupport::BaseQtVersion::QmakeBuildConfigs buildConfiguration = bc->qmakeBuildConfiguration();
-    if (m_ui.buildConfigurationComboBox->currentIndex() == 0) { // debug
+    if (m_ui->buildConfigurationComboBox->currentIndex() == 0) { // debug
         buildConfiguration = buildConfiguration | QtSupport::BaseQtVersion::DebugBuild;
     } else {
         buildConfiguration = buildConfiguration & ~QtSupport::BaseQtVersion::DebugBuild;
@@ -638,13 +645,13 @@ void QMakeStepConfigWidget::updateSummaryLabel()
 
 void QMakeStepConfigWidget::updateQmlDebuggingOption()
 {
-    m_ui.qmlDebuggingLibraryCheckBox->setEnabled(m_step->isQmlDebuggingLibrarySupported());
+    m_ui->qmlDebuggingLibraryCheckBox->setEnabled(m_step->isQmlDebuggingLibrarySupported());
 
     QtSupport::BaseQtVersion *qtVersion = m_step->qt4BuildConfiguration()->qtVersion();
     if (!qtVersion || !qtVersion->needsQmlDebuggingLibrary())
-        m_ui.debuggingLibraryLabel->setText(tr("Enable QML debugging:"));
+        m_ui->debuggingLibraryLabel->setText(tr("Enable QML debugging:"));
     else
-        m_ui.debuggingLibraryLabel->setText(tr("Link QML debugging library:"));
+        m_ui->debuggingLibraryLabel->setText(tr("Link QML debugging library:"));
 
     QString warningText;
 
@@ -653,8 +660,8 @@ void QMakeStepConfigWidget::updateQmlDebuggingOption()
     else if (m_step->linkQmlDebuggingLibrary())
         warningText = tr("Might make your application vulnerable. Only use in a safe environment!");
 
-    m_ui.qmlDebuggingWarningText->setText(warningText);
-    m_ui.qmlDebuggingWarningIcon->setVisible(!warningText.isEmpty());
+    m_ui->qmlDebuggingWarningText->setText(warningText);
+    m_ui->qmlDebuggingWarningIcon->setVisible(!warningText.isEmpty());
 }
 
 void QMakeStepConfigWidget::updateEffectiveQMakeCall()
@@ -664,7 +671,7 @@ void QMakeStepConfigWidget::updateEffectiveQMakeCall()
     QString program = tr("<No qtversion>");
     if (qtVersion)
         program = QFileInfo(qtVersion->qmakeCommand()).fileName();
-    m_ui.qmakeArgumentsEdit->setPlainText(program + QLatin1Char(' ') + m_step->allArguments());
+    m_ui->qmakeArgumentsEdit->setPlainText(program + QLatin1Char(' ') + m_step->allArguments());
 }
 
 ////
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index a9d0a131d79dce78ce7a277af656811a2056923a..4f217e6b48da25aa11d9602cd41d46912449904b 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -33,7 +33,11 @@
 #ifndef QMAKESTEP_H
 #define QMAKESTEP_H
 
-#include "ui_qmakestep.h"
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class QMakeStep; }
+QT_END_NAMESPACE
 
 #include <projectexplorer/abstractprocessstep.h>
 
@@ -137,6 +141,7 @@ class QMakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
     Q_OBJECT
 public:
     QMakeStepConfigWidget(QMakeStep *step);
+    ~QMakeStepConfigWidget();
     void init();
     QString summaryText() const;
     QString displayName() const;
@@ -160,7 +165,7 @@ private:
     void updateSummaryLabel();
     void updateQmlDebuggingOption();
     void updateEffectiveQMakeCall();
-    Ui::QMakeStep m_ui;
+    Ui::QMakeStep *m_ui;
     QMakeStep *m_step;
     QString m_summaryText;
     bool m_ignoreChange;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index 6508f9ec503d937b4a29fdecffa1050156b296cc..4d52a55ecffd00d6d39a642b9122de9c9e17247d 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -153,7 +153,7 @@ void Qt4RunConfiguration::handleParseState(bool success)
         emit isEnabledChanged(!enabled);
 }
 
-void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success)
+void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success)
 {
     if (m_proFilePath != pro->path())
         return;
@@ -161,7 +161,7 @@ void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFile
     emit effectiveTargetInformationChanged();
 }
 
-void Qt4RunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
+void Qt4RunConfiguration::proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro)
 {
     if (pro->path() != m_proFilePath)
         return;
@@ -174,11 +174,11 @@ void Qt4RunConfiguration::ctor()
 
     connect(qt4Target(), SIGNAL(environmentChanged()),
             this, SIGNAL(baseEnvironmentChanged()));
-    connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
-            this, SLOT(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)));
+    connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+            this, SLOT(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)));
 
-    connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
-            this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
+    connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)),
+            this, SLOT(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)));
 }
 
 //////
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
index 71870757e9ef2ccbda0f4e037dfd56b1347c5605..f68c0d6d770d40cc640fd59d35c62656bb159a68 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
@@ -62,11 +62,11 @@ namespace Qt4ProjectManager {
 
 class Qt4Project;
 class Qt4BaseTarget;
+class Qt4ProFileNode;
 
 namespace Internal {
 class Qt4DesktopTarget;
 class Qt4PriFileNode;
-class Qt4ProFileNode;
 class Qt4RunConfigurationFactory;
 
 class Qt4RunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
@@ -117,8 +117,8 @@ signals:
     void effectiveTargetInformationChanged();
 
 private slots:
-    void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success);
-    void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
+    void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success);
+    void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro);
 
 protected:
     Qt4RunConfiguration(Qt4BaseTarget *parent, Qt4RunConfiguration *source);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
deleted file mode 100644
index 2a96cfe39eada77a4772c9613b506ee96c8a17cb..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (info@qt.nokia.com)
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
-**
-**************************************************************************/
-
-#include "maemomanager.h"
-
-#include "maemoconstants.h"
-#include "maemodeployable.h"
-#include "maemodeploystepfactory.h"
-#include "maemodeviceconfigurations.h"
-#include "maemoglobal.h"
-#include "maemopackagecreationfactory.h"
-#include "maemopublishingwizardfactories.h"
-#include "maemoqemumanager.h"
-#include "maemorunfactories.h"
-#include "maemosettingspages.h"
-#include "maemotoolchain.h"
-#include "qt4maemodeployconfiguration.h"
-#include "maemoqtversionfactory.h"
-#include "qt4maemotargetfactory.h"
-#include "qt4projectmanager/qt4projectmanagerconstants.h"
-
-#include <extensionsystem/pluginmanager.h>
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-
-using namespace ExtensionSystem;
-using namespace ProjectExplorer;
-
-namespace Qt4ProjectManager {
-    namespace Internal {
-
-MaemoManager *MaemoManager::m_instance = 0;
-
-MaemoManager::MaemoManager()
-    : QObject(0)
-    , m_runControlFactory(new MaemoRunControlFactory(this))
-    , m_runConfigurationFactory(new MaemoRunConfigurationFactory(this))
-    , m_deployConfigurationFactory(new Qt4MaemoDeployConfigurationFactory(this))
-    , m_packageCreationFactory(new MaemoPackageCreationFactory(this))
-    , m_deployStepFactory(new MaemoDeployStepFactory(this))
-    , m_deviceConfigurationsSettingsPage(new MaemoDeviceConfigurationsSettingsPage(this))
-    , m_qemuSettingsPage(new MaemoQemuSettingsPage(this))
-    , m_publishingFactoryFremantleFree(new MaemoPublishingWizardFactoryFremantleFree(this))
-    , m_maemoTargetFactory(new Qt4MaemoTargetFactory(this))
-    , m_toolChainFactory(new MaemoToolChainFactory)
-    , m_maemoQtVersionFactory(new MaemoQtVersionFactory(this))
-{
-    Q_ASSERT(!m_instance);
-
-    m_instance = this;
-    MaemoQemuManager::instance(this);
-    MaemoDeviceConfigurations::instance(this);
-
-    PluginManager *pluginManager = PluginManager::instance();
-    pluginManager->addObject(m_toolChainFactory);
-    pluginManager->addObject(m_runControlFactory);
-    pluginManager->addObject(m_runConfigurationFactory);
-    pluginManager->addObject(m_deployConfigurationFactory);
-    pluginManager->addObject(m_packageCreationFactory);
-    pluginManager->addObject(m_deployStepFactory);
-    pluginManager->addObject(m_deviceConfigurationsSettingsPage);
-    pluginManager->addObject(m_qemuSettingsPage);
-    pluginManager->addObject(m_publishingFactoryFremantleFree);
-    pluginManager->addObject(m_maemoTargetFactory);
-    pluginManager->addObject(m_maemoQtVersionFactory);
-
-    qRegisterMetaType<MaemoDeployable>("MaemoDeployable");
-}
-
-MaemoManager::~MaemoManager()
-{
-    PluginManager *pluginManager = PluginManager::instance();
-    pluginManager->removeObject(m_maemoQtVersionFactory);
-    pluginManager->removeObject(m_maemoTargetFactory);
-    pluginManager->removeObject(m_publishingFactoryFremantleFree);
-    pluginManager->removeObject(m_qemuSettingsPage);
-    pluginManager->removeObject(m_deviceConfigurationsSettingsPage);
-    pluginManager->removeObject(m_deployStepFactory);
-    pluginManager->removeObject(m_packageCreationFactory);
-    pluginManager->removeObject(m_deployConfigurationFactory);
-    pluginManager->removeObject(m_runConfigurationFactory);
-    pluginManager->removeObject(m_runControlFactory);
-    pluginManager->removeObject(m_toolChainFactory);
-    delete m_toolChainFactory;
-
-    m_instance = 0;
-}
-
-MaemoManager &MaemoManager::instance()
-{
-    Q_ASSERT(m_instance);
-    return *m_instance;
-}
-
-} // namespace Internal
-} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemomanager.h b/src/plugins/qt4projectmanager/qt-maemo/maemomanager.h
deleted file mode 100644
index 0c14f0409490843390108c3871605e20d8b4d0bb..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/qt-maemo/maemomanager.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (info@qt.nokia.com)
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
-**
-**************************************************************************/
-
-#ifndef MAEMOMANAGER_H
-#define MAEMOMANAGER_H
-
-#include <QtCore/QObject>
-
-namespace Qt4ProjectManager {
-namespace Internal {
-
-class MaemoDeployStepFactory;
-class MaemoPackageCreationFactory;
-class MaemoPublishingWizardFactoryFremantleFree;
-class MaemoRunControlFactory;
-class MaemoRunConfigurationFactory;
-class MaemoDeviceConfigurationsSettingsPage;
-class MaemoQemuManager;
-class MaemoQemuSettingsPage;
-class Qt4MaemoDeployConfigurationFactory;
-class Qt4MaemoTargetFactory;
-class MaemoToolChainFactory;
-class MaemoQtVersionFactory;
-
-class MaemoManager : public QObject
-{
-    Q_OBJECT
-
-public:
-    MaemoManager();
-    ~MaemoManager();
-    static MaemoManager &instance();
-
-    MaemoDeviceConfigurationsSettingsPage *deviceConfigurationsSettingsPage() const { return m_deviceConfigurationsSettingsPage; }
-    MaemoQemuSettingsPage *qemuSettingsPage() const { return m_qemuSettingsPage; }
-
-private:
-    static MaemoManager *m_instance;
-
-    MaemoRunControlFactory *m_runControlFactory;
-    MaemoRunConfigurationFactory *m_runConfigurationFactory;
-    Qt4MaemoDeployConfigurationFactory *m_deployConfigurationFactory;
-    MaemoPackageCreationFactory *m_packageCreationFactory;
-    MaemoDeployStepFactory *m_deployStepFactory;
-    MaemoDeviceConfigurationsSettingsPage *m_deviceConfigurationsSettingsPage;
-    MaemoQemuSettingsPage *m_qemuSettingsPage;
-    MaemoQemuManager *m_qemuRuntimeManager;
-    MaemoPublishingWizardFactoryFremantleFree *m_publishingFactoryFremantleFree;
-    Qt4MaemoTargetFactory *m_maemoTargetFactory;
-    MaemoToolChainFactory *m_toolChainFactory;
-    MaemoQtVersionFactory *m_maemoQtVersionFactory;
-};
-
-    } // namespace Internal
-} // namespace Qt4ProjectManager
-
-#endif // MAEMOMANAGER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
deleted file mode 100644
index 66a552bc87f0d658cb869beb5a19bb5f5d420e88..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
+++ /dev/null
@@ -1,151 +0,0 @@
-HEADERS += \
-    $$PWD/maemoconfigtestdialog.h \
-    $$PWD/maemoconstants.h \
-    $$PWD/maemodeviceconfigurations.h \
-    $$PWD/maemomanager.h \
-    $$PWD/maemorunconfiguration.h \
-    $$PWD/maemorunconfigurationwidget.h \
-    $$PWD/maemoruncontrol.h \
-    $$PWD/maemorunfactories.h \
-    $$PWD/maemosettingspages.h \
-    $$PWD/maemodeviceconfigurationssettingswidget.h \
-    $$PWD/maemosshconfigdialog.h \
-    $$PWD/maemotoolchain.h \
-    $$PWD/maemopackagecreationstep.h \
-    $$PWD/maemopackagecreationfactory.h \
-    $$PWD/maemopackagecreationwidget.h \
-    $$PWD/maemodeployablelistmodel.h \
-    $$PWD/maemoqemumanager.h \
-    $$PWD/maemodeployables.h \
-    $$PWD/maemodeployable.h \
-    $$PWD/maemodeploystepwidget.h \
-    $$PWD/maemodeploystepfactory.h \
-    $$PWD/maemoglobal.h \
-    $$PWD/maemosshrunner.h \
-    $$PWD/maemodebugsupport.h \
-    $$PWD/maemoanalyzersupport.h \
-    $$PWD/maemoremotemountsmodel.h \
-    $$PWD/maemodeviceenvreader.h \
-    $$PWD/maemomountspecification.h \
-    $$PWD/maemoremotemounter.h \
-    $$PWD/maemoprofilesupdatedialog.h \
-    $$PWD/maemousedportsgatherer.h \
-    $$PWD/maemoremoteprocesslist.h \
-    $$PWD/maemoremoteprocessesdialog.h \
-    $$PWD/maemopublishingwizardfactories.h \
-    $$PWD/maemopublishingbuildsettingspagefremantlefree.h \
-    $$PWD/maemopublishingfileselectiondialog.h \
-    $$PWD/maemopublishedprojectmodel.h \
-    $$PWD/maemopublishinguploadsettingspagefremantlefree.h \
-    $$PWD/maemopublishingwizardfremantlefree.h \
-    $$PWD/maemopublishingresultpagefremantlefree.h \
-    $$PWD/maemopublisherfremantlefree.h \
-    $$PWD/maemoqemuruntime.h \
-    $$PWD/maemoqemuruntimeparser.h \
-    $$PWD/maemoqemusettingswidget.h \
-    $$PWD/maemoqemusettings.h \
-    $$PWD/qt4maemotargetfactory.h \
-    $$PWD/qt4maemotarget.h \
-    $$PWD/qt4maemodeployconfiguration.h \
-    $$PWD/maemodeviceconfigwizard.h \
-    $$PWD/maemokeydeployer.h \
-    $$PWD/maemopertargetdeviceconfigurationlistmodel.h \
-    $$PWD/maemodeployconfigurationwidget.h \
-    $$PWD/maemoinstalltosysrootstep.h \
-    $$PWD/maemodeploymentmounter.h \
-    $$PWD/maemopackageuploader.h \
-    $$PWD/maemopackageinstaller.h \
-    $$PWD/maemoremotecopyfacility.h \
-    $$PWD/abstractmaemodeploystep.h \
-    $$PWD/maemodeploybymountstep.h \
-    $$PWD/maemouploadandinstalldeploystep.h \
-    $$PWD/maemodirectdeviceuploadstep.h \
-    $$PWD/abstractlinuxdevicedeploystep.h \
-    $$PWD/maemoqtversionfactory.h \
-    $$PWD/maemoqtversion.h
-
-SOURCES += \
-    $$PWD/maemoconfigtestdialog.cpp \
-    $$PWD/maemodeviceconfigurations.cpp \
-    $$PWD/maemomanager.cpp \
-    $$PWD/maemorunconfiguration.cpp \
-    $$PWD/maemorunconfigurationwidget.cpp \
-    $$PWD/maemoruncontrol.cpp \
-    $$PWD/maemorunfactories.cpp \
-    $$PWD/maemosettingspages.cpp \
-    $$PWD/maemodeviceconfigurationssettingswidget.cpp \
-    $$PWD/maemosshconfigdialog.cpp \
-    $$PWD/maemotoolchain.cpp \
-    $$PWD/maemopackagecreationstep.cpp \
-    $$PWD/maemopackagecreationfactory.cpp \
-    $$PWD/maemopackagecreationwidget.cpp \
-    $$PWD/maemodeployablelistmodel.cpp \
-    $$PWD/maemoqemumanager.cpp \
-    $$PWD/maemodeployables.cpp \
-    $$PWD/maemodeploystepwidget.cpp \
-    $$PWD/maemodeploystepfactory.cpp \
-    $$PWD/maemoglobal.cpp \
-    $$PWD/maemosshrunner.cpp \
-    $$PWD/maemodebugsupport.cpp \
-    $$PWD/maemoanalyzersupport.cpp \
-    $$PWD/maemoremotemountsmodel.cpp \
-    $$PWD/maemodeviceenvreader.cpp \
-    $$PWD/maemomountspecification.cpp \
-    $$PWD/maemoremotemounter.cpp \
-    $$PWD/maemoprofilesupdatedialog.cpp \
-    $$PWD/maemousedportsgatherer.cpp \
-    $$PWD/maemoremoteprocesslist.cpp \
-    $$PWD/maemoremoteprocessesdialog.cpp \
-    $$PWD/maemopublishingwizardfactories.cpp \
-    $$PWD/maemopublishingbuildsettingspagefremantlefree.cpp \
-    $$PWD/maemopublishingfileselectiondialog.cpp \
-    $$PWD/maemopublishedprojectmodel.cpp \
-    $$PWD/maemopublishinguploadsettingspagefremantlefree.cpp \
-    $$PWD/maemopublishingwizardfremantlefree.cpp \
-    $$PWD/maemopublishingresultpagefremantlefree.cpp \
-    $$PWD/maemopublisherfremantlefree.cpp \
-    $$PWD/maemoqemuruntimeparser.cpp \
-    $$PWD/maemoqemusettingswidget.cpp \
-    $$PWD/maemoqemusettings.cpp \
-    $$PWD/qt4maemotargetfactory.cpp \
-    $$PWD/qt4maemotarget.cpp \
-    $$PWD/qt4maemodeployconfiguration.cpp \
-    $$PWD/maemodeviceconfigwizard.cpp \
-    $$PWD/maemokeydeployer.cpp \
-    $$PWD/maemopertargetdeviceconfigurationlistmodel.cpp \
-    $$PWD/maemodeployconfigurationwidget.cpp \
-    $$PWD/maemoinstalltosysrootstep.cpp \
-    $$PWD/maemodeploymentmounter.cpp \
-    $$PWD/maemopackageuploader.cpp \
-    $$PWD/maemopackageinstaller.cpp \
-    $$PWD/maemoremotecopyfacility.cpp \
-    $$PWD/abstractmaemodeploystep.cpp \
-    $$PWD/maemodeploybymountstep.cpp \
-    $$PWD/maemouploadandinstalldeploystep.cpp \
-    $$PWD/maemodirectdeviceuploadstep.cpp \
-    $$PWD/abstractlinuxdevicedeploystep.cpp \
-    $$PWD/maemoqtversionfactory.cpp \
-    $$PWD/maemoqtversion.cpp
-
-FORMS += \
-    $$PWD/maemoconfigtestdialog.ui \
-    $$PWD/maemodeviceconfigurationssettingswidget.ui \
-    $$PWD/maemosshconfigdialog.ui \
-    $$PWD/maemopackagecreationwidget.ui \
-    $$PWD/maemodeploystepwidget.ui \
-    $$PWD/maemoprofilesupdatedialog.ui \
-    $$PWD/maemoremoteprocessesdialog.ui \
-    $$PWD/maemopublishingbuildsettingspagefremantlefree.ui \
-    $$PWD/maemopublishingfileselectiondialog.ui \
-    $$PWD/maemopublishinguploadsettingspagefremantlefree.ui \
-    $$PWD/maemopublishingresultpagefremantlefree.ui \
-    $$PWD/maemoqemusettingswidget.ui \
-    $$PWD/maemodeviceconfigwizardstartpage.ui \
-    $$PWD/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui \
-    $$PWD/maemodeviceconfigwizardreusekeyscheckpage.ui \
-    $$PWD/maemodeviceconfigwizardkeycreationpage.ui \
-    $$PWD/maemodeviceconfigwizardkeydeploymentpage.ui \
-    $$PWD/maemodeployconfigurationwidget.ui \
-    $$PWD/maemodeviceconfigwizardlogindatapage.ui
-
-RESOURCES += $$PWD/qt-maemo.qrc
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
index f984e15552dae2da3ff97f0ffbd346493ce2593c..d082c8095e69b55bf8e0678c8ef25f29b7c85346 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
@@ -117,9 +117,9 @@ void S60DeployConfiguration::ctor()
     setDefaultDisplayName(defaultDisplayName());
     // TODO disable S60 Deploy Configuration while parsing
     // requires keeping track of the parsing state of the project
-//    connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
+//    connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)),
 //            this, SLOT(targetInformationInvalidated()));
-    connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
+    connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
             this, SIGNAL(targetInformationChanged()));
     connect(qt4Target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
             this, SLOT(updateActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*)));
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
index 130fb395f9cf0ba5ab94729900e4f4091f9e2fcb..b092d6a76f7e1899aa80dd849e4fd4a054384b25 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
@@ -46,10 +46,10 @@ class BaseQtVersion;
 }
 
 namespace Qt4ProjectManager {
+class Qt4ProFileNode;
 
 namespace Internal {
 class Qt4SymbianTarget;
-class Qt4ProFileNode;
 class S60DeployConfigurationFactory;
 class S60DeviceRunConfiguration;
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index e1c342dceeb1e0f2b94204fdd8a4010463ee87ed..1c62ea7a457f949cc1bab5b032ef398ef9936cff 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -118,10 +118,10 @@ void S60DeviceRunConfiguration::ctor()
         setDefaultDisplayName(tr("Run on Symbian device"));
 
     Qt4Project *pro = qt4Target()->qt4Project();
-    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
-            this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)));
-    connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
-            this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)));
+    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+            this, SLOT(proFileUpdate(Qt4ProjectManager::Qt4ProFileNode*,bool)));
+    connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)),
+            this, SLOT(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)));
 }
 
 void S60DeviceRunConfiguration::handleParserState(bool success)
@@ -132,14 +132,14 @@ void S60DeviceRunConfiguration::handleParserState(bool success)
         emit isEnabledChanged(!enabled);
 }
 
-void S60DeviceRunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
+void S60DeviceRunConfiguration::proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro)
 {
     if (m_proFilePath != pro->path())
         return;
     handleParserState(false);
 }
 
-void S60DeviceRunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success)
+void S60DeviceRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success)
 {
     if (m_proFilePath != pro->path())
         return;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 9484e156ea86af22eea9be45e4fddb9f4968c10c..0b72c5a8fac563163a34fca7ac1e0dc0a6727ca1 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -47,11 +47,11 @@ QT_END_NAMESPACE
 
 namespace Qt4ProjectManager {
 class Qt4BaseTarget;
+class Qt4ProFileNode;
 
 namespace Internal {
 class SymbianQtVersion;
 class Qt4SymbianTarget;
-class Qt4ProFileNode;
 class S60DeviceRunConfigurationFactory;
 class CodaRunControl;
 
@@ -97,8 +97,8 @@ protected:
     QString defaultDisplayName() const;
     virtual bool fromMap(const QVariantMap &map);
 private slots:
-    void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
-    void proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success);
+    void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro);
+    void proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success);
 
 private:
     void ctor();
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index f856e6feea5fb4a08947778e1a650266b3ce6e72..888b5f5524e8597174e7a86404d1f7b5ee5dae22 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -100,10 +100,10 @@ void S60EmulatorRunConfiguration::ctor()
         //: S60 emulator run configuration default display name (no pro-file name)
         setDefaultDisplayName(tr("Run on Symbian Emulator"));
     Qt4Project *pro = qt4Target()->qt4Project();
-    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
-            this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)));
-    connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
-            this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)));
+    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+            this, SLOT(proFileUpdate(Qt4ProjectManager::Qt4ProFileNode*,bool)));
+    connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)),
+            this, SLOT(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)));
 }
 
 
@@ -120,14 +120,14 @@ void S60EmulatorRunConfiguration::handleParserState(bool success)
     }
 }
 
-void S60EmulatorRunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
+void S60EmulatorRunConfiguration::proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro)
 {
     if (m_proFilePath != pro->path())
         return;
     handleParserState(false);
 }
 
-void S60EmulatorRunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success)
+void S60EmulatorRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success)
 {
     if (m_proFilePath != pro->path())
         return;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
index 72cd160f22c4bd22d4d9a902336289d96a41dfbc..616462d12599366b5662822276d645c386b1d2a4 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
@@ -51,10 +51,10 @@ class DetailsWidget;
 namespace Qt4ProjectManager {
 class Qt4Project;
 class Qt4BaseTarget;
+class Qt4ProFileNode;
 
 namespace Internal {
 class Qt4SymbianTarget;
-class Qt4ProFileNode;
 class S60EmulatorRunConfigurationFactory;
 
 class S60EmulatorRunConfiguration : public ProjectExplorer::RunConfiguration
@@ -84,8 +84,8 @@ signals:
     void targetInformationChanged();
 
 private slots:
-    void proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success);
-    void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
+    void proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success);
+    void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro);
 
 protected:
     S60EmulatorRunConfiguration(Qt4ProjectManager::Qt4BaseTarget *parent, S60EmulatorRunConfiguration *source);
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 8ecdbcac14986a0d94b9a3bb4c1572dbb02b6157..a287c155367fa565538d670ec36e1f30989f09c9 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -249,7 +249,7 @@ QString Qt4BuildConfiguration::buildDirectory() const
 /// If only a sub tree should be build this function returns which sub node
 /// should be build
 /// \see Qt4BuildConfiguration::setSubNodeBuild
-Qt4ProjectManager::Internal::Qt4ProFileNode *Qt4BuildConfiguration::subNodeBuild() const
+Qt4ProjectManager::Qt4ProFileNode *Qt4BuildConfiguration::subNodeBuild() const
 {
     return m_subNodeBuild;
 }
@@ -260,7 +260,7 @@ Qt4ProjectManager::Internal::Qt4ProFileNode *Qt4BuildConfiguration::subNodeBuild
 /// calling BuildManager::buildProject( BuildConfiguration * )
 /// and reset immediately afterwards
 /// That is m_subNodesBuild is set only temporarly
-void Qt4BuildConfiguration::setSubNodeBuild(Qt4ProjectManager::Internal::Qt4ProFileNode *node)
+void Qt4BuildConfiguration::setSubNodeBuild(Qt4ProjectManager::Qt4ProFileNode *node)
 {
     m_subNodeBuild = node;
 }
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index f092771907f75b0e768784fc9d555f1151b0e963..9e57e6150128902c5973dd5f7c262a7d227eddcf 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -48,10 +48,7 @@ class QMakeStep;
 class MakeStep;
 class Qt4BaseTarget;
 class Qt4BuildConfigurationFactory;
-
-namespace Internal {
 class Qt4ProFileNode;
-}
 
 class QT4PROJECTMANAGER_EXPORT Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration
 {
@@ -71,8 +68,8 @@ public:
     QString shadowBuildDirectory() const;
     void setShadowBuildAndDirectory(bool shadowBuild, const QString &buildDirectory);
 
-    void setSubNodeBuild(Qt4ProjectManager::Internal::Qt4ProFileNode *node);
-    Qt4ProjectManager::Internal::Qt4ProFileNode *subNodeBuild() const;
+    void setSubNodeBuild(Qt4ProjectManager::Qt4ProFileNode *node);
+    Qt4ProjectManager::Qt4ProFileNode *subNodeBuild() const;
 
     // returns the qtVersion
     QtSupport::BaseQtVersion *qtVersion() const;
@@ -166,7 +163,7 @@ private:
     QString m_lastEmmitedBuildDirectory;
     int m_qtVersionId;
     QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration;
-    Qt4ProjectManager::Internal::Qt4ProFileNode *m_subNodeBuild;
+    Qt4ProjectManager::Qt4ProFileNode *m_subNodeBuild;
 };
 
 class QT4PROJECTMANAGER_EXPORT Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 076d59e66915443db34f8c88804d2adf18ef706d..6ce6a3ee7e43d1dfa3bfd1a53dcaffd1af5b91c0 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -464,7 +464,7 @@ struct InternalNode
                 filesToRemove << *existingNodeIter;
                 ++existingNodeIter;
             } else if ((*existingNodeIter)->path() > *newPathIter) {
-                filesToAdd << new FileNode(*newPathIter, type, false);
+                filesToAdd << new ProjectExplorer::FileNode(*newPathIter, type, false);
                 ++newPathIter;
             } else { // *existingNodeIter->path() == *newPathIter
                 ++existingNodeIter;
@@ -476,7 +476,7 @@ struct InternalNode
             ++existingNodeIter;
         }
         while (newPathIter != files.constEnd()) {
-            filesToAdd << new FileNode(*newPathIter, type, false);
+            filesToAdd << new ProjectExplorer::FileNode(*newPathIter, type, false);
             ++newPathIter;
         }
 
@@ -538,7 +538,7 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, QtSupport::ProFileReader
 {
     // add project file node
     if (m_fileNodes.isEmpty())
-        addFileNodes(QList<FileNode*>() << new FileNode(m_projectFilePath, ProjectFileType, false), this);
+        addFileNodes(QList<FileNode*>() << new ProjectExplorer::FileNode(m_projectFilePath, ProjectExplorer::ProjectFileType, false), this);
 
     const QString &projectDir = m_qt4ProFileNode->m_projectDir;
 
@@ -825,7 +825,7 @@ QList<ProjectNode::ProjectAction> Qt4PriFileNode::supportedActions(Node *node) c
         break;
     }
 
-    FileNode *fileNode = qobject_cast<FileNode *>(node);
+    ProjectExplorer::FileNode *fileNode = qobject_cast<FileNode *>(node);
     if (fileNode && fileNode->fileType() != ProjectExplorer::ProjectFileType)
         actions << Rename;
 
@@ -1251,6 +1251,51 @@ QSet<QString> Qt4PriFileNode::filterFiles(ProjectExplorer::FileType fileType, co
     return result;
 }
 
+static Qt4ProjectType proFileTemplateTypeToProjectType(ProFileEvaluator::TemplateType type)
+{
+    switch (type) {
+    case ProFileEvaluator::TT_Unknown:
+    case ProFileEvaluator::TT_Application:
+        return ApplicationTemplate;
+    case ProFileEvaluator::TT_Library:
+        return LibraryTemplate;
+    case ProFileEvaluator::TT_Script:
+        return ScriptTemplate;
+    case ProFileEvaluator::TT_Aux:
+        return AuxTemplate;
+    case ProFileEvaluator::TT_Subdirs:
+        return SubDirsTemplate;
+    default:
+        return InvalidProject;
+    }
+}
+
+namespace {
+    // find all ui files in project
+    class FindUiFileNodesVisitor : public ProjectExplorer::NodesVisitor {
+    public:
+        void visitProjectNode(ProjectNode *projectNode)
+        {
+            visitFolderNode(projectNode);
+        }
+        void visitFolderNode(FolderNode *folderNode)
+        {
+            foreach (FileNode *fileNode, folderNode->fileNodes()) {
+                if (fileNode->fileType() == ProjectExplorer::FormType)
+                    uiFileNodes << fileNode;
+            }
+        }
+        QList<FileNode*> uiFileNodes;
+    };
+}
+
+Qt4NodesWatcher::Qt4NodesWatcher(QObject *parent)
+        : NodesWatcher(parent)
+{
+}
+
+} // namespace Internal
+
 
 const Qt4ProFileNode *Qt4ProFileNode::findProFileFor(const QString &fileName) const
 {
@@ -1355,7 +1400,7 @@ Qt4ProFileNode::~Qt4ProFileNode()
 {
     CPlusPlus::CppModelManagerInterface *modelManager
             = CPlusPlus::CppModelManagerInterface::instance();
-    QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
+    QMap<QString, Internal::Qt4UiCodeModelSupport *>::const_iterator it, end;
     end = m_uiCodeModelSupport.constEnd();
     for (it = m_uiCodeModelSupport.constBegin(); it != end; ++it) {
         modelManager->removeEditorSupport(it.value());
@@ -1408,8 +1453,8 @@ QStringList Qt4ProFileNode::variableValue(const Qt4Variable var) const
 
 void Qt4ProFileNode::emitProFileUpdated()
 {
-    foreach (NodesWatcher *watcher, watchers())
-        if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+    foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+        if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
             emit qt4Watcher->proFileUpdated(this, m_validParse);
 
     foreach (ProjectNode *subNode, subProjectNodes()) {
@@ -1421,8 +1466,8 @@ void Qt4ProFileNode::emitProFileUpdated()
 
 void Qt4ProFileNode::emitProFileInvalidated()
 {
-    foreach (NodesWatcher *watcher, watchers())
-        if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+    foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+        if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
             emit qt4Watcher->proFileInvalidated(this);
 
     foreach (ProjectNode *subNode, subProjectNodes()) {
@@ -1459,8 +1504,8 @@ void Qt4ProFileNode::update()
 {
     if (m_validParse) {
         m_validParse = false;
-        foreach (NodesWatcher *watcher, watchers())
-            if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+        foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+            if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
                 emit qt4Watcher->proFileInvalidated(this);
     }
 
@@ -1507,25 +1552,6 @@ void Qt4ProFileNode::applyAsyncEvaluate()
     m_project->decrementPendingEvaluateFutures();
 }
 
-static Qt4ProjectType proFileTemplateTypeToProjectType(ProFileEvaluator::TemplateType type)
-{
-    switch (type) {
-    case ProFileEvaluator::TT_Unknown:
-    case ProFileEvaluator::TT_Application:
-        return ApplicationTemplate;
-    case ProFileEvaluator::TT_Library:
-        return LibraryTemplate;
-    case ProFileEvaluator::TT_Script:
-        return ScriptTemplate;
-    case ProFileEvaluator::TT_Aux:
-        return AuxTemplate;
-    case ProFileEvaluator::TT_Subdirs:
-        return SubDirsTemplate;
-    default:
-        return InvalidProject;
-    }
-}
-
 void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
 {
     if (!m_readerExact)
@@ -1538,8 +1564,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
             m_project->proFileParseError(tr("Error while parsing file %1. Giving up.").arg(m_projectFilePath));
             invalidate();
         }
-        foreach (NodesWatcher *watcher, watchers())
-            if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+        foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+            if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
                 emit qt4Watcher->proFileUpdated(this, false);
         return;
     }
@@ -1547,7 +1573,7 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
     if (debug)
         qDebug() << "Qt4ProFileNode - updating files for file " << m_projectFilePath;
 
-    Qt4ProjectType projectType = proFileTemplateTypeToProjectType(
+    Qt4ProjectType projectType = Internal::proFileTemplateTypeToProjectType(
                 (evalResult == EvalOk ? m_readerExact : m_readerCumulative)->templateType());
     if (projectType != m_projectType) {
         Qt4ProjectType oldType = m_projectType;
@@ -1565,8 +1591,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
 
         // really emit here? or at the end? Nobody is connected to this signal at the moment
         // so we kind of can ignore that question for now
-        foreach (NodesWatcher *watcher, watchers())
-            if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+        foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+            if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
                 emit qt4Watcher->projectTypeChanged(this, oldType, projectType);
     }
 
@@ -1777,8 +1803,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
             Qt4VariablesHash oldValues = m_varValues;
             m_varValues = newVarValues;
 
-            foreach (NodesWatcher *watcher, watchers())
-                if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+            foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+                if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
                     emit qt4Watcher->variablesChanged(this, oldValues, m_varValues);
         }
 
@@ -1789,8 +1815,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
 
     m_validParse = true;
 
-    foreach (NodesWatcher *watcher, watchers())
-        if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+    foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+        if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
             emit qt4Watcher->proFileUpdated(this, true);
 
     m_project->destroyProFileReader(m_readerExact);
@@ -1800,25 +1826,6 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
     m_readerCumulative = 0;
 }
 
-namespace {
-    // find all ui files in project
-    class FindUiFileNodesVisitor : public ProjectExplorer::NodesVisitor {
-    public:
-        void visitProjectNode(ProjectNode *projectNode)
-        {
-            visitFolderNode(projectNode);
-        }
-        void visitFolderNode(FolderNode *folderNode)
-        {
-            foreach (FileNode *fileNode, folderNode->fileNodes()) {
-                if (fileNode->fileType() == ProjectExplorer::FormType)
-                    uiFileNodes << fileNode;
-            }
-        }
-        QList<FileNode*> uiFileNodes;
-    };
-}
-
 // This function is triggered after a build, and updates the state ui files
 // It does so by storing a modification time for each ui file we know about.
 
@@ -1832,9 +1839,9 @@ QStringList Qt4ProFileNode::updateUiFiles()
         return QStringList();
 
     // Find all ui files
-    FindUiFileNodesVisitor uiFilesVisitor;
+    Internal::FindUiFileNodesVisitor uiFilesVisitor;
     this->accept(&uiFilesVisitor);
-    const QList<FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
+    const QList<ProjectExplorer::FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
 
     // Find the UiDir, there can only ever be one
     QString uiDir = buildDir();
@@ -1843,8 +1850,8 @@ QStringList Qt4ProFileNode::updateUiFiles()
         uiDir = tmp.first();
 
     // Collect all existing generated files
-    QList<FileNode*> existingFileNodes;
-    foreach (FileNode *file, fileNodes()) {
+    QList<ProjectExplorer::FileNode*> existingFileNodes;
+    foreach (ProjectExplorer::FileNode *file, fileNodes()) {
         if (file->isGenerated())
             existingFileNodes << file;
     }
@@ -1852,7 +1859,7 @@ QStringList Qt4ProFileNode::updateUiFiles()
     // Convert uiFile to uiHeaderFilePath, find all headers that correspond
     // and try to find them in uiDir
     QStringList newFilePaths;
-    foreach (FileNode *uiFile, uiFiles) {
+    foreach (ProjectExplorer::FileNode *uiFile, uiFiles) {
         const QString uiHeaderFilePath
                 = QString("%1/ui_%2.h").arg(uiDir, QFileInfo(uiFile->path()).completeBaseName());
         if (QFileInfo(uiHeaderFilePath).exists())
@@ -1860,15 +1867,15 @@ QStringList Qt4ProFileNode::updateUiFiles()
     }
 
     // Create a diff between those lists
-    QList<FileNode*> toRemove;
-    QList<FileNode*> toAdd;
+    QList<ProjectExplorer::FileNode*> toRemove;
+    QList<ProjectExplorer::FileNode*> toAdd;
     // The list of files for which we call updateSourceFile
     QStringList toUpdate;
 
     qSort(newFilePaths);
     qSort(existingFileNodes.begin(), existingFileNodes.end(), ProjectNode::sortNodesByPath);
 
-    QList<FileNode*>::const_iterator existingNodeIter = existingFileNodes.constBegin();
+    QList<ProjectExplorer::FileNode*>::const_iterator existingNodeIter = existingFileNodes.constBegin();
     QList<QString>::const_iterator newPathIter = newFilePaths.constBegin();
     while (existingNodeIter != existingFileNodes.constEnd()
            && newPathIter != newFilePaths.constEnd()) {
@@ -1876,7 +1883,7 @@ QStringList Qt4ProFileNode::updateUiFiles()
             toRemove << *existingNodeIter;
             ++existingNodeIter;
         } else if ((*existingNodeIter)->path() > *newPathIter) {
-            toAdd << new FileNode(*newPathIter, ProjectExplorer::HeaderType, true);
+            toAdd << new ProjectExplorer::FileNode(*newPathIter, ProjectExplorer::HeaderType, true);
             ++newPathIter;
         } else { // *existingNodeIter->path() == *newPathIter
             QString fileName = (*existingNodeIter)->path();
@@ -1895,13 +1902,13 @@ QStringList Qt4ProFileNode::updateUiFiles()
         ++existingNodeIter;
     }
     while (newPathIter != newFilePaths.constEnd()) {
-        toAdd << new FileNode(*newPathIter, ProjectExplorer::HeaderType, true);
+        toAdd << new ProjectExplorer::FileNode(*newPathIter, ProjectExplorer::HeaderType, true);
         ++newPathIter;
     }
 
     // Update project tree
     if (!toRemove.isEmpty()) {
-        foreach (FileNode *file, toRemove)
+        foreach (ProjectExplorer::FileNode *file, toRemove)
             m_uitimestamps.remove(file->path());
         removeFileNodes(toRemove, this);
     }
@@ -1910,7 +1917,7 @@ QStringList Qt4ProFileNode::updateUiFiles()
         CPlusPlus::CppModelManagerInterface::instance();
 
     if (!toAdd.isEmpty()) {
-        foreach (FileNode *file, toAdd) {
+        foreach (ProjectExplorer::FileNode *file, toAdd) {
             m_uitimestamps.insert(file->path(), QFileInfo(file->path()).lastModified());
             toUpdate << file->path();
 
@@ -2216,15 +2223,15 @@ void Qt4ProFileNode::invalidate()
     m_projectType = InvalidProject;
 
 
-    foreach (NodesWatcher *watcher, watchers())
-        if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+    foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+        if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
             emit qt4Watcher->projectTypeChanged(this, oldType, InvalidProject);
 }
 
 void Qt4ProFileNode::updateCodeModelSupportFromBuild(const QStringList &files)
 {
     foreach (const QString &file, files) {
-        QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
+        QMap<QString, Internal::Qt4UiCodeModelSupport *>::const_iterator it, end;
         end = m_uiCodeModelSupport.constEnd();
         for (it = m_uiCodeModelSupport.constBegin(); it != end; ++it) {
             if (it.value()->fileName() == file)
@@ -2236,7 +2243,7 @@ void Qt4ProFileNode::updateCodeModelSupportFromBuild(const QStringList &files)
 void Qt4ProFileNode::updateCodeModelSupportFromEditor(const QString &uiFileName,
                                                       const QString &contents)
 {
-    const QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it =
+    const QMap<QString, Internal::Qt4UiCodeModelSupport *>::const_iterator it =
             m_uiCodeModelSupport.constFind(uiFileName);
     if (it != m_uiCodeModelSupport.constEnd())
         it.value()->updateFromEditor(contents);
@@ -2269,39 +2276,39 @@ void Qt4ProFileNode::createUiCodeModelSupport()
             = CPlusPlus::CppModelManagerInterface::instance();
 
     // First move all to
-    QMap<QString, Qt4UiCodeModelSupport *> oldCodeModelSupport;
+    QMap<QString, Internal::Qt4UiCodeModelSupport *> oldCodeModelSupport;
     oldCodeModelSupport = m_uiCodeModelSupport;
     m_uiCodeModelSupport.clear();
 
     // Only those two project types can have ui files for us
     if (m_projectType == ApplicationTemplate || m_projectType == LibraryTemplate) {
         // Find all ui files
-        FindUiFileNodesVisitor uiFilesVisitor;
+        Internal::FindUiFileNodesVisitor uiFilesVisitor;
         this->accept(&uiFilesVisitor);
-        const QList<FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
+        const QList<ProjectExplorer::FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
 
         // Find the UiDir, there can only ever be one
         const  QString uiDir = uiDirectory();
-        foreach (const FileNode *uiFile, uiFiles) {
+        foreach (const ProjectExplorer::FileNode *uiFile, uiFiles) {
             const QString uiHeaderFilePath = uiHeaderFile(uiDir, uiFile->path());
 //            qDebug()<<"code model support for "<<uiFile->path()<<" "<<uiHeaderFilePath;
-            QMap<QString, Qt4UiCodeModelSupport *>::iterator it = oldCodeModelSupport.find(uiFile->path());
+            QMap<QString, Internal::Qt4UiCodeModelSupport *>::iterator it = oldCodeModelSupport.find(uiFile->path());
             if (it != oldCodeModelSupport.end()) {
 //                qDebug()<<"updated old codemodelsupport";
-                Qt4UiCodeModelSupport *cms = it.value();
+                Internal::Qt4UiCodeModelSupport *cms = it.value();
                 cms->setFileName(uiHeaderFilePath);
                 m_uiCodeModelSupport.insert(it.key(), cms);
                 oldCodeModelSupport.erase(it);
             } else {
 //                qDebug()<<"adding new codemodelsupport";
-                Qt4UiCodeModelSupport *cms = new Qt4UiCodeModelSupport(modelManager, m_project, uiFile->path(), uiHeaderFilePath);
+                Internal::Qt4UiCodeModelSupport *cms = new Internal::Qt4UiCodeModelSupport(modelManager, m_project, uiFile->path(), uiHeaderFilePath);
                 m_uiCodeModelSupport.insert(uiFile->path(), cms);
                 modelManager->addEditorSupport(cms);
             }
         }
     }
     // Remove old
-    QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
+    QMap<QString, Internal::Qt4UiCodeModelSupport *>::const_iterator it, end;
     end = oldCodeModelSupport.constEnd();
     for (it = oldCodeModelSupport.constBegin(); it!=end; ++it) {
         modelManager->removeEditorSupport(it.value());
@@ -2309,10 +2316,4 @@ void Qt4ProFileNode::createUiCodeModelSupport()
     }
 }
 
-Qt4NodesWatcher::Qt4NodesWatcher(QObject *parent)
-        : NodesWatcher(parent)
-{
-}
-
-} // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index d49452a05eeef0adc55887754d31ac732972160f..492b38eb0c5ce0f7ada4f41855cbd1af31e44ad2 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -62,29 +62,9 @@ class ProFileReader;
 
 namespace Qt4ProjectManager {
 
-// Import base classes into namespace
-using ProjectExplorer::Node;
-using ProjectExplorer::FileNode;
-using ProjectExplorer::FolderNode;
-using ProjectExplorer::ProjectNode;
-using ProjectExplorer::NodesWatcher;
-
-// Import enums into namespace
-using ProjectExplorer::NodeType;
-using ProjectExplorer::FileNodeType;
-using ProjectExplorer::FolderNodeType;
-using ProjectExplorer::ProjectNodeType;
-
-using ProjectExplorer::UnknownFileType;
-using ProjectExplorer::ProjectFileType;
-
+class Qt4ProFileNode;
 class Qt4Project;
 
-namespace Internal {
-
-using ProjectExplorer::FileType;
-class Qt4UiCodeModelSupport;
-
 //  Type of projects
 enum Qt4ProjectType {
     InvalidProject = 0,
@@ -110,32 +90,29 @@ enum Qt4Variable {
     SymbianCapabilities
 };
 
-class Qt4PriFileNode;
-class Qt4ProFileNode;
+namespace Internal {
 
-class Qt4PriFile : public Core::IFile
-{
-    Q_OBJECT
-public:
-    Qt4PriFile(Qt4PriFileNode *qt4PriFile);
-    virtual bool save(QString *errorString, const QString &fileName, bool autoSave);
-    virtual QString fileName() const;
-    virtual void rename(const QString &newName);
+// Import base classes into namespace
+using ProjectExplorer::Node;
+using ProjectExplorer::FileNode;
+using ProjectExplorer::FolderNode;
+using ProjectExplorer::ProjectNode;
+using ProjectExplorer::NodesWatcher;
 
-    virtual QString defaultPath() const;
-    virtual QString suggestedFileName() const;
-    virtual QString mimeType() const;
+// Import enums into namespace
+using ProjectExplorer::NodeType;
+using ProjectExplorer::FileNodeType;
+using ProjectExplorer::FolderNodeType;
+using ProjectExplorer::ProjectNodeType;
 
-    virtual bool isModified() const;
-    virtual bool isReadOnly() const;
-    virtual bool isSaveAsAllowed() const;
+using ProjectExplorer::UnknownFileType;
+using ProjectExplorer::ProjectFileType;
 
-    ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
-    bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
+using ProjectExplorer::FileType;
 
-private:
-    Qt4PriFileNode *m_priFile;
-};
+class Qt4UiCodeModelSupport;
+class ProFileReader;
+class Qt4PriFile;
 
 // Implements ProjectNode for qt4 pro files
 class Qt4PriFileNode : public ProjectExplorer::ProjectNode
@@ -210,7 +187,7 @@ private:
     QString m_projectDir;
 
     QMap<QString, Qt4UiCodeModelSupport *> m_uiCodeModelSupport;
-    Qt4PriFile *m_qt4PriFile;
+    Internal::Qt4PriFile *m_qt4PriFile;
 
     // Memory is cheap...
     // TODO (really that cheap?)
@@ -219,13 +196,64 @@ private:
     QSet<QString> m_watchedFolders;
 
     // managed by Qt4ProFileNode
-    friend class Qt4ProFileNode;
+    friend class Qt4ProjectManager::Qt4ProFileNode;
     friend class Qt4PriFile; // for scheduling updates on modified
     // internal temporary subtree representation
     friend struct InternalNode;
 };
 
-struct TargetInformation
+class Qt4PriFile : public Core::IFile
+{
+    Q_OBJECT
+public:
+    Qt4PriFile(Qt4PriFileNode *qt4PriFile);
+    virtual bool save(QString *errorString, const QString &fileName, bool autoSave);
+    virtual QString fileName() const;
+    virtual void rename(const QString &newName);
+
+    virtual QString defaultPath() const;
+    virtual QString suggestedFileName() const;
+    virtual QString mimeType() const;
+
+    virtual bool isModified() const;
+    virtual bool isReadOnly() const;
+    virtual bool isSaveAsAllowed() const;
+
+    ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+    bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
+
+private:
+    Qt4PriFileNode *m_priFile;
+};
+
+class Qt4NodesWatcher : public ProjectExplorer::NodesWatcher
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(Qt4NodesWatcher)
+public:
+    Qt4NodesWatcher(QObject *parent = 0);
+
+signals:
+    void projectTypeChanged(Qt4ProjectManager::Qt4ProFileNode *projectNode,
+                            const Qt4ProjectManager::Qt4ProjectType oldType,
+                            const Qt4ProjectManager::Qt4ProjectType newType);
+
+    void variablesChanged(Qt4ProFileNode *projectNode,
+                          const QHash<Qt4Variable, QStringList> &oldValues,
+                          const QHash<Qt4Variable, QStringList> &newValues);
+
+    void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *projectNode, bool success);
+    void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *projectNode);
+
+private:
+    // let them emit signals
+    friend class Qt4ProjectManager::Qt4ProFileNode;
+    friend class Qt4PriFileNode;
+};
+
+} // namespace Internal
+
+struct QT4PROJECTMANAGER_EXPORT TargetInformation
 {
     bool valid;
     QString workingDir;
@@ -260,26 +288,26 @@ struct TargetInformation
 
 };
 
-struct InstallsItem {
+struct QT4PROJECTMANAGER_EXPORT InstallsItem {
     InstallsItem(QString p, QStringList f) : path(p), files(f) {}
     QString path;
     QStringList files;
 };
 
-struct InstallsList {
+struct QT4PROJECTMANAGER_EXPORT InstallsList {
     void clear() { targetPath.clear(); items.clear(); }
     QString targetPath;
     QList<InstallsItem> items;
 };
 
-struct ProjectVersion {
+struct QT4PROJECTMANAGER_EXPORT ProjectVersion {
     int major;
     int minor;
     int patch;
 };
 
 // Implements ProjectNode for qt4 pro files
-class Qt4ProFileNode : public Qt4PriFileNode
+class QT4PROJECTMANAGER_EXPORT Qt4ProFileNode : public Internal::Qt4PriFileNode
 {
     Q_OBJECT
     Q_DISABLE_COPY(Qt4ProFileNode)
@@ -375,32 +403,6 @@ private:
     QtSupport::ProFileReader *m_readerCumulative;
 };
 
-class Qt4NodesWatcher : public ProjectExplorer::NodesWatcher
-{
-    Q_OBJECT
-    Q_DISABLE_COPY(Qt4NodesWatcher)
-public:
-    Qt4NodesWatcher(QObject *parent = 0);
-
-signals:
-    void projectTypeChanged(Qt4ProjectManager::Internal::Qt4ProFileNode *projectNode,
-                            const Qt4ProjectManager::Internal::Qt4ProjectType oldType,
-                            const Qt4ProjectManager::Internal::Qt4ProjectType newType);
-
-    void variablesChanged(Qt4ProFileNode *projectNode,
-                          const QHash<Qt4Variable, QStringList> &oldValues,
-                          const QHash<Qt4Variable, QStringList> &newValues);
-
-    void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *projectNode, bool success);
-    void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *projectNode);
-
-private:
-    // let them emit signals
-    friend class Qt4ProFileNode;
-    friend class Qt4PriFileNode;
-};
-
-} // namespace Internal
 } // namespace Qt4ProjectManager
 
 #endif // QT4NODES_H
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 99500ee7d55beb1925936eeeb75de3d925ab18d6..f4f68ba9a89e05b59d7204ae16b66b5dac1e8f10 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -338,11 +338,11 @@ bool Qt4Project::fromMap(const QVariantMap &map)
     foreach (Target *t, targets())
         onAddedTarget(t);
 
-    connect(m_nodesWatcher, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
-            this, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *,bool)));
+    connect(m_nodesWatcher, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+            this, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *,bool)));
 
-    connect(m_nodesWatcher, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
-            this, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
+    connect(m_nodesWatcher, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)),
+            this, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)));
 
     // Now we emit update once :)
     m_rootProjectNode->emitProFileUpdated();
@@ -616,7 +616,7 @@ void Qt4Project::scheduleAsyncUpdate(Qt4ProFileNode *node)
         // Add the node
         m_asyncUpdateState = AsyncPartialUpdatePending;
 
-        QList<Internal::Qt4ProFileNode *>::iterator it;
+        QList<Qt4ProFileNode *>::iterator it;
         bool add = true;
         if (debug)
             qDebug()<<"scheduleAsyncUpdate();"<<m_partialEvaluate.size()<<"nodes";
@@ -954,8 +954,8 @@ void Qt4Project::collectAllfProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNo
 
 void Qt4Project::collectApplicationProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node)
 {
-    if (node->projectType() == Internal::ApplicationTemplate
-        || node->projectType() == Internal::ScriptTemplate) {
+    if (node->projectType() == ApplicationTemplate
+        || node->projectType() == ScriptTemplate) {
         list.append(node);
     }
     foreach (ProjectNode *n, node->subProjectNodes()) {
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index b68489e9c6009dc79bca027528a31fcdcf84ff61..c9a5f02036fa174bfe97b2e93c3f82cfadd42191 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -56,11 +56,11 @@ class ProFileReader;
 }
 
 namespace Qt4ProjectManager {
+class Qt4ProFileNode;
 
 namespace Internal {
     class DeployHelperRunStep;
     class FileItem;
-    class Qt4ProFileNode;
     class Qt4PriFileNode;
     class GCCPreprocessor;
     struct Qt4ProjectFiles;
@@ -153,7 +153,7 @@ public:
     QList<Core::IFile *> dependencies();     //NBS remove
     QList<ProjectExplorer::Project *>dependsOn();
 
-    Internal::Qt4ProFileNode *rootProjectNode() const;
+    Qt4ProFileNode *rootProjectNode() const;
     bool validParse(const QString &proFilePath) const;
 
     virtual QStringList files(FilesMode fileMode) const;
@@ -161,20 +161,20 @@ public:
 
     QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
 
-    QList<Internal::Qt4ProFileNode *> allProFiles() const;
-    QList<Internal::Qt4ProFileNode *> applicationProFiles() const;
+    QList<Qt4ProFileNode *> allProFiles() const;
+    QList<Qt4ProFileNode *> applicationProFiles() const;
     bool hasApplicationProFile(const QString &path) const;
     QStringList applicationProFilePathes(const QString &prepend = QString()) const;
 
     void notifyChanged(const QString &name);
 
     /// \internal
-    QtSupport::ProFileReader *createProFileReader(Internal::Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc = 0);
+    QtSupport::ProFileReader *createProFileReader(Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc = 0);
     /// \internal
     void destroyProFileReader(QtSupport::ProFileReader *reader);
 
     /// \internal
-    void scheduleAsyncUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *node);
+    void scheduleAsyncUpdate(Qt4ProjectManager::Qt4ProFileNode *node);
     /// \internal
     void incrementPendingEvaluateFutures();
     /// \internal
@@ -188,8 +188,8 @@ public:
     void updateFileList();
 
 signals:
-    void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *node, bool);
-    void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *node);
+    void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool);
+    void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *node);
     void buildDirectoryInitialized();
     void fromMapFinished();
 
@@ -216,9 +216,9 @@ private:
     void updateQmlJSCodeModel();
 
 
-    static void collectAllfProFiles(QList<Internal::Qt4ProFileNode *> &list, Internal::Qt4ProFileNode *node);
-    static void collectApplicationProFiles(QList<Internal::Qt4ProFileNode *> &list, Internal::Qt4ProFileNode *node);
-    static void findProFile(const QString& fileName, Internal::Qt4ProFileNode *root, QList<Internal::Qt4ProFileNode *> &list);
+    static void collectAllfProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node);
+    static void collectApplicationProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node);
+    static void findProFile(const QString& fileName, Qt4ProFileNode *root, QList<Qt4ProFileNode *> &list);
     static bool hasSubNode(Internal::Qt4PriFileNode *root, const QString &path);
 
     static bool equalFileList(const QStringList &a, const QStringList &b);
@@ -228,7 +228,7 @@ private:
     static QString qmakeVarName(ProjectExplorer::FileType type);
 
     Qt4Manager *m_manager;
-    Internal::Qt4ProFileNode *m_rootProjectNode;
+    Qt4ProFileNode *m_rootProjectNode;
     Internal::Qt4NodesWatcher *m_nodesWatcher;
 
     Qt4ProjectFile *m_fileInfo;
@@ -250,7 +250,7 @@ private:
     enum AsyncUpdateState { NoState, Base, AsyncFullUpdatePending, AsyncPartialUpdatePending, AsyncUpdateInProgress, ShuttingDown };
     AsyncUpdateState m_asyncUpdateState;
     bool m_cancelEvaluate;
-    QList<Internal::Qt4ProFileNode *> m_partialEvaluate;
+    QList<Qt4ProFileNode *> m_partialEvaluate;
 
     QFuture<void> m_codeModelFuture;
 
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index d024c25456945db6cd01e1769979aae313d87913..7ddf9058c7689e8622ee464520751c2cd8bc9be8 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -148,7 +148,6 @@ RESOURCES += qt4projectmanager.qrc \
     wizards/wizards.qrc
 
 include(qt-s60/qt-s60.pri)
-include(qt-maemo/qt-maemo.pri)
 include(qt-desktop/qt-desktop.pri)
 include(customwidgetwizard/customwidgetwizard.pri)
 
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
index c8d67d0716d022de0e9382ea11b8debfc7c08041..377b45fee94c3fa96f6881fa4bd26baa2a83e07d 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
+++ b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
@@ -2,6 +2,5 @@ include(../../plugins/projectexplorer/projectexplorer.pri)
 include(../../plugins/qtsupport/qtsupport.pri)
 include(../../plugins/cpptools/cpptools.pri)
 include(../../plugins/debugger/debugger.pri)
-include(../../plugins/analyzerbase/analyzerbase.pri)
 include(../../libs/symbianutils/symbianutils.pri)
 include(../../libs/qmljs/qmljs.pri)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index ecf90f46dae54150432fb03593e2a2d389495e8f..83ea47b64c9f3a9f4d7740a5e633208563bfdfdc 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -53,7 +53,6 @@
 #include "gettingstartedwelcomepage.h"
 #include "profilecompletionassist.h"
 
-#include "qt-maemo/maemomanager.h"
 #include "qt-s60/s60manager.h"
 #include "qt-desktop/qt4desktoptargetfactory.h"
 #include "qt-desktop/qt4simulatortargetfactory.h"
@@ -160,7 +159,6 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
     addAutoReleasedObject(new LinguistExternalEditor);
 
     addAutoReleasedObject(new S60Manager);
-    addAutoReleasedObject(new MaemoManager);
 
     addAutoReleasedObject(new Qt4DesktopTargetFactory);
     addAutoReleasedObject(new Qt4SimulatorTargetFactory);
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index 413f4beee66a4b9a372875e68535cfae2e61aadd..630d962af1a5ec13c208ba2c894be97cddba05b9 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -52,11 +52,15 @@
 #include <utils/pathchooser.h>
 #include <utils/detailswidget.h>
 
+#include <QtCore/QCoreApplication>
 #include <QtGui/QPushButton>
 #include <QtGui/QMessageBox>
 #include <QtGui/QCheckBox>
 #include <QtGui/QComboBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
 #include <QtGui/QMainWindow>
+#include <QtGui/QVBoxLayout>
 
 #include <algorithm>
 
diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h
index 5ff753d54831c1b678949b15c07f4d5fe3cd8d1b..545593b1d323bc42a14e55ab07211a142a9d9141 100644
--- a/src/plugins/qt4projectmanager/qt4target.h
+++ b/src/plugins/qt4projectmanager/qt4target.h
@@ -58,10 +58,7 @@ QT_END_NAMESPACE
 namespace Qt4ProjectManager {
 class Qt4Project;
 class Qt4BaseTargetFactory;
-
-namespace Internal {
 class Qt4ProFileNode;
-}
 
 class QT4PROJECTMANAGER_EXPORT Qt4BaseTarget : public ProjectExplorer::Target
 {
diff --git a/src/plugins/remotelinux/RemoteLinux.pluginspec.in b/src/plugins/remotelinux/RemoteLinux.pluginspec.in
new file mode 100644
index 0000000000000000000000000000000000000000..d08e4e34cfbbefe410e3d15df2426f66bf8b0bd0
--- /dev/null
+++ b/src/plugins/remotelinux/RemoteLinux.pluginspec.in
@@ -0,0 +1,23 @@
+<plugin name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
+    <vendor>Nokia Corporation</vendor>
+    <copyright>(C) 2011 Nokia Corporation</copyright>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation.  Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+    </license>
+    <description>Support for deployment to and execution on a remote Linux host.</description>
+    <category>Device Support</category>
+    <url>http://qt.nokia.com</url>
+    <dependencyList>
+    <dependency name=\"AnalyzerBase\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
+    </dependencyList>
+</plugin>
diff --git a/src/plugins/qt4projectmanager/qt-maemo/abstractlinuxdevicedeploystep.cpp b/src/plugins/remotelinux/abstractlinuxdevicedeploystep.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/abstractlinuxdevicedeploystep.cpp
rename to src/plugins/remotelinux/abstractlinuxdevicedeploystep.cpp
index 265a8860131b7c95b448bf9b5178000a3d282f13..3b80a8dac6bc09a07786e9b1bd711d78bac63a76 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/abstractlinuxdevicedeploystep.cpp
+++ b/src/plugins/remotelinux/abstractlinuxdevicedeploystep.cpp
@@ -38,7 +38,7 @@
 
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 
@@ -107,4 +107,4 @@ bool LinuxDeviceDeployStepHelper::fromMap(const QVariantMap &map)
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/abstractlinuxdevicedeploystep.h b/src/plugins/remotelinux/abstractlinuxdevicedeploystep.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/abstractlinuxdevicedeploystep.h
rename to src/plugins/remotelinux/abstractlinuxdevicedeploystep.h
index e3a4ece673775b43c836c49747de0b6149b46ed8..7c0dcff96e5a2810846c46200686b0f333890755 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/abstractlinuxdevicedeploystep.h
+++ b/src/plugins/remotelinux/abstractlinuxdevicedeploystep.h
@@ -40,7 +40,7 @@
 
 namespace ProjectExplorer { class DeployConfiguration; }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class Qt4MaemoDeployConfiguration;
 
@@ -97,6 +97,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // ABSTRACTLINUXDEVICEDEPLOYSTEP_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp b/src/plugins/remotelinux/abstractmaemodeploystep.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp
rename to src/plugins/remotelinux/abstractmaemodeploystep.cpp
index 57033b746e7358d44ebd50466b2e82f08e8812f3..b73d717661e8f1b2a35daf8826c9034a617cf84a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp
+++ b/src/plugins/remotelinux/abstractmaemodeploystep.cpp
@@ -45,7 +45,6 @@
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
 
 #include <utils/ssh/sshconnectionmanager.h>
 
@@ -58,8 +57,9 @@
 using namespace Core;
 using namespace Utils;
 using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 
@@ -407,6 +407,6 @@ void MaemoDeployEventHandler::checkForCanceled()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #include "abstractmaemodeploystep.moc"
diff --git a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.h b/src/plugins/remotelinux/abstractmaemodeploystep.h
similarity index 95%
rename from src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.h
rename to src/plugins/remotelinux/abstractmaemodeploystep.h
index 210eb71cb435aa98bd3584708b58a69fb125060f..aa490db42034751fe7186e9841737ce3a477bcb6 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.h
+++ b/src/plugins/remotelinux/abstractmaemodeploystep.h
@@ -49,10 +49,10 @@ QT_BEGIN_NAMESPACE
 class QEventLoop;
 QT_END_NAMESPACE
 
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
 namespace Utils { class SshConnection; }
 
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
+namespace RemoteLinux {
 namespace Internal {
 class AbstractMaemoPackageCreationStep;
 class MaemoDeviceConfig;
@@ -91,7 +91,7 @@ protected:
     virtual const AbstractMaemoPackageCreationStep *packagingStep() const=0;
 
     QString deployMountPoint() const;
-    const Qt4BuildConfiguration *qt4BuildConfiguration() const;
+    const Qt4ProjectManager::Qt4BuildConfiguration *qt4BuildConfiguration() const;
     QSharedPointer<Utils::SshConnection> connection() const { return m_connection; }
 
 private slots:
@@ -127,6 +127,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // ABSTRACTMAEMODEPLOYSTEP_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/images/qemu-run.png b/src/plugins/remotelinux/images/qemu-run.png
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/images/qemu-run.png
rename to src/plugins/remotelinux/images/qemu-run.png
diff --git a/src/plugins/qt4projectmanager/qt-maemo/images/qemu-stop.png b/src/plugins/remotelinux/images/qemu-stop.png
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/images/qemu-stop.png
rename to src/plugins/remotelinux/images/qemu-stop.png
diff --git a/src/plugins/qt4projectmanager/qt-maemo/images/qemu.xcf b/src/plugins/remotelinux/images/qemu.xcf
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/images/qemu.xcf
rename to src/plugins/remotelinux/images/qemu.xcf
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoanalyzersupport.cpp b/src/plugins/remotelinux/maemoanalyzersupport.cpp
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoanalyzersupport.cpp
rename to src/plugins/remotelinux/maemoanalyzersupport.cpp
index ec14f7751df3ff037aa1d71c3cc7b995812be607..4eeb87505d63f2eaea6c10be4baa1c1ad72d8f5f 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoanalyzersupport.cpp
+++ b/src/plugins/remotelinux/maemoanalyzersupport.cpp
@@ -44,7 +44,7 @@ using namespace Utils;
 using namespace Analyzer;
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 RunControl *MaemoAnalyzerSupport::createAnalyzerRunControl(MaemoRunConfiguration *runConfig)
@@ -73,4 +73,4 @@ RunControl *MaemoAnalyzerSupport::createAnalyzerRunControl(MaemoRunConfiguration
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoanalyzersupport.h b/src/plugins/remotelinux/maemoanalyzersupport.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoanalyzersupport.h
rename to src/plugins/remotelinux/maemoanalyzersupport.h
index e7ee3ea7e1adab29675c059e42e162bc0dabe960..0cd6a515ab55091a0448dc890dc69ee80282b0c6 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoanalyzersupport.h
+++ b/src/plugins/remotelinux/maemoanalyzersupport.h
@@ -35,7 +35,7 @@
 
 #include "maemorunconfiguration.h"
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 namespace MaemoAnalyzerSupport {
@@ -45,6 +45,6 @@ ProjectExplorer::RunControl *createAnalyzerRunControl(MaemoRunConfiguration *run
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOANALYZERSUPPORT_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp b/src/plugins/remotelinux/maemoconfigtestdialog.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
rename to src/plugins/remotelinux/maemoconfigtestdialog.cpp
index d652a69475b51c19ab1691a91616b041fc28849b..dbe6af8f3c5b1a844c3a179bccc9587b239f8c71 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
+++ b/src/plugins/remotelinux/maemoconfigtestdialog.cpp
@@ -43,7 +43,7 @@
 
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoConfigTestDialog::MaemoConfigTestDialog(const MaemoDeviceConfig::ConstPtr &config,
@@ -301,4 +301,4 @@ QString MaemoConfigTestDialog::parseTestOutput()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.h b/src/plugins/remotelinux/maemoconfigtestdialog.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.h
rename to src/plugins/remotelinux/maemoconfigtestdialog.h
index 45fca1750ce24a17c6a26c492b57d08c77f180d9..9a4a3586ac5a448c9104e724dba68dab6c1b7d1d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.h
+++ b/src/plugins/remotelinux/maemoconfigtestdialog.h
@@ -44,7 +44,7 @@ namespace Utils {
     class SshRemoteProcessRunner;
 } // namespace Utils
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoDeviceConfig;
@@ -91,6 +91,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOCONFIGTESTDIALOG_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.ui b/src/plugins/remotelinux/maemoconfigtestdialog.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.ui
rename to src/plugins/remotelinux/maemoconfigtestdialog.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h b/src/plugins/remotelinux/maemoconstants.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
rename to src/plugins/remotelinux/maemoconstants.h
index 3e582f8b5e9a669618e115a26aa015691e951e1f..422b039b2321cb436facddd8347d7a61117cf5e5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
+++ b/src/plugins/remotelinux/maemoconstants.h
@@ -34,7 +34,7 @@
 
 #include <QtCore/QLatin1String>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 #define PREFIX "Qt4ProjectManager.MaemoRunConfiguration"
@@ -69,6 +69,6 @@ const char * const MAEMO_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectMan
 const char * const MAEMO_SETTINGS_CATEGORY_ICON = ":/projectexplorer/images/MaemoDevice.png";
 }
 
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif  // MAEMOCONSTANTS_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/remotelinux/maemodebugsupport.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
rename to src/plugins/remotelinux/maemodebugsupport.cpp
index 79efdf985809e266c99e55ce78164ba042f59f39..b47cd36cd64293757982d54e8272250adee076d9 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
+++ b/src/plugins/remotelinux/maemodebugsupport.cpp
@@ -53,7 +53,7 @@ using namespace Utils;
 using namespace Debugger;
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runConfig)
@@ -319,4 +319,4 @@ bool MaemoDebugSupport::setPort(int &port)
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.h b/src/plugins/remotelinux/maemodebugsupport.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.h
rename to src/plugins/remotelinux/maemodebugsupport.h
index ac441179eea4eba43425c49627d9aa8ff89d0109..acadec8663c81c334224f5ffcf5bf4b302a6a470 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.h
+++ b/src/plugins/remotelinux/maemodebugsupport.h
@@ -45,7 +45,7 @@ class DebuggerEngine;
 }
 namespace ProjectExplorer { class RunControl; }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoDeviceConfig;
@@ -100,6 +100,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEBUGSUPPORT_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployable.h b/src/plugins/remotelinux/maemodeployable.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeployable.h
rename to src/plugins/remotelinux/maemodeployable.h
index 2c9a35d1e4eaa5509939c63a1b686f86809201d6..1539cfbdc3fa2ddbd9b2f2c32c490fc963fb3b6c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployable.h
+++ b/src/plugins/remotelinux/maemodeployable.h
@@ -36,7 +36,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QString>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoDeployable
@@ -62,7 +62,7 @@ inline uint qHash(const MaemoDeployable &d)
     return qHash(qMakePair(d.localFilePath, d.remoteDir));
 }
 
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 } // namespace Internal
 
 #endif // MAEMODEPLOYABLE_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp b/src/plugins/remotelinux/maemodeployablelistmodel.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
rename to src/plugins/remotelinux/maemodeployablelistmodel.cpp
index e262b63043ab96cba75212ab3fa5990764669eca..b92e128887c18eebf770c5a4ad859821ccc8e540 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
+++ b/src/plugins/remotelinux/maemodeployablelistmodel.cpp
@@ -39,6 +39,7 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qt4nodes.h>
 #include <qt4projectmanager/qt4target.h>
 #include <qtsupport/baseqtversion.h>
 
@@ -51,7 +52,9 @@
 #include <QtGui/QImageReader>
 #include <QtGui/QMainWindow>
 
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoDeployableListModel::MaemoDeployableListModel(const Qt4ProFileNode *proFileNode,
@@ -360,5 +363,5 @@ QString MaemoDeployableListModel::remoteIconDir() const
             .arg(MaemoGlobal::applicationIconSize(MaemoGlobal::version(qv->qmakeCommand())));
 }
 
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h b/src/plugins/remotelinux/maemodeployablelistmodel.h
similarity index 89%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h
rename to src/plugins/remotelinux/maemodeployablelistmodel.h
index e858e110b69699542f14285ca1a126b07383be97..c302d8eac67334584d9818795d2e9f70627bc19c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h
+++ b/src/plugins/remotelinux/maemodeployablelistmodel.h
@@ -47,7 +47,7 @@ namespace QtSupport {
 class BaseQtVersion;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoDeployableListModel : public QAbstractTableModel
@@ -58,7 +58,7 @@ public:
         UpdateProFile, DontUpdateProFile, AskToUpdateProFile
     };
 
-    MaemoDeployableListModel(const Qt4ProFileNode *proFileNode,
+    MaemoDeployableListModel(const Qt4ProjectManager::Qt4ProFileNode *proFileNode,
         ProFileUpdateSetting updateSetting, QObject *parent);
     ~MaemoDeployableListModel();
 
@@ -73,8 +73,8 @@ public:
     QString projectName() const { return m_projectName; }
     QString projectDir() const;
     QString proFilePath() const { return m_proFilePath; }
-    Qt4ProjectType projectType() const { return m_projectType; }
-    bool isApplicationProject() const { return m_projectType == ApplicationTemplate; }
+    Qt4ProjectManager::Qt4ProjectType projectType() const { return m_projectType; }
+    bool isApplicationProject() const { return m_projectType == Qt4ProjectManager::ApplicationTemplate; }
     QString applicationName() const { return m_targetInfo.target; }
     bool hasTargetPath() const { return m_hasTargetPath; }
     bool canAddDesktopFile() const { return isApplicationProject() && !hasDesktopFile(); }
@@ -107,12 +107,12 @@ private:
     QString remoteIconDir() const;
     QStringList localLibraryFilePaths() const;
 
-    const Qt4ProjectType m_projectType;
+    const Qt4ProjectManager::Qt4ProjectType m_projectType;
     const QString m_proFilePath;
     const QString m_projectName;
-    const TargetInformation m_targetInfo;
-    const InstallsList m_installsList;
-    const ProjectVersion m_projectVersion;
+    const Qt4ProjectManager::TargetInformation m_targetInfo;
+    const Qt4ProjectManager::InstallsList m_installsList;
+    const Qt4ProjectManager::ProjectVersion m_projectVersion;
     const QStringList m_config;
     QList<MaemoDeployable> m_deployables;
     mutable bool m_modified;
@@ -120,7 +120,7 @@ private:
     bool m_hasTargetPath;
 };
 
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 } // namespace Internal
 
 #endif // MAEMOPACKAGECONTENTS_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp b/src/plugins/remotelinux/maemodeployables.cpp
similarity index 94%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
rename to src/plugins/remotelinux/maemodeployables.cpp
index 15ebbbfafe07cf32dc6feac78a6a08122bcc6a77..c0a0621093bedbcbb0719583e60f3155e7bb14ad 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
+++ b/src/plugins/remotelinux/maemodeployables.cpp
@@ -35,14 +35,15 @@
 
 #include <proparser/profileevaluator.h>
 #include <projectexplorer/buildstep.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qt4projectmanager/qt4project.h>
 #include <qt4projectmanager/qt4target.h>
 
 #include <QtCore/QTimer>
 
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoDeployables::MaemoDeployables(const Qt4BaseTarget *target)
@@ -59,7 +60,7 @@ MaemoDeployables::~MaemoDeployables() {}
 void MaemoDeployables::init()
 {
     Qt4Project * const pro = m_target->qt4Project();
-    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
+    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
             m_updateTimer, SLOT(start()));
 
     // TODO do we want to disable the view
@@ -77,7 +78,7 @@ void MaemoDeployables::createModels()
         return;
     m_updateTimer->stop();
     disconnect(m_target->qt4Project(),
-        SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
+        SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
         m_updateTimer, SLOT(start()));
     beginResetModel();
     qDeleteAll(m_listModels);
@@ -109,7 +110,7 @@ void MaemoDeployables::createModels()
 
     endResetModel();
     connect(m_target->qt4Project(),
-            SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
+            SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
             m_updateTimer, SLOT(start()));
 }
 
@@ -216,5 +217,5 @@ QVariant MaemoDeployables::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h b/src/plugins/remotelinux/maemodeployables.h
similarity index 90%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h
rename to src/plugins/remotelinux/maemodeployables.h
index a21745bb9167e0346f1f741e45c6290ace0132de..78feff3e85193b30d31a32974c802164bb98dd34 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h
+++ b/src/plugins/remotelinux/maemodeployables.h
@@ -44,15 +44,17 @@ QT_FORWARD_DECLARE_CLASS(QTimer)
 namespace Qt4ProjectManager {
 class Qt4BuildConfiguration;
 class Qt4BaseTarget;
+class Qt4ProFileNode;
+} // namespace Qt4ProjectManager
 
+namespace RemoteLinux {
 namespace Internal {
-class Qt4ProFileNode;
 
 class MaemoDeployables : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    MaemoDeployables(const Qt4BaseTarget *target);
+    MaemoDeployables(const Qt4ProjectManager::Qt4BaseTarget *target);
     ~MaemoDeployables();
     void setUnmodified();
     bool isModified() const;
@@ -70,15 +72,15 @@ private:
 
     Q_SLOT void createModels();
     Q_SLOT void init();
-    void createModels(const Qt4ProFileNode *proFileNode);
+    void createModels(const Qt4ProjectManager::Qt4ProFileNode *proFileNode);
 
     QList<MaemoDeployableListModel *> m_listModels;
     UpdateSettingsMap m_updateSettings;
-    const Qt4BaseTarget * const m_target;
+    const Qt4ProjectManager::Qt4BaseTarget * const m_target;
     QTimer *const m_updateTimer;
 };
 
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 } // namespace Internal
 
 #endif // MAEMODEPLOYABLES_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp b/src/plugins/remotelinux/maemodeploybymountstep.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp
rename to src/plugins/remotelinux/maemodeploybymountstep.cpp
index eddcc68bf0c7a5bddcbd430e9fd0634323ac886e..8fe01868004eb3d37cb02dc15f57d3a6901c92f8 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp
+++ b/src/plugins/remotelinux/maemodeploybymountstep.cpp
@@ -48,8 +48,9 @@
 #define ASSERT_STATE(state) ASSERT_STATE_GENERIC(ExtendedState, state, m_extendedState)
 
 using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 AbstractMaemoDeployByMountStep::AbstractMaemoDeployByMountStep(BuildStepList *parent,
@@ -389,4 +390,4 @@ const QString MaemoMountAndCopyDeployStep::DisplayName
     = tr("Deploy files via UTFS mount");
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.h b/src/plugins/remotelinux/maemodeploybymountstep.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.h
rename to src/plugins/remotelinux/maemodeploybymountstep.h
index e9159474c3764aea299f3de8f0397b866f8e69ab..68256dbceb5cbc7d12df803a2ade753f86cabf57 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.h
+++ b/src/plugins/remotelinux/maemodeploybymountstep.h
@@ -38,7 +38,7 @@
 #include "maemodeployable.h"
 #include "maemomountspecification.h"
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class AbstractMaemoPackageInstaller;
 class MaemoDeploymentMounter;
@@ -139,6 +139,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEPLOYBYMOUNTSTEP_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.cpp b/src/plugins/remotelinux/maemodeployconfigurationwidget.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.cpp
rename to src/plugins/remotelinux/maemodeployconfigurationwidget.cpp
index ed80e2206d35571d3e5ce9b64522954decdbe3dc..fb89a71089795476d90c4ebca77a332dba69ff0d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/maemodeployconfigurationwidget.cpp
@@ -45,7 +45,7 @@
 
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoDeployConfigurationWidget::MaemoDeployConfigurationWidget(QWidget *parent)
@@ -168,4 +168,4 @@ void MaemoDeployConfigurationWidget::addIcon()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.h b/src/plugins/remotelinux/maemodeployconfigurationwidget.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.h
rename to src/plugins/remotelinux/maemodeployconfigurationwidget.h
index 59d42254c81dd5605ca676bd68b08b69fa6734c1..4da395d568f77a3be75b26d1b9f5808cc2959534 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.h
+++ b/src/plugins/remotelinux/maemodeployconfigurationwidget.h
@@ -41,7 +41,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class Qt4MaemoDeployConfiguration;
 
@@ -67,6 +67,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEPLOYCONFIGURATIONWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.ui b/src/plugins/remotelinux/maemodeployconfigurationwidget.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.ui
rename to src/plugins/remotelinux/maemodeployconfigurationwidget.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploymentmounter.cpp b/src/plugins/remotelinux/maemodeploymentmounter.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploymentmounter.cpp
rename to src/plugins/remotelinux/maemodeploymentmounter.cpp
index 89f1f4e342a3c58711b01e23b286194205304601..06c1de8980d71f5b68754ec63519e63a97221fd7 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploymentmounter.cpp
+++ b/src/plugins/remotelinux/maemodeploymentmounter.cpp
@@ -41,9 +41,10 @@
 
 #define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
 
+using namespace Qt4ProjectManager;
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoDeploymentMounter::MaemoDeploymentMounter(QObject *parent)
@@ -203,4 +204,4 @@ void MaemoDeploymentMounter::setState(State newState)
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploymentmounter.h b/src/plugins/remotelinux/maemodeploymentmounter.h
similarity index 92%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploymentmounter.h
rename to src/plugins/remotelinux/maemodeploymentmounter.h
index 7ee41129c6da4e48c70f777476871aef663ad049..10698e4d8120c051e4a2d868e34896a4a374d7fd 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploymentmounter.h
+++ b/src/plugins/remotelinux/maemodeploymentmounter.h
@@ -41,9 +41,9 @@
 #include <QtCore/QSharedPointer>
 
 namespace Utils { class SshConnection; }
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
 
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeviceConfig;
 class MaemoRemoteMounter;
@@ -59,7 +59,7 @@ public:
     void setupMounts(const QSharedPointer<Utils::SshConnection> &connection,
         const QSharedPointer<const MaemoDeviceConfig> &devConf,
         const QList<MaemoMountSpecification> &mountSpecs,
-        const Qt4BuildConfiguration *bc);
+        const Qt4ProjectManager::Qt4BuildConfiguration *bc);
     void tearDownMounts();
 
 signals:
@@ -94,10 +94,10 @@ private:
     MaemoUsedPortsGatherer * const m_portsGatherer;
     MaemoPortList m_freePorts;
     QList<MaemoMountSpecification> m_mountSpecs;
-    const Qt4BuildConfiguration *m_buildConfig;
+    const Qt4ProjectManager::Qt4BuildConfiguration *m_buildConfig;
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEPLOYMENTMOUNTER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h b/src/plugins/remotelinux/maemodeploystep.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
rename to src/plugins/remotelinux/maemodeploystep.h
index 9bccdc39bcc467d5473ad90a470b7da7279287ca..1fe21d19c0f29c9294a6ca237ea8e4a6b535c8e5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
+++ b/src/plugins/remotelinux/maemodeploystep.h
@@ -53,7 +53,7 @@ namespace Utils {
 class SshConnection;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 class Qt4BuildConfiguration;
 namespace Internal {
 class AbstractMaemoPackageCreationStep;
@@ -177,6 +177,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEPLOYSTEP_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp b/src/plugins/remotelinux/maemodeploystepfactory.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp
rename to src/plugins/remotelinux/maemodeploystepfactory.cpp
index cb1356673a9413025482e88b57ecf0ce0dbb4d6e..7b1d765c4bea499dc94fa1796e9a43d545c90e6c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp
+++ b/src/plugins/remotelinux/maemodeploystepfactory.cpp
@@ -44,13 +44,12 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
 
 #include <QtCore/QCoreApplication>
 
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 const QString OldMaemoDeployStepId(QLatin1String("Qt4ProjectManager.MaemoDeployStep"));
@@ -209,4 +208,4 @@ BuildStep *MaemoDeployStepFactory::clone(BuildStepList *parent, BuildStep *produ
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.h b/src/plugins/remotelinux/maemodeploystepfactory.h
similarity index 95%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.h
rename to src/plugins/remotelinux/maemodeploystepfactory.h
index 9d17c36bc640099e8a92a13224324eb0e321d7ff..8f0274ac5b18c0eccb14a0e95897f2debf21f212 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.h
+++ b/src/plugins/remotelinux/maemodeploystepfactory.h
@@ -35,13 +35,13 @@
 
 #include <projectexplorer/buildstep.h>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoDeployStepFactory : public ProjectExplorer::IBuildStepFactory
 {
 public:
-    MaemoDeployStepFactory(QObject *parent);
+    MaemoDeployStepFactory(QObject *parent = 0);
 
     virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
     virtual QString displayNameForId(const QString &id) const;
@@ -64,6 +64,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEPLOYSTEPFACTORY_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp b/src/plugins/remotelinux/maemodeploystepwidget.cpp
similarity index 94%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
rename to src/plugins/remotelinux/maemodeploystepwidget.cpp
index 33aadb9f3d93ec7dd4e4a4204724b6185159b465..95030cd448d5f2da0908e130d77fffd8d59bb1b8 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
+++ b/src/plugins/remotelinux/maemodeploystepwidget.cpp
@@ -37,7 +37,6 @@
 #include "maemodeviceconfigurations.h"
 #include "maemosettingspages.h"
 #include "maemoglobal.h"
-#include "maemomanager.h"
 #include "maemopertargetdeviceconfigurationlistmodel.h"
 #include "maemorunconfiguration.h"
 #include "qt4maemodeployconfiguration.h"
@@ -50,7 +49,7 @@
 
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoDeployStepBaseWidget::MaemoDeployStepBaseWidget(AbstractLinuxDeviceDeployStep *step) :
@@ -127,9 +126,8 @@ void MaemoDeployStepBaseWidget::setCurrentDeviceConfig(int index)
 
 void MaemoDeployStepBaseWidget::showDeviceConfigurations()
 {
-    MaemoDeviceConfigurationsSettingsPage *page
-        = MaemoManager::instance().deviceConfigurationsSettingsPage();
-    Core::ICore::instance()->showOptionsDialog(page->category(), page->id());
+    Core::ICore::instance()->showOptionsDialog(MaemoDeviceConfigurationsSettingsPage::Category,
+        MaemoDeviceConfigurationsSettingsPage::Id);
 }
 
 
@@ -141,4 +139,4 @@ MaemoDeployStepWidget::MaemoDeployStepWidget(AbstractMaemoDeployStep *step)
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h b/src/plugins/remotelinux/maemodeploystepwidget.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
rename to src/plugins/remotelinux/maemodeploystepwidget.h
index 7d915b9995904f94ded999217b8bcc0c69aa16cc..bab50818823a722cd74e85ee303e8ff359556a62 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
+++ b/src/plugins/remotelinux/maemodeploystepwidget.h
@@ -41,7 +41,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class AbstractLinuxDeviceDeployStep;
 class AbstractMaemoDeployStep;
@@ -85,6 +85,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEPLOYSTEPWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui b/src/plugins/remotelinux/maemodeploystepwidget.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
rename to src/plugins/remotelinux/maemodeploystepwidget.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp b/src/plugins/remotelinux/maemodeviceconfigurations.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
rename to src/plugins/remotelinux/maemodeviceconfigurations.cpp
index 1468fd747ac7e6ed94cbbbb0f13c075396305c4d..741fc1932bf9dc88596b87b170103bca38695572 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
+++ b/src/plugins/remotelinux/maemodeviceconfigurations.cpp
@@ -45,7 +45,7 @@
 
 typedef Utils::SshConnectionParameters::AuthenticationType AuthType;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 namespace {
@@ -687,4 +687,4 @@ QVariant MaemoDeviceConfigurations::data(const QModelIndex &index, int role) con
 MaemoDeviceConfigurations *MaemoDeviceConfigurations::m_instance = 0;
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h b/src/plugins/remotelinux/maemodeviceconfigurations.h
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
rename to src/plugins/remotelinux/maemodeviceconfigurations.h
index 88870533368dedce00fec2ad265147b9f7b7385c..76e1611cb4678abc27ebf4a6a06a153f697a1bb2 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
+++ b/src/plugins/remotelinux/maemodeviceconfigurations.h
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoPortList
@@ -189,6 +189,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEVICECONFIGURATIONS_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp b/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
rename to src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.cpp
index 058f437fd2a630b01aaa9841cdf4568327ece72a..2bf018a7cffb11afff776c62d0f1e736433807ab 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
+++ b/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.cpp
@@ -58,7 +58,7 @@
 using namespace Core;
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 const QLatin1String LastDeviceConfigIndexKey("LastDisplayedMaemoDeviceConfig");
@@ -451,4 +451,4 @@ void MaemoDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.h b/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.h
rename to src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.h
index e8a6390724f0d7740001b2eae0bfed07f89c6409..2c1d95a018b1fa8e92b9d7c7ca7a17151e60a307 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.h
+++ b/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.h
@@ -47,7 +47,7 @@ namespace Utils {
 class SshRemoteProcessRunner;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class NameValidator;
@@ -113,6 +113,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui b/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
rename to src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
rename to src/plugins/remotelinux/maemodeviceconfigwizard.cpp
index e9309ce8398151c16096652d6ce308ff307be280..4a422ed1f4bacd3e8531c5dcb0725e20540a66ac 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
+++ b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp
@@ -53,7 +53,7 @@
 
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 
@@ -722,6 +722,6 @@ int MaemoDeviceConfigWizard::nextId() const
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #include "maemodeviceconfigwizard.moc"
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.h b/src/plugins/remotelinux/maemodeviceconfigwizard.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.h
rename to src/plugins/remotelinux/maemodeviceconfigwizard.h
index 1a887ef6d135b590030f7e6796304ffc98f68806..51f70d2ab076c1b4d50be46b2f1285b9e5eb8370 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.h
+++ b/src/plugins/remotelinux/maemodeviceconfigwizard.h
@@ -35,7 +35,7 @@
 #include <QtCore/QScopedPointer>
 #include <QtGui/QWizard>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeviceConfig;
 class MaemoDeviceConfigurations;
@@ -56,6 +56,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEVICECONFIGWIZARD_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardkeycreationpage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardkeycreationpage.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardkeycreationpage.ui
rename to src/plugins/remotelinux/maemodeviceconfigwizardkeycreationpage.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardkeydeploymentpage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardkeydeploymentpage.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardkeydeploymentpage.ui
rename to src/plugins/remotelinux/maemodeviceconfigwizardkeydeploymentpage.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardlogindatapage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardlogindatapage.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardlogindatapage.ui
rename to src/plugins/remotelinux/maemodeviceconfigwizardlogindatapage.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui
rename to src/plugins/remotelinux/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardreusekeyscheckpage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardreusekeyscheckpage.ui
rename to src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardstartpage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardstartpage.ui
rename to src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp b/src/plugins/remotelinux/maemodeviceenvreader.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp
rename to src/plugins/remotelinux/maemodeviceenvreader.cpp
index 34ba12aaa612b5a120fdba71c31eefb5fc379d16..e0bcebdd3a07a953535f24e46f30050942676b72 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp
+++ b/src/plugins/remotelinux/maemodeviceenvreader.cpp
@@ -37,7 +37,7 @@
 
 #include <utils/ssh/sshremoteprocessrunner.h>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
     namespace Internal {
 
 MaemoDeviceEnvReader::MaemoDeviceEnvReader(QObject *parent, MaemoRunConfiguration *config)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.h b/src/plugins/remotelinux/maemodeviceenvreader.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.h
rename to src/plugins/remotelinux/maemodeviceenvreader.h
index 57faa1ac26fbc3b504300c571e9be5e5bbd1962c..bf8a7936538d0eeeccb76d5700fdbc72e17b34bb 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.h
+++ b/src/plugins/remotelinux/maemodeviceenvreader.h
@@ -41,7 +41,7 @@ namespace Utils {
     class SshRemoteProcessRunner;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoDeviceConfig;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodirectdeviceuploadstep.cpp b/src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodirectdeviceuploadstep.cpp
rename to src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp
index c6da54139063c2f5dcdf8400fab4f2c7f01b0d50..3746806285aa59011f1339ade86883d1eb29ea90 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodirectdeviceuploadstep.cpp
+++ b/src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp
@@ -48,7 +48,7 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoDirectDeviceUploadStep::MaemoDirectDeviceUploadStep(BuildStepList *parent)
@@ -246,4 +246,4 @@ const QString MaemoDirectDeviceUploadStep::DisplayName
     = tr("Upload files via SFTP");
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodirectdeviceuploadstep.h b/src/plugins/remotelinux/maemodirectdeviceuploadstep.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemodirectdeviceuploadstep.h
rename to src/plugins/remotelinux/maemodirectdeviceuploadstep.h
index 28e73917027f8384889f8f740653fab3f269b1a0..3f9d7165b9daff1c51c377eb45ea9ff3e83a6fb0 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodirectdeviceuploadstep.h
+++ b/src/plugins/remotelinux/maemodirectdeviceuploadstep.h
@@ -45,7 +45,7 @@ class SshRemoteProcess;
 class SftpChannel;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeployable;
 
@@ -89,6 +89,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODIRECTDEVICEUPLOADSTEP_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp b/src/plugins/remotelinux/maemoglobal.cpp
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
rename to src/plugins/remotelinux/maemoglobal.cpp
index b304e946e6094bc29a3806ab3e36f21c2d450175..05ccb0d4d36db49f2555f9ee42e6f1bcda344034 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
+++ b/src/plugins/remotelinux/maemoglobal.cpp
@@ -50,7 +50,10 @@
 #include <QtCore/QString>
 #include <QtGui/QDesktopServices>
 
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Constants;
+
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 static const QLatin1String binQmake("/bin/qmake" EXEC_SUFFIX);
@@ -64,17 +67,17 @@ bool MaemoGlobal::isMaemoTargetId(const QString &id)
 
 bool MaemoGlobal::isFremantleTargetId(const QString &id)
 {
-    return id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID);
+    return id == QLatin1String(MAEMO5_DEVICE_TARGET_ID);
 }
 
 bool MaemoGlobal::isHarmattanTargetId(const QString &id)
 {
-    return id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID);
+    return id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID);
 }
 
 bool MaemoGlobal::isMeegoTargetId(const QString &id)
 {
-    return id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID);
+    return id == QLatin1String(MEEGO_DEVICE_TARGET_ID);
 }
 
 bool MaemoGlobal::isValidMaemo5QtVersion(const QString &qmakePath)
@@ -451,4 +454,4 @@ MaemoGlobal::PackagingSystem MaemoGlobal::packagingSystem(MaemoDeviceConfig::OsV
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h b/src/plugins/remotelinux/maemoglobal.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
rename to src/plugins/remotelinux/maemoglobal.h
index b22c8d8efc37f8487755893aca0b3d367fe21ed2..4f9d9d957aa686c6f839dd359ad97c27421f299b 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
+++ b/src/plugins/remotelinux/maemoglobal.h
@@ -55,11 +55,10 @@ class QProcess;
 class QString;
 QT_END_NAMESPACE
 
+namespace QtSupport { class BaseQtVersion; }
 namespace Utils { class SshConnection; }
-namespace QtSupport {
-class BaseQtVersion;
-}
-namespace Qt4ProjectManager {
+
+namespace RemoteLinux {
 namespace Internal {
 
 class WatchableFile : public Core::IFile
@@ -90,7 +89,7 @@ private:
 
 class MaemoGlobal
 {
-    Q_DECLARE_TR_FUNCTIONS(Qt4ProjectManager::Internal::MaemoGlobal)
+    Q_DECLARE_TR_FUNCTIONS(RemoteLinux::Internal::MaemoGlobal)
 public:
     enum PackagingSystem { Dpkg, Rpm, Tar };
 
@@ -187,6 +186,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOGLOBAL_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp b/src/plugins/remotelinux/maemoinstalltosysrootstep.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp
rename to src/plugins/remotelinux/maemoinstalltosysrootstep.cpp
index c4b31f67dd504f5b6e186cea25789a8f9adb987f..7d1988074155ba026a038fe234ec89d87173045d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp
+++ b/src/plugins/remotelinux/maemoinstalltosysrootstep.cpp
@@ -47,8 +47,9 @@
 #include <QtCore/QWeakPointer>
 
 using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class AbstractMaemoInstallPackageToSysrootWidget : public BuildStepConfigWidget
@@ -399,6 +400,6 @@ const QString MaemoMakeInstallToSysrootStep::DisplayName
     = tr("Copy files to sysroot");
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #include "maemoinstalltosysrootstep.moc"
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.h b/src/plugins/remotelinux/maemoinstalltosysrootstep.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.h
rename to src/plugins/remotelinux/maemoinstalltosysrootstep.h
index 1137ac9fbb7fdd017c5c092b56c2e7dcf0d4aeeb..5cb2458fffa8fafcf27605201fa57dae62037232 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.h
+++ b/src/plugins/remotelinux/maemoinstalltosysrootstep.h
@@ -40,7 +40,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QProcess)
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class AbstractMaemoInstallPackageToSysrootStep : public ProjectExplorer::BuildStep
@@ -131,6 +131,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOINSTALLTOSYSROOTSTEP_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemokeydeployer.cpp b/src/plugins/remotelinux/maemokeydeployer.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemokeydeployer.cpp
rename to src/plugins/remotelinux/maemokeydeployer.cpp
index 389cc7d71a24b9ad5cfc88decf09b18e6789eb9c..ac46fbeead0be0a440dfb5a6ba1c26843a4dfe4b 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemokeydeployer.cpp
+++ b/src/plugins/remotelinux/maemokeydeployer.cpp
@@ -38,7 +38,7 @@
 
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoKeyDeployer::MaemoKeyDeployer(QObject *parent)
@@ -115,4 +115,4 @@ void MaemoKeyDeployer::cleanup()
 
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemokeydeployer.h b/src/plugins/remotelinux/maemokeydeployer.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemokeydeployer.h
rename to src/plugins/remotelinux/maemokeydeployer.h
index 2b78dd62ac49ab0b169387f7dda94dcfca985139..0c0b75d897baddcfb76147b49da972d2dd02ef2d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemokeydeployer.h
+++ b/src/plugins/remotelinux/maemokeydeployer.h
@@ -40,7 +40,7 @@ struct SshConnectionParameters;
 class SshRemoteProcessRunner;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoKeyDeployer : public QObject
@@ -69,6 +69,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOKEYDEPLOYER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemomountspecification.cpp b/src/plugins/remotelinux/maemomountspecification.cpp
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemomountspecification.cpp
rename to src/plugins/remotelinux/maemomountspecification.cpp
index 5c46389a37580b084f241a959cd553f3161f8790..7c74dea4e9a669fa2a8c40937db1cbeb5e6fc637 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemomountspecification.cpp
+++ b/src/plugins/remotelinux/maemomountspecification.cpp
@@ -32,7 +32,7 @@
 
 #include "maemomountspecification.h"
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 const QLatin1String MaemoMountSpecification::InvalidMountPoint("/");
@@ -44,5 +44,5 @@ MaemoMountSpecification::MaemoMountSpecification(const QString &localDir,
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemomountspecification.h b/src/plugins/remotelinux/maemomountspecification.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemomountspecification.h
rename to src/plugins/remotelinux/maemomountspecification.h
index 81ed29b02d4e430cd5902a4b2720f7a2c40f2d4a..87300f33fc3b046a95904ee9553cd0180e11c83f 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemomountspecification.h
+++ b/src/plugins/remotelinux/maemomountspecification.h
@@ -35,7 +35,7 @@
 
 #include <QtCore/QLatin1String>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 struct MaemoMountSpecification {
@@ -49,6 +49,6 @@ struct MaemoMountSpecification {
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOMOUNTSPECIFICATION_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp b/src/plugins/remotelinux/maemopackagecreationfactory.cpp
similarity index 93%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp
rename to src/plugins/remotelinux/maemopackagecreationfactory.cpp
index 9ef79f7af0f57049bb6677da4c67c957e731136b..bab364abe606d6f460ceed92fea4b9954876fb73 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp
+++ b/src/plugins/remotelinux/maemopackagecreationfactory.cpp
@@ -41,14 +41,13 @@
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanagerconstants.h>
 
 #include <QtCore/QCoreApplication>
 
 using ProjectExplorer::BuildStepList;
 using ProjectExplorer::BuildStep;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 const QString OldCreatePackageId("Qt4ProjectManager.MaemoPackageCreationStep");
@@ -81,13 +80,13 @@ QStringList MaemoPackageCreationFactory::availableCreationIds(ProjectExplorer::B
 QString MaemoPackageCreationFactory::displayNameForId(const QString &id) const
 {
     if (id == MaemoDebianPackageCreationStep::CreatePackageId) {
-        return QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoPackageCreationFactory",
+        return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory",
             "Create Debian Package");
     } else if (id == MaemoRpmPackageCreationStep::CreatePackageId) {
-        return QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoPackageCreationFactory",
+        return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory",
             "Create RPM Package");
     } else if (id == MaemoTarPackageCreationStep::CreatePackageId) {
-        return QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoPackageCreationFactory",
+        return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory",
             "Create tarball");
     }
     return QString();
@@ -170,4 +169,4 @@ BuildStep *MaemoPackageCreationFactory::clone(ProjectExplorer::BuildStepList *pa
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.h b/src/plugins/remotelinux/maemopackagecreationfactory.h
similarity index 95%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.h
rename to src/plugins/remotelinux/maemopackagecreationfactory.h
index c790df2ac9aa01e7bbb5619944ba31ef90fb7551..7f849dcde373be284aeeeb399a6ad66d00244677 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.h
+++ b/src/plugins/remotelinux/maemopackagecreationfactory.h
@@ -34,13 +34,13 @@
 
 #include <projectexplorer/buildstep.h>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoPackageCreationFactory : public ProjectExplorer::IBuildStepFactory
 {
 public:
-    MaemoPackageCreationFactory(QObject *parent);
+    MaemoPackageCreationFactory(QObject *parent = 0);
 
     virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
     virtual QString displayNameForId(const QString &id) const;
@@ -63,6 +63,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPACKAGECREATIONFACTORY_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/remotelinux/maemopackagecreationstep.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
rename to src/plugins/remotelinux/maemopackagecreationstep.cpp
index b6be190e59eda48b19976c6c0e2db6b3fd39e265..a1fe351c38748dfd67b524fe92ee70c87d2080ba 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
+++ b/src/plugins/remotelinux/maemopackagecreationstep.cpp
@@ -40,9 +40,9 @@
 
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <qt4buildconfiguration.h>
-#include <qt4project.h>
-#include <qt4target.h>
+#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qt4target.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
 
@@ -60,8 +60,9 @@ using namespace ProjectExplorer::Constants;
 using ProjectExplorer::BuildStepList;
 using ProjectExplorer::BuildStepConfigWidget;
 using ProjectExplorer::Task;
+using namespace Qt4ProjectManager;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 const QLatin1String AbstractMaemoPackageCreationStep::DefaultVersionNumber("0.0.1");
@@ -826,6 +827,6 @@ const QString MaemoTarPackageCreationStep::CreatePackageId
     = QLatin1String("MaemoTarPackageCreationStep");
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #include "maemopackagecreationstep.moc"
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h b/src/plugins/remotelinux/maemopackagecreationstep.h
similarity index 91%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
rename to src/plugins/remotelinux/maemopackagecreationstep.h
index 3ef2ec54cdaa7b4af84741f7c492ba9ff5fb9304..189f947f47e5d1f5db8c7d4973ca92e42ed165eb 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
+++ b/src/plugins/remotelinux/maemopackagecreationstep.h
@@ -41,9 +41,9 @@ class QFileInfo;
 class QProcess;
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
 
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeployableListModel;
 class AbstractQt4MaemoTarget;
@@ -63,10 +63,11 @@ public:
     bool setVersionString(const QString &version, QString *error);
 
     static void preparePackagingProcess(QProcess *proc,
-        const Qt4BuildConfiguration *bc, const QString &workingDir);
+        const Qt4ProjectManager::Qt4BuildConfiguration *bc,
+        const QString &workingDir);
 
     QString projectName() const;
-    const Qt4BuildConfiguration *qt4BuildConfiguration() const;
+    const Qt4ProjectManager::Qt4BuildConfiguration *qt4BuildConfiguration() const;
     AbstractQt4MaemoTarget *maemoTarget() const;
     AbstractDebBasedQt4MaemoTarget *debBasedMaemoTarget() const;
     AbstractRpmBasedQt4MaemoTarget *rpmBasedMaemoTarget() const;
@@ -106,7 +107,7 @@ private:
     static QString nativePath(const QFile &file);
     bool packagingNeeded() const;
 
-    const Qt4BuildConfiguration *m_lastBuildConfig;
+    const Qt4ProjectManager::Qt4BuildConfiguration *m_lastBuildConfig;
 };
 
 
@@ -127,7 +128,7 @@ private:
     virtual bool isMetaDataNewerThan(const QDateTime &packageDate) const;
 
     void ctor();
-    static QString packagingCommand(const Qt4BuildConfiguration *bc,
+    static QString packagingCommand(const Qt4ProjectManager::Qt4BuildConfiguration *bc,
         const QString &commandName);
     bool copyDebianFiles(bool inSourceBuild);
     void checkProjectName();
@@ -151,7 +152,7 @@ private:
         MaemoRpmPackageCreationStep *other);
 
     void ctor();
-    static QString rpmBuildDir(const Qt4BuildConfiguration *bc);
+    static QString rpmBuildDir(const Qt4ProjectManager::Qt4BuildConfiguration *bc);
 
     static const QString CreatePackageId;
 };
@@ -182,6 +183,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPACKAGECREATIONSTEP_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp b/src/plugins/remotelinux/maemopackagecreationwidget.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
rename to src/plugins/remotelinux/maemopackagecreationwidget.cpp
index 596a4ca220a53dbfd979590e5d4b688ee93376c9..b6729d36fe5ed74a5d7b4d845df725280a5126bb 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
+++ b/src/plugins/remotelinux/maemopackagecreationwidget.cpp
@@ -49,7 +49,7 @@
 
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 // TODO: Split up into dedicated widgets for Debian and RPM steps.
@@ -271,4 +271,4 @@ void MaemoPackageCreationWidget::editFile(const QString &filePath)
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h b/src/plugins/remotelinux/maemopackagecreationwidget.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h
rename to src/plugins/remotelinux/maemopackagecreationwidget.h
index ce5758ed42cb40909690017dbd5b72c7d783c204..1298828c0a41443204cab607d8a195a1b79e5832 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h
+++ b/src/plugins/remotelinux/maemopackagecreationwidget.h
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
 namespace Ui { class MaemoPackageCreationWidget; }
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class AbstractMaemoPackageCreationStep;
 
@@ -79,6 +79,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPACKAGECREATIONWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.ui b/src/plugins/remotelinux/maemopackagecreationwidget.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.ui
rename to src/plugins/remotelinux/maemopackagecreationwidget.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp b/src/plugins/remotelinux/maemopackageinstaller.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp
rename to src/plugins/remotelinux/maemopackageinstaller.cpp
index 4493f1422aa16ac91966b7c27aeeaa77723bd262..6408c1c1755abb90d44380094ffa31d564613e97 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp
+++ b/src/plugins/remotelinux/maemopackageinstaller.cpp
@@ -39,7 +39,7 @@
 
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 AbstractMaemoPackageInstaller::AbstractMaemoPackageInstaller(QObject *parent)
@@ -213,4 +213,4 @@ QStringList MaemoTarPackageInstaller::installCommandArguments() const
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h b/src/plugins/remotelinux/maemopackageinstaller.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h
rename to src/plugins/remotelinux/maemopackageinstaller.h
index fc8fceaca91bd2031295d81980967e6a736a1395..978a6fda0d432d69309f094a1c60a4eea81d02a9 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h
+++ b/src/plugins/remotelinux/maemopackageinstaller.h
@@ -43,7 +43,7 @@ class SshRemoteProcessRunner;
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeviceConfig;
 
@@ -130,6 +130,6 @@ private:
 
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // ABSTRACTMAEMOPACKAGEINSTALLER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackageuploader.cpp b/src/plugins/remotelinux/maemopackageuploader.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackageuploader.cpp
rename to src/plugins/remotelinux/maemopackageuploader.cpp
index 91c74567e272b37fed9ad05c9cfe52b7f5981e9f..a68aac32584c7a78e86d11848cf3246e8cd3d131 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackageuploader.cpp
+++ b/src/plugins/remotelinux/maemopackageuploader.cpp
@@ -41,7 +41,7 @@
 
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoPackageUploader::MaemoPackageUploader(QObject *parent) :
@@ -156,4 +156,4 @@ void MaemoPackageUploader::setState(State newState)
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackageuploader.h b/src/plugins/remotelinux/maemopackageuploader.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopackageuploader.h
rename to src/plugins/remotelinux/maemopackageuploader.h
index 2709744722409769f599d4d54d262acd27aed4d2..6323578c00a657f3d91aab364136dda54eb24aaf 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackageuploader.h
+++ b/src/plugins/remotelinux/maemopackageuploader.h
@@ -44,7 +44,7 @@ class SftpChannel;
 class SshConnection;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoPackageUploader : public QObject
@@ -83,6 +83,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPACKAGEUPLOADER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopertargetdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopertargetdeviceconfigurationlistmodel.cpp
rename to src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.cpp
index d8e2ac804fa7236680b0eea7c7a4c9818ef51cf6..fa1810e27667f6ff1be1ec3477760c7171baa4a3 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopertargetdeviceconfigurationlistmodel.cpp
+++ b/src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.cpp
@@ -35,7 +35,7 @@
 
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoPerTargetDeviceConfigurationListModel::MaemoPerTargetDeviceConfigurationListModel(QObject *parent,
@@ -132,4 +132,4 @@ int MaemoPerTargetDeviceConfigurationListModel::indexForInternalId(MaemoDeviceCo
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopertargetdeviceconfigurationlistmodel.h b/src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopertargetdeviceconfigurationlistmodel.h
rename to src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.h
index 9f066828c297c722057051d73bd5ba74f354ed49..dfe6a823a495c7dd41d40b5749d1cbd9e8bfff75 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopertargetdeviceconfigurationlistmodel.h
+++ b/src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.h
@@ -40,7 +40,7 @@
 
 namespace ProjectExplorer { class Target; }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoPerTargetDeviceConfigurationListModel : public QAbstractListModel
@@ -68,6 +68,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPERTARGETDEVICECONFIGURATIONLISTMODEL_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoprofilesupdatedialog.cpp b/src/plugins/remotelinux/maemoprofilesupdatedialog.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoprofilesupdatedialog.cpp
rename to src/plugins/remotelinux/maemoprofilesupdatedialog.cpp
index 04e439edcaf1d8aedb3d72ad22c797c758b34de8..bd63b72ab0a4f87bee325a5212a8a657a676177c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoprofilesupdatedialog.cpp
+++ b/src/plugins/remotelinux/maemoprofilesupdatedialog.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/QDir>
 #include <QtGui/QTableWidgetItem>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoProFilesUpdateDialog::MaemoProFilesUpdateDialog(const QList<MaemoDeployableListModel *> &models,
@@ -99,5 +99,5 @@ MaemoProFilesUpdateDialog::getUpdateSettings() const
     return settings;
 }
 
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoprofilesupdatedialog.h b/src/plugins/remotelinux/maemoprofilesupdatedialog.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoprofilesupdatedialog.h
rename to src/plugins/remotelinux/maemoprofilesupdatedialog.h
index a18150613465cebf5c293a1d8047e6a9bdd5623d..6e65d9f88d2ea85a3d27711b62a3d8ed85381111 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoprofilesupdatedialog.h
+++ b/src/plugins/remotelinux/maemoprofilesupdatedialog.h
@@ -43,7 +43,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeployableListModel;
 
@@ -68,7 +68,7 @@ private:
     Ui::MaemoProFilesUpdateDialog *ui;
 };
 
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 } // namespace Internal
 
 #endif // MAEMOPROFILESUPDATEDIALOG_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoprofilesupdatedialog.ui b/src/plugins/remotelinux/maemoprofilesupdatedialog.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoprofilesupdatedialog.ui
rename to src/plugins/remotelinux/maemoprofilesupdatedialog.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.cpp b/src/plugins/remotelinux/maemopublishedprojectmodel.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.cpp
rename to src/plugins/remotelinux/maemopublishedprojectmodel.cpp
index cc2797d6bf6f2634a5169d615ca1f76fc6b9d89c..e9af35dce1f98437907e3bc8f8a17733bf4af93b 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.cpp
+++ b/src/plugins/remotelinux/maemopublishedprojectmodel.cpp
@@ -33,7 +33,7 @@
 
 #include <QtCore/QFileInfo>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 const int IncludeColumn = 2;
@@ -132,4 +132,4 @@ bool MaemoPublishedProjectModel::setData(const QModelIndex &index,
 
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.h b/src/plugins/remotelinux/maemopublishedprojectmodel.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.h
rename to src/plugins/remotelinux/maemopublishedprojectmodel.h
index 35d4c1f306e91d610065d2d215e72bae557d0341..45e25a5353e879f44643bb5a918c941da99a5d17 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.h
+++ b/src/plugins/remotelinux/maemopublishedprojectmodel.h
@@ -36,7 +36,7 @@
 #include <QtCore/QStringList>
 #include <QtGui/QFileSystemModel>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoPublishedProjectModel : public QFileSystemModel
@@ -63,6 +63,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPUBLISHEDPROJECTMODEL_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp b/src/plugins/remotelinux/maemopublisherfremantlefree.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
rename to src/plugins/remotelinux/maemopublisherfremantlefree.cpp
index 3a0070bd1e7c5c9072ffd190048668c858300ad0..88b7ea914ef98938de9a38f031a2f81101e0430c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
+++ b/src/plugins/remotelinux/maemopublisherfremantlefree.cpp
@@ -55,9 +55,10 @@
 #define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
 
 using namespace Core;
+using namespace Qt4ProjectManager;
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoPublisherFremantleFree::MaemoPublisherFremantleFree(const ProjectExplorer::Project *project,
@@ -640,4 +641,4 @@ void MaemoPublisherFremantleFree::setState(State newState)
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h b/src/plugins/remotelinux/maemopublisherfremantlefree.h
similarity index 94%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h
rename to src/plugins/remotelinux/maemopublisherfremantlefree.h
index e1bcd7d18a36396739723bf5bb91cfb243cae0f7..65d03f6a23212a8abb80f4b6aa647ad85774a652 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h
+++ b/src/plugins/remotelinux/maemopublisherfremantlefree.h
@@ -43,6 +43,9 @@ class Project;
 
 namespace Qt4ProjectManager {
 class Qt4BuildConfiguration;
+}
+
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoPublisherFremantleFree : public QObject
@@ -60,7 +63,7 @@ public:
     void publish();
     void cancel();
 
-    void setBuildConfiguration(const Qt4BuildConfiguration *buildConfig) { m_buildConfig = buildConfig; }
+    void setBuildConfiguration(const Qt4ProjectManager::Qt4BuildConfiguration *buildConfig) { m_buildConfig = buildConfig; }
     void setDoUpload(bool doUpload) { m_doUpload = doUpload; }
     void setSshParams(const QString &hostName, const QString &userName,
         const QString &keyFile, const QString &remoteDir);
@@ -107,7 +110,7 @@ private:
 
     const ProjectExplorer::Project * const m_project;
     bool m_doUpload;
-    const Qt4BuildConfiguration *m_buildConfig;
+    const Qt4ProjectManager::Qt4BuildConfiguration *m_buildConfig;
     State m_state;
     QString m_tmpProjectDir;
     QProcess *m_process;
@@ -120,6 +123,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPUBLISHERFREMANTLEFREE_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.cpp b/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.cpp
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.cpp
rename to src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.cpp
index 2af56dae1b2485fe7dd2af56578afc03c01aae7c..e62b840065cde42820df46e5ea6009b296f71b13 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.cpp
+++ b/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.cpp
@@ -43,8 +43,9 @@
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoPublishingBuildSettingsPageFremantleFree::MaemoPublishingBuildSettingsPageFremantleFree(const Project *project,
@@ -114,4 +115,4 @@ bool MaemoPublishingBuildSettingsPageFremantleFree::skipUpload() const
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.h b/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.h
similarity index 92%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.h
rename to src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.h
index 283894f1edf9783bce344e3dd69d5fa9914ad108..83dd6b7a2b9eb8b5b10bf71aaec4f473b0a7f36e 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.h
+++ b/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.h
@@ -42,10 +42,9 @@ namespace Ui {
 QT_END_NAMESPACE
 
 namespace ProjectExplorer { class Project; }
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
 
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
-
+namespace RemoteLinux {
 namespace Internal {
 class MaemoPublisherFremantleFree;
 
@@ -65,12 +64,12 @@ private:
     void collectBuildConfigurations(const ProjectExplorer::Project *project);
     bool skipUpload() const;
 
-    QList<Qt4BuildConfiguration *> m_buildConfigs;
+    QList<Qt4ProjectManager::Qt4BuildConfiguration *> m_buildConfigs;
     MaemoPublisherFremantleFree * const m_publisher;
     Ui::MaemoPublishingWizardPageFremantleFree *ui;
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.ui b/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.ui
rename to src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.cpp b/src/plugins/remotelinux/maemopublishingfileselectiondialog.cpp
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.cpp
rename to src/plugins/remotelinux/maemopublishingfileselectiondialog.cpp
index 8c7762975c5e58e53f35b705d03c7becb31123df..8feba7a678be39c02b1cf99e0861e5ba012cd65d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.cpp
+++ b/src/plugins/remotelinux/maemopublishingfileselectiondialog.cpp
@@ -34,7 +34,7 @@
 
 #include "maemopublishedprojectmodel.h"
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoPublishingFileSelectionDialog::MaemoPublishingFileSelectionDialog(const QString &projectPath,
@@ -62,4 +62,4 @@ QStringList MaemoPublishingFileSelectionDialog::filesToExclude() const
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.h b/src/plugins/remotelinux/maemopublishingfileselectiondialog.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.h
rename to src/plugins/remotelinux/maemopublishingfileselectiondialog.h
index 7527147f7fe8a58cce8b6a10a3348ea754e2c10f..b6dfe843667f55f5b830ea9cfba6f853b39bd2d5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.h
+++ b/src/plugins/remotelinux/maemopublishingfileselectiondialog.h
@@ -41,7 +41,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoPublishingFileSelectionDialog : public QDialog
@@ -60,6 +60,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPUBLISHINGFILESELECTIONDIALOG_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.ui b/src/plugins/remotelinux/maemopublishingfileselectiondialog.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingfileselectiondialog.ui
rename to src/plugins/remotelinux/maemopublishingfileselectiondialog.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingresultpagefremantlefree.cpp b/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingresultpagefremantlefree.cpp
rename to src/plugins/remotelinux/maemopublishingresultpagefremantlefree.cpp
index 9a356e1be8e6caa4b9f50a49b65755bd4bee4eff..be8a5c096c64f53864163bfdf0dd398c2a5c0782 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingresultpagefremantlefree.cpp
+++ b/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.cpp
@@ -34,7 +34,7 @@
 
 #include <QtGui/QAbstractButton>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 typedef MaemoPublisherFremantleFree MPFF;
 
@@ -105,4 +105,4 @@ QAbstractButton *MaemoPublishingResultPageFremantleFree::cancelButton() const
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingresultpagefremantlefree.h b/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingresultpagefremantlefree.h
rename to src/plugins/remotelinux/maemopublishingresultpagefremantlefree.h
index 533374e73af6126d70143f1fdfdf4f5b17bab36c..6fc2ce5c5a84f811bd5adb7090803265b20afa11 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingresultpagefremantlefree.h
+++ b/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.h
@@ -41,7 +41,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoPublishingResultPageFremantleFree : public QWizardPage
@@ -72,6 +72,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingresultpagefremantlefree.ui b/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingresultpagefremantlefree.ui
rename to src/plugins/remotelinux/maemopublishingresultpagefremantlefree.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishinguploadsettingspagefremantlefree.cpp b/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishinguploadsettingspagefremantlefree.cpp
rename to src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.cpp
index 3991b2417406b42ed7a622514df21cefef7e2507..98feae6536cec8fab6f6a0680fbc217ea62b6f2f 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishinguploadsettingspagefremantlefree.cpp
+++ b/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.cpp
@@ -38,7 +38,7 @@
 
 #include <QtCore/QDir>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoPublishingUploadSettingsPageFremantleFree::MaemoPublishingUploadSettingsPageFremantleFree(MaemoPublisherFremantleFree *publisher,
@@ -113,4 +113,4 @@ bool MaemoPublishingUploadSettingsPageFremantleFree::validatePage()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishinguploadsettingspagefremantlefree.h b/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishinguploadsettingspagefremantlefree.h
rename to src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.h
index 3a5891a3bd54bfc215087016cce8c00d27b5c1bf..5ffee819b598001fbb4557f63df2a9c2921848a5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishinguploadsettingspagefremantlefree.h
+++ b/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.h
@@ -40,7 +40,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoPublisherFremantleFree;
 
@@ -68,6 +68,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishinguploadsettingspagefremantlefree.ui b/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishinguploadsettingspagefremantlefree.ui
rename to src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfactories.cpp b/src/plugins/remotelinux/maemopublishingwizardfactories.cpp
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfactories.cpp
rename to src/plugins/remotelinux/maemopublishingwizardfactories.cpp
index 9ff41fcea4f6b614197f65e464a79d4794e714f4..519abb580a33e496a1c46a6efb93cbb181fecc98 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfactories.cpp
+++ b/src/plugins/remotelinux/maemopublishingwizardfactories.cpp
@@ -41,8 +41,9 @@
 #include <qtsupport/baseqtversion.h>
 
 using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoPublishingWizardFactoryFremantleFree::MaemoPublishingWizardFactoryFremantleFree(QObject *parent)
@@ -96,4 +97,4 @@ QWizard *MaemoPublishingWizardFactoryFremantleFree::createWizard(const Project *
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfactories.h b/src/plugins/remotelinux/maemopublishingwizardfactories.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfactories.h
rename to src/plugins/remotelinux/maemopublishingwizardfactories.h
index dc1594f2039710651c90cfd43d41a78a094b4aab..1b56bf2cf2dcf91ec2beb142647c7b1aba08deb9 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfactories.h
+++ b/src/plugins/remotelinux/maemopublishingwizardfactories.h
@@ -38,7 +38,7 @@ namespace Core {
 class SshRemoteProcessRunner;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoPublishingWizardFactoryFremantleFree
@@ -55,6 +55,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPUBLISHINGSERVICE_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.cpp b/src/plugins/remotelinux/maemopublishingwizardfremantlefree.cpp
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.cpp
rename to src/plugins/remotelinux/maemopublishingwizardfremantlefree.cpp
index 9e2959a7e84c738d054fd42b52ed8378801c4425..7330ae06e4822361ed50473ff57087892de5e83d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.cpp
+++ b/src/plugins/remotelinux/maemopublishingwizardfremantlefree.cpp
@@ -38,7 +38,7 @@
 
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 enum PageId { BuildSettingsPageId, UploadSettingsPageId, ResultPageId };
@@ -78,4 +78,4 @@ int MaemoPublishingWizardFremantleFree::nextId() const
 
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.h b/src/plugins/remotelinux/maemopublishingwizardfremantlefree.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.h
rename to src/plugins/remotelinux/maemopublishingwizardfremantlefree.h
index 9a3c0b628ac1b2cbe205b5e13f17a803976632a7..03f6f33a454527a97b3e301cf9698171a79d33c9 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.h
+++ b/src/plugins/remotelinux/maemopublishingwizardfremantlefree.h
@@ -38,7 +38,7 @@ namespace ProjectExplorer {
 class Project;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoPublishingResultPageFremantleFree;
 class MaemoPublisherFremantleFree;
@@ -63,6 +63,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOPUBLISHINGWIZARDFREMANTLEFREE_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp b/src/plugins/remotelinux/maemoqemumanager.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
rename to src/plugins/remotelinux/maemoqemumanager.cpp
index b3882ded5637ccce59bdcfbde77ae2d072cb55a2..dbb2158291530fb64c165a348c0bb0fdc69d951d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
+++ b/src/plugins/remotelinux/maemoqemumanager.cpp
@@ -33,12 +33,9 @@
 #include "maemoqemumanager.h"
 
 #include "maemoglobal.h"
-#include "maemomanager.h"
 #include "maemoqemuruntimeparser.h"
 #include "maemosettingspages.h"
 #include "maemorunconfiguration.h"
-#include "qt4project.h"
-#include "qt4projectmanagerconstants.h"
 #include "qt4maemotarget.h"
 #include "maemoqtversion.h"
 
@@ -51,6 +48,7 @@
 #include <coreplugin/modemanager.h>
 
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
 #include <qtsupport/qtversionmanager.h>
 #include <utils/filesystemwatcher.h>
@@ -69,7 +67,8 @@
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace RemoteLinux;
+using namespace RemoteLinux::Internal;
 
 MaemoQemuManager *MaemoQemuManager::m_instance = 0;
 
@@ -440,7 +439,7 @@ void MaemoQemuManager::qemuStatusChanged(QemuStatus status, const QString &error
                 tr("Qemu failed to start: %1"));
             break;
         case QemuCrashed:
-            MaemoManager::instance().qemuSettingsPage()->showQemuCrashDialog();
+            MaemoQemuSettingsPage::showQemuCrashDialog();
             break;
         case QemuFinished:
         case QemuUserReason:
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h b/src/plugins/remotelinux/maemoqemumanager.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
rename to src/plugins/remotelinux/maemoqemumanager.h
index 075d40b1b1c8df135f18e57e121a9ace1ad21871..4b285c62db674c51e220e3cc8295faf54b469d70 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
+++ b/src/plugins/remotelinux/maemoqemumanager.h
@@ -59,10 +59,10 @@ namespace ProjectExplorer {
 namespace QtSupport {
 class BaseQtVersion;
 }
-namespace Qt4ProjectManager {
-    namespace Internal {
-    class MaemoRunConfiguration;
 
+namespace RemoteLinux {
+namespace Internal {
+class MaemoRunConfiguration;
 
 class MaemoQemuManager : public QObject
 {
@@ -141,6 +141,6 @@ private:
 };
 
 }   // namespace Internal
-}   // namespace Qt4ProjectManager
+}   // namespace RemoteLinux
 
 #endif  // QEMURUNTIMEMANAGER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntime.h b/src/plugins/remotelinux/maemoqemuruntime.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntime.h
rename to src/plugins/remotelinux/maemoqemuruntime.h
index 585842187d9d155a867d9cb5b3ede45d568aaa1d..b0e10336b591b6f593e7eb790e33a1e21ba090b1 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntime.h
+++ b/src/plugins/remotelinux/maemoqemuruntime.h
@@ -41,7 +41,7 @@
 #include <QtCore/QProcessEnvironment>
 #include <QtCore/QString>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 enum QemuStatus {
@@ -85,6 +85,6 @@ struct MaemoQemuRuntime
 };
 
 }   // namespace Internal
-}   // namespace Qt4ProjectManager
+}   // namespace RemoteLinux
 
 #endif // MAEMOQEMURUNTIME_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp b/src/plugins/remotelinux/maemoqemuruntimeparser.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp
rename to src/plugins/remotelinux/maemoqemuruntimeparser.cpp
index 8a94ea2535b735796fb2d94a3b16c20b4b2df3ad..e00c26bb4de58f0c9335396001c6c98991d3f561 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp
+++ b/src/plugins/remotelinux/maemoqemuruntimeparser.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QTextStream>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoQemuRuntimeParserV1 : public MaemoQemuRuntimeParser
@@ -428,4 +428,4 @@ MaemoQemuSettings::OpenGlMode MaemoQemuRuntimeParserV2::openGlTagToEnum(const QS
 }
 
 }   // namespace Internal
-}   // namespace Qt4ProjectManager
+}   // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.h b/src/plugins/remotelinux/maemoqemuruntimeparser.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.h
rename to src/plugins/remotelinux/maemoqemuruntimeparser.h
index fa1a328ac3968da74d65d660e531c871dc72299a..77a052baf6e3e87b86d66701e0b377fd0e5d79d4 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.h
+++ b/src/plugins/remotelinux/maemoqemuruntimeparser.h
@@ -41,7 +41,7 @@ namespace QtSupport {
 class BaseQtVersion;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoQemuRuntimeParser
@@ -59,6 +59,6 @@ protected:
 };
 
 }   // namespace Internal
-}   // namespace Qt4ProjectManager
+}   // namespace RemoteLinux
 
 #endif // MAEMOQEMURUNTIMEPARSER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemusettings.cpp b/src/plugins/remotelinux/maemoqemusettings.cpp
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemusettings.cpp
rename to src/plugins/remotelinux/maemoqemusettings.cpp
index da8118a97eff0c4a777667def3b06d62ede79c3a..3e86f8b93061f93a12056d820a76114d0e82a41b 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemusettings.cpp
+++ b/src/plugins/remotelinux/maemoqemusettings.cpp
@@ -35,7 +35,7 @@
 
 #include <QtCore/QSettings>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 const QString SettingsGroup = QLatin1String("Maemo Qemu Settings");
@@ -68,4 +68,4 @@ bool MaemoQemuSettings::m_initialized = false;
 MaemoQemuSettings::OpenGlMode MaemoQemuSettings::m_openGlMode;
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemusettings.h b/src/plugins/remotelinux/maemoqemusettings.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemusettings.h
rename to src/plugins/remotelinux/maemoqemusettings.h
index 0ee389d80d70e5f9727a7a05e083cbc6f0881114..f1c11697c7a3020f43c791facdcaed245e56bcc5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemusettings.h
+++ b/src/plugins/remotelinux/maemoqemusettings.h
@@ -32,7 +32,7 @@
 #ifndef MAEMOQEMUSETTINGS_H
 #define MAEMOQEMUSETTINGS_H
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoQemuSettings
@@ -51,6 +51,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOQEMUSETTINGS_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemusettingswidget.cpp b/src/plugins/remotelinux/maemoqemusettingswidget.cpp
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemusettingswidget.cpp
rename to src/plugins/remotelinux/maemoqemusettingswidget.cpp
index e5e1768e0f228814d8d9f0481305ac8fdd43806d..8b1d0bec991ef7b1fdc65d97a8034a204f67c3c2 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemusettingswidget.cpp
+++ b/src/plugins/remotelinux/maemoqemusettingswidget.cpp
@@ -34,7 +34,7 @@
 
 #include "maemoqemusettings.h"
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoQemuSettingsWidget::MaemoQemuSettingsWidget(QWidget *parent) :
@@ -83,4 +83,4 @@ void MaemoQemuSettingsWidget::saveSettings()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemusettingswidget.h b/src/plugins/remotelinux/maemoqemusettingswidget.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemusettingswidget.h
rename to src/plugins/remotelinux/maemoqemusettingswidget.h
index 51f26fe4d537a89408fd38a328f0f61eb8127aab..4b2d4c6fad12d4733ed0b3a157914c70d6fc522a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemusettingswidget.h
+++ b/src/plugins/remotelinux/maemoqemusettingswidget.h
@@ -40,7 +40,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoQemuSettingsWidget : public QWidget
@@ -58,6 +58,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOQEMUSETTINGSWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemusettingswidget.ui b/src/plugins/remotelinux/maemoqemusettingswidget.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqemusettingswidget.ui
rename to src/plugins/remotelinux/maemoqemusettingswidget.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqtversion.cpp b/src/plugins/remotelinux/maemoqtversion.cpp
similarity index 95%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqtversion.cpp
rename to src/plugins/remotelinux/maemoqtversion.cpp
index f0bb16469cba89000c83247f68c3f5a379c98776..2ef5cdae35e2c4edaca02a0483a0db1b576e7991 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqtversion.cpp
+++ b/src/plugins/remotelinux/maemoqtversion.cpp
@@ -30,9 +30,10 @@
 **
 **************************************************************************/
 
+#include "maemoglobal.h"
 #include "maemoqtversion.h"
-#include "qt4projectmanagerconstants.h"
-#include "qt-maemo/maemoglobal.h"
+
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
 
 #include <qtsupport/qtsupportconstants.h>
 
@@ -41,10 +42,11 @@
 #include <QtCore/QDir>
 
 using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
 
-MaemoQtVersion::MaemoQtVersion()
-    : QtSupport::BaseQtVersion()
+namespace RemoteLinux {
+namespace Internal {
+
+MaemoQtVersion::MaemoQtVersion() : QtSupport::BaseQtVersion()
 {
 
 }
@@ -167,3 +169,6 @@ MaemoDeviceConfig::OsVersion MaemoQtVersion::osVersion() const
 {
     return m_osVersion;
 }
+
+} // namespace Internal
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqtversion.h b/src/plugins/remotelinux/maemoqtversion.h
similarity index 96%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqtversion.h
rename to src/plugins/remotelinux/maemoqtversion.h
index a4e8541d470d4aee415d273d05eb66747e481d34..fc27bf16164b7bfedbeeea495f58945ddff1d78e 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqtversion.h
+++ b/src/plugins/remotelinux/maemoqtversion.h
@@ -35,7 +35,7 @@
 #include "maemodeviceconfigurations.h"
 #include <qtsupport/baseqtversion.h>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoQtVersion : public QtSupport::BaseQtVersion
@@ -66,8 +66,7 @@ private:
     mutable bool m_isvalidVersion;
 };
 
-}
-}
-
+} // namespace Internal
+} // namespace RemoteLinux
 
 #endif // MAEMOQTVERSION_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqtversionfactory.cpp b/src/plugins/remotelinux/maemoqtversionfactory.cpp
similarity index 95%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqtversionfactory.cpp
rename to src/plugins/remotelinux/maemoqtversionfactory.cpp
index f8817b2d2a57a0bca72a091d0ca3efab938ad73a..f4ea0828a6222e39f4c666d1d405522d14873e78 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqtversionfactory.cpp
+++ b/src/plugins/remotelinux/maemoqtversionfactory.cpp
@@ -32,15 +32,14 @@
 
 #include "maemoqtversionfactory.h"
 #include "maemoglobal.h"
-#include "qt4projectmanagerconstants.h"
 #include "maemoqtversion.h"
 
 #include <qtsupport/qtsupportconstants.h>
 
 #include <QtCore/QFileInfo>
 
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+namespace RemoteLinux {
+namespace Internal {
 
 MaemoQtVersionFactory::MaemoQtVersionFactory(QObject *parent)
     : QtSupport::QtVersionFactory(parent)
@@ -84,3 +83,6 @@ QtSupport::BaseQtVersion *MaemoQtVersionFactory::create(const QString &qmakePath
         return new MaemoQtVersion(qmakePath, isAutoDetected, autoDetectionSource);
     return 0;
 }
+
+} // Internal
+} // Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqtversionfactory.h b/src/plugins/remotelinux/maemoqtversionfactory.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoqtversionfactory.h
rename to src/plugins/remotelinux/maemoqtversionfactory.h
index 914c922a808c175aa75167c96d40524d7f83d086..78f72971fcaf4c932b33aec705b27d4169f34583 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqtversionfactory.h
+++ b/src/plugins/remotelinux/maemoqtversionfactory.h
@@ -35,7 +35,7 @@
 
 #include <qtsupport/qtversionfactory.h>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoQtVersionFactory : public QtSupport::QtVersionFactory
@@ -54,5 +54,4 @@ public:
 } // Internal
 } // Qt4ProjectManager
 
-
 #endif // MAEMOQTVERSIONFACTORY_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.cpp b/src/plugins/remotelinux/maemoremotecopyfacility.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.cpp
rename to src/plugins/remotelinux/maemoremotecopyfacility.cpp
index 42815face27f505bcc854176f95b62fabb02556a..5898b94deba8d62b0d8c0980ca6ca53394a8905c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.cpp
+++ b/src/plugins/remotelinux/maemoremotecopyfacility.cpp
@@ -40,7 +40,7 @@
 
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoRemoteCopyFacility::MaemoRemoteCopyFacility(QObject *parent) :
@@ -156,4 +156,4 @@ void MaemoRemoteCopyFacility::setFinished()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.h b/src/plugins/remotelinux/maemoremotecopyfacility.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.h
rename to src/plugins/remotelinux/maemoremotecopyfacility.h
index 7478d21b4b1554d6efa2dd7656f32376600e3f9a..484b813d1837378f771de72f2837c77bd95d69f0 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.h
+++ b/src/plugins/remotelinux/maemoremotecopyfacility.h
@@ -45,7 +45,7 @@ class SshConnection;
 class SshRemoteProcessRunner;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeviceConfig;
 
@@ -86,6 +86,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOREMOTECOPYFACILITY_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/remotelinux/maemoremotemounter.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
rename to src/plugins/remotelinux/maemoremotemounter.cpp
index 8b4c7267ed690917fd23b4e33bb2afc3b416b6c8..8b11b7f975feda0491c44c0f636f0f6f4605f8e4 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
+++ b/src/plugins/remotelinux/maemoremotemounter.cpp
@@ -46,9 +46,10 @@
 
 #define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
 
+using namespace Qt4ProjectManager;
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent)
@@ -404,4 +405,4 @@ void MaemoRemoteMounter::setState(State newState)
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h b/src/plugins/remotelinux/maemoremotemounter.h
similarity index 95%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
rename to src/plugins/remotelinux/maemoremotemounter.h
index 3fec6f313a59de104db97016882d6d91cf6d44a0..25c8e08f675fa9807c9ed7d3f4f2170678fd00ff 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
+++ b/src/plugins/remotelinux/maemoremotemounter.h
@@ -50,8 +50,9 @@ class SshConnection;
 class SshRemoteProcess;
 }
 
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
+
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeviceConfig;
 class MaemoUsedPortsGatherer;
@@ -67,7 +68,7 @@ public:
     void setConnection(const QSharedPointer<Utils::SshConnection> &connection,
         const QSharedPointer<const MaemoDeviceConfig> &devConf);
 
-    void setBuildConfiguration(const Qt4BuildConfiguration *bc);
+    void setBuildConfiguration(const Qt4ProjectManager::Qt4BuildConfiguration *bc);
     void addMountSpecification(const MaemoMountSpecification &mountSpec,
         bool mountAsRoot);
     bool hasValidMountSpecifications() const;
@@ -141,6 +142,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOREMOTEMOUNTER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemountsmodel.cpp b/src/plugins/remotelinux/maemoremotemountsmodel.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremotemountsmodel.cpp
rename to src/plugins/remotelinux/maemoremotemountsmodel.cpp
index e27d6ae4189a3bf9f76ec5f531672a20fec91d59..99a77d4e20b7cdab56617a8b5fbc1145e1ab87ca 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemountsmodel.cpp
+++ b/src/plugins/remotelinux/maemoremotemountsmodel.cpp
@@ -34,7 +34,7 @@
 
 #include "maemoconstants.h"
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoRemoteMountsModel::MaemoRemoteMountsModel(QObject *parent) :
@@ -187,4 +187,4 @@ bool MaemoRemoteMountsModel::setData(const QModelIndex &index,
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemountsmodel.h b/src/plugins/remotelinux/maemoremotemountsmodel.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremotemountsmodel.h
rename to src/plugins/remotelinux/maemoremotemountsmodel.h
index b41da0163a01b9c6ab036591228b7d72d09b2acc..e7d5b7bb5c4d6e21fa7c03b86ce823101aaf4a03 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemountsmodel.h
+++ b/src/plugins/remotelinux/maemoremotemountsmodel.h
@@ -40,7 +40,7 @@
 #include <QtCore/QString>
 #include <QtCore/QVariantMap>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoRemoteMountsModel : public QAbstractTableModel
@@ -94,6 +94,6 @@ inline QModelIndex MaemoRemoteMountsModel::parent(const QModelIndex &) const
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOREMOTEMOUNTSMODEL_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.cpp b/src/plugins/remotelinux/maemoremoteprocessesdialog.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.cpp
rename to src/plugins/remotelinux/maemoremoteprocessesdialog.cpp
index eec17f8636cd8f500ea1b58d66d90620b167b802..bd104d2674de1c91001af5645bb95183f357ec13 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.cpp
+++ b/src/plugins/remotelinux/maemoremoteprocessesdialog.cpp
@@ -38,7 +38,7 @@
 #include <QtGui/QMessageBox>
 #include <QtGui/QSortFilterProxyModel>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoRemoteProcessesDialog::MaemoRemoteProcessesDialog(const MaemoDeviceConfig::ConstPtr &devConfig,
@@ -128,4 +128,4 @@ void MaemoRemoteProcessesDialog::handleSelectionChanged()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.h b/src/plugins/remotelinux/maemoremoteprocessesdialog.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.h
rename to src/plugins/remotelinux/maemoremoteprocessesdialog.h
index 8862e8069c1e303b290d222e0ed9b03cd7ced7f0..38e01dfbf6305fd6f2851da0ca2cc180159a75b3 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.h
+++ b/src/plugins/remotelinux/maemoremoteprocessesdialog.h
@@ -42,7 +42,7 @@ namespace Ui {
 class QSortFilterProxyModel;
 QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeviceConfig;
 class MaemoRemoteProcessList;
@@ -71,6 +71,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOREMOTEPROCESSDIALOG_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.ui b/src/plugins/remotelinux/maemoremoteprocessesdialog.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.ui
rename to src/plugins/remotelinux/maemoremoteprocessesdialog.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocesslist.cpp b/src/plugins/remotelinux/maemoremoteprocesslist.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocesslist.cpp
rename to src/plugins/remotelinux/maemoremoteprocesslist.cpp
index 68e19294ab8a39cd7119cfb2ced1faa2cb189796..4160e57860059977981cb2ca92b43631ade83d6d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocesslist.cpp
+++ b/src/plugins/remotelinux/maemoremoteprocesslist.cpp
@@ -39,7 +39,7 @@
 
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 const QByteArray LineSeparator1("---");
@@ -250,4 +250,4 @@ QVariant MaemoRemoteProcessList::data(const QModelIndex &index, int role) const
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocesslist.h b/src/plugins/remotelinux/maemoremoteprocesslist.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocesslist.h
rename to src/plugins/remotelinux/maemoremoteprocesslist.h
index 9bad8a66e73a00c8f2e125187a101fbed7768427..053785ecd5f98a4838700e955021eefd09a80e2c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocesslist.h
+++ b/src/plugins/remotelinux/maemoremoteprocesslist.h
@@ -39,7 +39,7 @@
 #include <QtCore/QString>
 #include <utils/ssh/sshremoteprocessrunner.h>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeviceConfig;
 
@@ -94,6 +94,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOREMOTEPROCESSLIST_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/remotelinux/maemorunconfiguration.cpp
similarity index 95%
rename from src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
rename to src/plugins/remotelinux/maemorunconfiguration.cpp
index f54b4d0792c349eeb5e2e6eec005bc78419a153e..7b993b8490735a7c6ddaded1c21bbf57388788bf 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/remotelinux/maemorunconfiguration.cpp
@@ -51,6 +51,7 @@
 
 #include <qtsupport/qtoutputformatter.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qt4nodes.h>
 #include <qt4projectmanager/qt4project.h>
 #include <qt4projectmanager/qt4target.h>
 
@@ -59,15 +60,16 @@
 
 #include <QtCore/QStringBuilder>
 
-namespace Qt4ProjectManager {
+using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
 namespace Internal {
 
 namespace {
 const bool DefaultUseRemoteGdbValue = false;
 } // anonymous namespace
 
-using namespace ProjectExplorer;
-
 MaemoRunConfiguration::MaemoRunConfiguration(Qt4BaseTarget *parent,
         const QString &proFilePath)
     : RunConfiguration(parent, QLatin1String(MAEMO_RC_ID))
@@ -107,10 +109,10 @@ void MaemoRunConfiguration::init()
     handleDeployConfigChanged();
 
     Qt4Project *pro = qt4Target()->qt4Project();
-    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
-            this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)));
-    connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
-            this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
+    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+            this, SLOT(proFileUpdate(Qt4ProjectManager::Qt4ProFileNode*,bool)));
+    connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)),
+            this, SLOT(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)));
 }
 
 MaemoRunConfiguration::~MaemoRunConfiguration()
@@ -153,14 +155,14 @@ void MaemoRunConfiguration::handleParseState(bool success)
     }
 }
 
-void MaemoRunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
+void MaemoRunConfiguration::proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro)
 {
     if (m_proFilePath != pro->path())
         return;
     handleParseState(false);
 }
 
-void MaemoRunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success)
+void MaemoRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success)
 {
     if (m_proFilePath == pro->path()) {
         handleParseState(success);
@@ -436,4 +438,4 @@ QString MaemoRunConfiguration::proFilePath() const
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h b/src/plugins/remotelinux/maemorunconfiguration.h
similarity index 90%
rename from src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
rename to src/plugins/remotelinux/maemorunconfiguration.h
index f28bad75e021b50e6ecacbf813fe7fefad4a3a75..48ae8b98644e6c57d840f4bde4eb194242145f27 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
+++ b/src/plugins/remotelinux/maemorunconfiguration.h
@@ -47,18 +47,17 @@
 QT_FORWARD_DECLARE_CLASS(QWidget)
 
 namespace Qt4ProjectManager {
-
 class Qt4BuildConfiguration;
 class Qt4Project;
 class Qt4BaseTarget;
+class Qt4ProFileNode;
+} // namespace Qt4ProjectManager
 
+namespace RemoteLinux {
 namespace Internal {
 
-class Qt4ProFileNode;
-
 class AbstractLinuxDeviceDeployStep;
 class MaemoDeviceConfigListModel;
-class MaemoManager;
 class MaemoRemoteMountsModel;
 class MaemoRunConfigurationFactory;
 class MaemoToolChain;
@@ -77,15 +76,16 @@ public:
 
     enum DebuggingType { DebugCppOnly, DebugQmlOnly, DebugCppAndQml };
 
-    MaemoRunConfiguration(Qt4BaseTarget *parent, const QString &proFilePath);
+    MaemoRunConfiguration(Qt4ProjectManager::Qt4BaseTarget *parent,
+        const QString &proFilePath);
     virtual ~MaemoRunConfiguration();
 
     using ProjectExplorer::RunConfiguration::isEnabled;
     bool isEnabled(ProjectExplorer::BuildConfiguration *config) const;
     QWidget *createConfigurationWidget();
     Utils::OutputFormatter *createOutputFormatter() const;
-    Qt4BaseTarget *qt4Target() const;
-    Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
+    Qt4ProjectManager::Qt4BaseTarget *qt4Target() const;
+    Qt4ProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
 
     Qt4MaemoDeployConfiguration *deployConfig() const;
     MaemoRemoteMountsModel *remoteMounts() const { return m_remoteMounts; }
@@ -134,13 +134,14 @@ signals:
     void userEnvironmentChangesChanged(const QList<Utils::EnvironmentItem> &diff);
 
 protected:
-    MaemoRunConfiguration(Qt4BaseTarget *parent, MaemoRunConfiguration *source);
+    MaemoRunConfiguration(Qt4ProjectManager::Qt4BaseTarget *parent,
+        MaemoRunConfiguration *source);
     virtual bool fromMap(const QVariantMap &map);
     QString defaultDisplayName();
 
 private slots:
-    void proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success);
-    void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
+    void proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success);
+    void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro);
     void updateDeviceConfigurations();
     void handleDeployConfigChanged();
 
@@ -162,6 +163,6 @@ private:
 };
 
     } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMORUNCONFIGURATION_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/remotelinux/maemorunconfigurationwidget.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
rename to src/plugins/remotelinux/maemorunconfigurationwidget.cpp
index 0d8aa29dc66331a570be07237fcd46321734ca2e..76c6210bff1e4ebaa56a998b2b13ab04358b5655 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/maemorunconfigurationwidget.cpp
@@ -33,7 +33,6 @@
 
 #include "maemodeployables.h"
 #include "maemodeviceenvreader.h"
-#include "maemomanager.h"
 #include "maemoglobal.h"
 #include "maemoremotemountsmodel.h"
 #include "maemorunconfiguration.h"
@@ -64,11 +63,13 @@
 #include <QtGui/QTableView>
 #include <QtGui/QToolButton>
 
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 const QString FetchEnvButtonText
-    = QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoRunConfigurationWidget",
+    = QCoreApplication::translate("ReoteLinux::Internal::MaemoRunConfigurationWidget",
           "Fetch Device Environment");
 } // anonymous namespace
 
@@ -337,9 +338,8 @@ void MaemoRunConfigurationWidget::handleDeploySpecsChanged()
 void MaemoRunConfigurationWidget::showDeviceConfigurationsDialog(const QString &link)
 {
     if (link == QLatin1String("deviceconfig")) {
-        MaemoDeviceConfigurationsSettingsPage *page
-            = MaemoManager::instance().deviceConfigurationsSettingsPage();
-        Core::ICore::instance()->showOptionsDialog(page->category(), page->id());
+        Core::ICore::instance()->showOptionsDialog(MaemoDeviceConfigurationsSettingsPage::Category,
+            MaemoDeviceConfigurationsSettingsPage::Id);
     } else if (link == QLatin1String("debugger")) {
         Core::ICore::instance()->showOptionsDialog(QLatin1String("O.Debugger"),
             QLatin1String("M.Gdb"));
@@ -539,4 +539,4 @@ void MaemoRunConfigurationWidget::updateMountWarning()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h b/src/plugins/remotelinux/maemorunconfigurationwidget.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
rename to src/plugins/remotelinux/maemorunconfigurationwidget.h
index 4c4fc5fe96dd05ca7441621202f1a73d4b63a11b..059ce204d5178542c4f81e6ea67c3fc0f8832d23 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
+++ b/src/plugins/remotelinux/maemorunconfigurationwidget.h
@@ -47,6 +47,7 @@ class QVBoxLayout;
 QT_END_NAMESPACE
 
 namespace Utils {
+class DetailsWidget;
 class EnvironmentItem;
 }
 
@@ -54,11 +55,11 @@ namespace ProjectExplorer {
 class EnvironmentWidget;
 }
 
-namespace Utils { class DetailsWidget; }
-
 namespace Qt4ProjectManager {
 class Qt4BuildConfiguration;
+}
 
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeviceEnvReader;
 class MaemoRunConfiguration;
@@ -126,6 +127,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMORUNCONFIGURATIONWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/remotelinux/maemoruncontrol.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
rename to src/plugins/remotelinux/maemoruncontrol.cpp
index 7a0a0bd35b6f23e985f687e58c73cb82f8358572..c07eb0419627326880017f48943b92eb6f77e614 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+++ b/src/plugins/remotelinux/maemoruncontrol.cpp
@@ -42,7 +42,7 @@
 
 using namespace ProjectExplorer;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 using ProjectExplorer::RunConfiguration;
@@ -159,4 +159,4 @@ void MaemoRunControl::setFinished()
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h b/src/plugins/remotelinux/maemoruncontrol.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
rename to src/plugins/remotelinux/maemoruncontrol.h
index 5bf14dc7c603c51b5a88dc8df46e66fa90cad9bd..774ca2973f04c8dee0d5ad49327f164402cac8f0 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
+++ b/src/plugins/remotelinux/maemoruncontrol.h
@@ -36,7 +36,7 @@
 
 #include <QtCore/QString>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 class MaemoRunConfiguration;
@@ -73,6 +73,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMORUNCONTROL_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp b/src/plugins/remotelinux/maemorunfactories.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
rename to src/plugins/remotelinux/maemorunfactories.cpp
index 8bb017a76ebf97d315961152ce0f5d7e318d4ea6..9a5198042136b605cbbe8f5693b43c1c8888170e 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
+++ b/src/plugins/remotelinux/maemorunfactories.cpp
@@ -44,13 +44,13 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <debugger/debuggerconstants.h>
 #include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
 #include <analyzerbase/analyzerconstants.h>
 
-namespace Qt4ProjectManager {
-namespace Internal {
-
 using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
+namespace Internal {
 
 namespace {
 
@@ -215,4 +215,4 @@ RunConfigWidget *MaemoRunControlFactory::createConfigurationWidget(RunConfigurat
 }
 
     } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.h b/src/plugins/remotelinux/maemorunfactories.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.h
rename to src/plugins/remotelinux/maemorunfactories.h
index fc67b85ffe9ec7bb8c2522e044dc3776cd6571b4..51812c60d945d23ec2b9ef11fe6dcd81315cf763 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.h
+++ b/src/plugins/remotelinux/maemorunfactories.h
@@ -46,7 +46,7 @@ using ProjectExplorer::RunConfigWidget;
 using ProjectExplorer::RunControl;
 using ProjectExplorer::Target;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
     namespace Internal {
 
 class MaemoRunConfigurationFactory : public IRunConfigurationFactory
@@ -85,6 +85,6 @@ public:
 };
 
     } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif  // MAEMORUNFACTORIES_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.cpp b/src/plugins/remotelinux/maemosettingspages.cpp
similarity index 87%
rename from src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.cpp
rename to src/plugins/remotelinux/maemosettingspages.cpp
index 0b68a0da3f01401997403493cda55af04ff06963..635e59b762f6270bf963cd6225322277e764e0d1 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.cpp
+++ b/src/plugins/remotelinux/maemosettingspages.cpp
@@ -45,9 +45,62 @@
 #include <QtGui/QLabel>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QIcon>
+#include <QtGui/QMainWindow>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
+namespace {
+class MaemoQemuCrashDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    MaemoQemuCrashDialog(QWidget *parent = 0) : QDialog(parent)
+    {
+        setWindowTitle(tr("Qemu error"));
+        QString message = tr("Qemu crashed.") + QLatin1String(" <p>");
+        const MaemoQemuSettings::OpenGlMode openGlMode
+            = MaemoQemuSettings::openGlMode();
+        const QString linkString = QLatin1String("</p><a href=\"dummy\">")
+            + tr("Click here to change the OpenGL mode.")
+            + QLatin1String("</a>");
+        if (openGlMode == MaemoQemuSettings::HardwareAcceleration) {
+            message += tr("You have configured Qemu to use OpenGL "
+                "hardware acceleration, which might not be supported by "
+                "your system. You could try using software rendering instead.");
+            message += linkString;
+        } else if (openGlMode == MaemoQemuSettings::AutoDetect) {
+            message += tr("Qemu is currently configured to auto-detect the "
+                "OpenGL mode, which is known to not work in some cases. "
+                "You might want to use software rendering instead.");
+            message += linkString;
+        }
+        QLabel * const messageLabel = new QLabel(message, this);
+        messageLabel->setWordWrap(true);
+        messageLabel->setTextFormat(Qt::RichText);
+        connect(messageLabel, SIGNAL(linkActivated(QString)),
+            SLOT(showSettingsPage()));
+        QVBoxLayout *mainLayout = new QVBoxLayout(this);
+        mainLayout->addWidget(messageLabel);
+        QFrame * const separator = new QFrame;
+        separator->setFrameShape(QFrame::HLine);
+        separator->setFrameShadow(QFrame::Sunken);
+        mainLayout->addWidget(separator);
+        QDialogButtonBox * const buttonBox = new QDialogButtonBox;
+        buttonBox->addButton(QDialogButtonBox::Ok);
+        connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+        mainLayout->addWidget(buttonBox);
+    }
+
+private:
+    Q_SLOT void showSettingsPage()
+    {
+        Core::ICore::instance()->showOptionsDialog(MaemoQemuSettingsPage::Category,
+            MaemoQemuSettingsPage::Id);
+        accept();
+    }
+};
+
+} // anonymous namespace
 
 MaemoDeviceConfigurationsSettingsPage::MaemoDeviceConfigurationsSettingsPage(QObject *parent)
     : Core::IOptionsPage(parent)
@@ -60,7 +113,7 @@ MaemoDeviceConfigurationsSettingsPage::~MaemoDeviceConfigurationsSettingsPage()
 
 QString MaemoDeviceConfigurationsSettingsPage::id() const
 {
-    return QLatin1String("ZZ.Maemo Device Configurations");
+    return Id;
 }
 
 QString MaemoDeviceConfigurationsSettingsPage::displayName() const
@@ -70,7 +123,7 @@ QString MaemoDeviceConfigurationsSettingsPage::displayName() const
 
 QString MaemoDeviceConfigurationsSettingsPage::category() const
 {
-    return QLatin1String(Constants::MAEMO_SETTINGS_CATEGORY);
+    return Category;
 }
 
 QString MaemoDeviceConfigurationsSettingsPage::displayCategory() const
@@ -106,6 +159,11 @@ void MaemoDeviceConfigurationsSettingsPage::finish()
 {
 }
 
+const QString MaemoDeviceConfigurationsSettingsPage::Id
+    = QLatin1String("ZZ.Maemo Device Configurations");
+const QString MaemoDeviceConfigurationsSettingsPage::Category
+    = QLatin1String(Constants::MAEMO_SETTINGS_CATEGORY);
+
 
 MaemoQemuSettingsPage::MaemoQemuSettingsPage(QObject *parent)
     : Core::IOptionsPage(parent)
@@ -118,7 +176,7 @@ MaemoQemuSettingsPage::~MaemoQemuSettingsPage()
 
 QString MaemoQemuSettingsPage::id() const
 {
-    return QLatin1String("ZZ.Qemu Settings");
+    return Id;
 }
 
 QString MaemoQemuSettingsPage::displayName() const
@@ -128,7 +186,7 @@ QString MaemoQemuSettingsPage::displayName() const
 
 QString MaemoQemuSettingsPage::category() const
 {
-    return QLatin1String(Constants::MAEMO_SETTINGS_CATEGORY);
+    return Category;
 }
 
 QString MaemoQemuSettingsPage::displayCategory() const
@@ -162,68 +220,17 @@ void MaemoQemuSettingsPage::finish()
 {
 }
 
-
-class MaemoQemuCrashDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    MaemoQemuCrashDialog(MaemoQemuSettingsPage *settingsPage)
-        : m_settingsPage(settingsPage)
-    {
-        setWindowTitle(tr("Qemu error"));
-        QString message = tr("Qemu crashed.") + QLatin1String(" <p>");
-        const MaemoQemuSettings::OpenGlMode openGlMode
-            = MaemoQemuSettings::openGlMode();
-        const QString linkString = QLatin1String("</p><a href=\"dummy\">")
-            + tr("Click here to change the OpenGL mode.")
-            + QLatin1String("</a>");
-        if (openGlMode == MaemoQemuSettings::HardwareAcceleration) {
-            message += tr("You have configured Qemu to use OpenGL "
-                "hardware acceleration, which might not be supported by "
-                "your system. You could try using software rendering instead.");
-            message += linkString;
-        } else if (openGlMode == MaemoQemuSettings::AutoDetect) {
-            message += tr("Qemu is currently configured to auto-detect the "
-                "OpenGL mode, which is known to not work in some cases. "
-                "You might want to use software rendering instead.");
-            message += linkString;
-        }
-        QLabel * const messageLabel = new QLabel(message, this);
-        messageLabel->setWordWrap(true);
-        messageLabel->setTextFormat(Qt::RichText);
-        connect(messageLabel, SIGNAL(linkActivated(QString)),
-            SLOT(showSettingsPage()));
-        QVBoxLayout *mainLayout = new QVBoxLayout(this);
-        mainLayout->addWidget(messageLabel);
-        QFrame * const separator = new QFrame;
-        separator->setFrameShape(QFrame::HLine);
-        separator->setFrameShadow(QFrame::Sunken);
-        mainLayout->addWidget(separator);
-        QDialogButtonBox * const buttonBox = new QDialogButtonBox;
-        buttonBox->addButton(QDialogButtonBox::Ok);
-        connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-        mainLayout->addWidget(buttonBox);
-    }
-
-private:
-    Q_SLOT void showSettingsPage()
-    {
-        Core::ICore::instance()->showOptionsDialog(m_settingsPage->category(),
-            m_settingsPage->id());
-        accept();
-    }
-
-    MaemoQemuSettingsPage * const m_settingsPage;
-};
-
-
 void MaemoQemuSettingsPage::showQemuCrashDialog()
 {
-    MaemoQemuCrashDialog dlg(this);
+    MaemoQemuCrashDialog dlg(Core::ICore::instance()->mainWindow());
     dlg.exec();
 }
 
+const QString MaemoQemuSettingsPage::Id = QLatin1String("ZZ.Qemu Settings");
+const QString MaemoQemuSettingsPage::Category
+    = QLatin1String(Constants::MAEMO_SETTINGS_CATEGORY);
+
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #include "maemosettingspages.moc"
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.h b/src/plugins/remotelinux/maemosettingspages.h
similarity index 89%
rename from src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.h
rename to src/plugins/remotelinux/maemosettingspages.h
index db371413325571d5dbac8031944ae1d2f7b90fa2..8feff817129fa9ec7da98e7f2f59a4d164fad36a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.h
+++ b/src/plugins/remotelinux/maemosettingspages.h
@@ -34,7 +34,7 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-namespace Qt4ProjectManager{
+namespace RemoteLinux{
 namespace Internal {
 
 class MaemoDeviceConfigurationsSettingsWidget;
@@ -44,7 +44,7 @@ class MaemoDeviceConfigurationsSettingsPage : public Core::IOptionsPage
 {
     Q_OBJECT
 public:
-    MaemoDeviceConfigurationsSettingsPage(QObject *parent);
+    MaemoDeviceConfigurationsSettingsPage(QObject *parent = 0);
     ~MaemoDeviceConfigurationsSettingsPage();
 
     virtual QString id() const;
@@ -57,6 +57,9 @@ public:
     virtual void apply();
     virtual void finish();
 
+    static const QString Id;
+    static const QString Category;
+
 private:
     QString m_keywords;
     MaemoDeviceConfigurationsSettingsWidget *m_widget;
@@ -66,7 +69,7 @@ class MaemoQemuSettingsPage : public Core::IOptionsPage
 {
     Q_OBJECT
 public:
-    MaemoQemuSettingsPage(QObject *parent);
+    MaemoQemuSettingsPage(QObject *parent = 0);
     ~MaemoQemuSettingsPage();
 
     virtual QString id() const;
@@ -79,7 +82,10 @@ public:
     virtual void apply();
     virtual void finish();
 
-    void showQemuCrashDialog();
+    static const QString Id;
+    static const QString Category;
+
+    static void showQemuCrashDialog();
 
 private:
     QString m_keywords;
@@ -87,6 +93,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOSETTINGSPAGES_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.cpp b/src/plugins/remotelinux/maemosshconfigdialog.cpp
similarity index 95%
rename from src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.cpp
rename to src/plugins/remotelinux/maemosshconfigdialog.cpp
index 6eda014e587a81066185e1bc0c3615699d8bccf6..ce2b6deff138648791736a0bc4bfebee10896be1 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.cpp
+++ b/src/plugins/remotelinux/maemosshconfigdialog.cpp
@@ -44,7 +44,7 @@
 #include <QtNetwork/QHostInfo>
 
 using namespace Utils;
-using namespace Qt4ProjectManager::Internal;
+using namespace RemoteLinux::Internal;
 
 MaemoSshConfigDialog::MaemoSshConfigDialog(QWidget *parent)
     : QDialog(parent)
@@ -77,9 +77,6 @@ void MaemoSshConfigDialog::generateSshKey()
         ? SshKeyGenerator::Rsa
         : SshKeyGenerator::Dsa;
 
-    QByteArray userId = QString(home.mid(home.lastIndexOf(QLatin1Char('/')) + 1)
-        + QLatin1Char('@') + QHostInfo::localHostName()).toUtf8();
-
     QApplication::setOverrideCursor(Qt::BusyCursor);
 
     if (m_keyGenerator->generateKeys(keyType, SshKeyGenerator::OpenSsl,
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.h b/src/plugins/remotelinux/maemosshconfigdialog.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.h
rename to src/plugins/remotelinux/maemosshconfigdialog.h
index 47e67c6613888374053ceeff7de686776c54d6f5..5690579741c51692ae9ed3cf8733b9043c2f06f4 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.h
+++ b/src/plugins/remotelinux/maemosshconfigdialog.h
@@ -41,7 +41,7 @@ namespace Utils {
     class SshKeyGenerator;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
     namespace Internal {
 
 class MaemoSshConfigDialog : public QDialog
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.ui b/src/plugins/remotelinux/maemosshconfigdialog.ui
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.ui
rename to src/plugins/remotelinux/maemosshconfigdialog.ui
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp b/src/plugins/remotelinux/maemosshrunner.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
rename to src/plugins/remotelinux/maemosshrunner.cpp
index 750890c48788370feaf79eb607237634a445fd49..7d47d6268b555cf9836f470d58d8839158a0583f 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
+++ b/src/plugins/remotelinux/maemosshrunner.cpp
@@ -48,9 +48,10 @@
 
 #define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
 
+using namespace Qt4ProjectManager;
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoSshRunner::MaemoSshRunner(QObject *parent,
@@ -386,5 +387,5 @@ const qint64 MaemoSshRunner::InvalidExitCode
     = std::numeric_limits<qint64>::min();
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.h b/src/plugins/remotelinux/maemosshrunner.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.h
rename to src/plugins/remotelinux/maemosshrunner.h
index a4f52a75f586b2ba9d161aa480d7ca364d22ba38..8446bc02b0e95e23e23212cbe61312498544601a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.h
+++ b/src/plugins/remotelinux/maemosshrunner.h
@@ -46,7 +46,7 @@ namespace Utils {
     class SshRemoteProcess;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoRemoteMounter;
 class MaemoRunConfiguration;
@@ -130,6 +130,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOSSHRUNNER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/remotelinux/maemotoolchain.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
rename to src/plugins/remotelinux/maemotoolchain.cpp
index 114fcabf061ec06fe03343145dfa79499039a18f..c323a41f6202d48d391600ea56e82f5f95cdabe4 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
+++ b/src/plugins/remotelinux/maemotoolchain.cpp
@@ -33,13 +33,12 @@
 #include "maemotoolchain.h"
 
 #include "maemoglobal.h"
-#include "maemomanager.h"
 #include "maemoqtversion.h"
-#include "qt4projectmanagerconstants.h"
 
 #include <projectexplorer/gccparser.h>
 #include <projectexplorer/headerpath.h>
 #include <projectexplorer/toolchainmanager.h>
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
 #include <utils/environment.h>
 #include <qtsupport/qtversionmanager.h>
 
@@ -48,7 +47,9 @@
 #include <QtGui/QLabel>
 #include <QtGui/QVBoxLayout>
 
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
 namespace Internal {
 
 static const char *const MAEMO_QT_VERSION_KEY = "Qt4ProjectManager.Maemo.QtVersion";
@@ -336,4 +337,4 @@ QList<ProjectExplorer::ToolChain *> MaemoToolChainFactory::createToolChainList(c
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h b/src/plugins/remotelinux/maemotoolchain.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
rename to src/plugins/remotelinux/maemotoolchain.h
index 23c66cb69b55869569c34680a0d276285213bf13..a2624b1a68b568d87cd33289cbf55b55e31dbf3e 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
+++ b/src/plugins/remotelinux/maemotoolchain.h
@@ -36,7 +36,7 @@
 #include <projectexplorer/gcctoolchain.h>
 #include <projectexplorer/toolchainconfigwidget.h>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 
 namespace Internal {
 
@@ -121,6 +121,6 @@ private slots:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOTOOLCHAIN_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.cpp b/src/plugins/remotelinux/maemouploadandinstalldeploystep.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.cpp
rename to src/plugins/remotelinux/maemouploadandinstalldeploystep.cpp
index 2ae24003be7ba02488fc9444c13b7c1580027dbc..d9005dea07cfd7aac9c20e6be9c535f954837c88 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.cpp
+++ b/src/plugins/remotelinux/maemouploadandinstalldeploystep.cpp
@@ -49,7 +49,7 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 AbstractMaemoUploadAndInstallStep::AbstractMaemoUploadAndInstallStep(BuildStepList *parent, const QString &id)
@@ -275,4 +275,4 @@ const QString MaemoUploadAndInstallTarPackageStep::DisplayName
 
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.h b/src/plugins/remotelinux/maemouploadandinstalldeploystep.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.h
rename to src/plugins/remotelinux/maemouploadandinstalldeploystep.h
index 94da40c013ebd11fbaff52c441584320d5cd2056..97eec9491cdacc6886982c3729dd57fe9e56f87a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.h
+++ b/src/plugins/remotelinux/maemouploadandinstalldeploystep.h
@@ -35,7 +35,7 @@
 
 #include "abstractmaemodeploystep.h"
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class AbstractMaemoPackageInstaller;
 class MaemoPackageUploader;
@@ -126,6 +126,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMODEPLOYSTEP_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemousedportsgatherer.cpp b/src/plugins/remotelinux/maemousedportsgatherer.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/maemousedportsgatherer.cpp
rename to src/plugins/remotelinux/maemousedportsgatherer.cpp
index c06a49e5bf82d74ba345756b369aec435716f453..3043b4bbd478cae25ab79ca50bdf7545efab579a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemousedportsgatherer.cpp
+++ b/src/plugins/remotelinux/maemousedportsgatherer.cpp
@@ -37,7 +37,7 @@
 
 using namespace Utils;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
 MaemoUsedPortsGatherer::MaemoUsedPortsGatherer(QObject *parent) :
@@ -166,4 +166,4 @@ void MaemoUsedPortsGatherer::handleRemoteStdErr(const QByteArray &output)
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemousedportsgatherer.h b/src/plugins/remotelinux/maemousedportsgatherer.h
similarity index 97%
rename from src/plugins/qt4projectmanager/qt-maemo/maemousedportsgatherer.h
rename to src/plugins/remotelinux/maemousedportsgatherer.h
index dc1ad3101b27b58fc0588a9a2fa3aed11125538d..fd856185f5e7d43c2e9c8e79dcd8814d0e4ca4c2 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemousedportsgatherer.h
+++ b/src/plugins/remotelinux/maemousedportsgatherer.h
@@ -44,7 +44,7 @@ class SshConnection;
 class SshRemoteProcessRunner;
 }
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoDeviceConfig;
 
@@ -81,6 +81,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // MAEMOUSEDPORTSGATHERER_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.qrc b/src/plugins/remotelinux/qt-maemo.qrc
similarity index 100%
rename from src/plugins/qt4projectmanager/qt-maemo/qt-maemo.qrc
rename to src/plugins/remotelinux/qt-maemo.qrc
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemodeployconfiguration.cpp b/src/plugins/remotelinux/qt4maemodeployconfiguration.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/qt4maemodeployconfiguration.cpp
rename to src/plugins/remotelinux/qt4maemodeployconfiguration.cpp
index d3da3916fe49515300cf986fb324d15a3b153fe5..0bff6001fa1063632ec4debd6ea80d7654e113e6 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemodeployconfiguration.cpp
+++ b/src/plugins/remotelinux/qt4maemodeployconfiguration.cpp
@@ -43,12 +43,12 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
 #include <qt4projectmanager/qt4target.h>
 
 using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 namespace {
 const QString OldDeployConfigId = QLatin1String("2.2MaemoDeployConfig");
@@ -217,4 +217,4 @@ DeployConfiguration *Qt4MaemoDeployConfigurationFactory::clone(Target *parent,
 }
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemodeployconfiguration.h b/src/plugins/remotelinux/qt4maemodeployconfiguration.h
similarity index 98%
rename from src/plugins/qt4projectmanager/qt-maemo/qt4maemodeployconfiguration.h
rename to src/plugins/remotelinux/qt4maemodeployconfiguration.h
index 3fc573e4229ade905143656676b703226d70eb4e..e9db6b60cf916c944adc6d8d4f448a619d9a4a33 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemodeployconfiguration.h
+++ b/src/plugins/remotelinux/qt4maemodeployconfiguration.h
@@ -40,7 +40,7 @@
 
 #include <QtCore/QSharedPointer>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 class MaemoPerTargetDeviceConfigurationListModel;
 
@@ -95,6 +95,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // QT4PROJECTMANAGER_QT4DEPLOYCONFIGURATION_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp b/src/plugins/remotelinux/qt4maemotarget.cpp
similarity index 99%
rename from src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
rename to src/plugins/remotelinux/qt4maemotarget.cpp
index b7de6ef6590a880187987e5b8dbd1992f7b5518f..1074335e20361a4befe4465aa9740b39c10408bc 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
+++ b/src/plugins/remotelinux/qt4maemotarget.cpp
@@ -52,7 +52,6 @@
 #include <utils/filesystemwatcher.h>
 #include <qtsupport/baseqtversion.h>
 
-
 #include <QtGui/QApplication>
 #include <QtGui/QMainWindow>
 #include <QtCore/QBuffer>
@@ -68,7 +67,9 @@
 #include <cctype>
 
 using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+
+namespace RemoteLinux {
+namespace Internal {
 
 namespace {
 const QByteArray NameFieldName("Package");
@@ -1121,3 +1122,6 @@ QString Qt4MeegoTarget::specFileName() const
 {
     return QLatin1String("meego.spec");
 }
+
+} // namespace Internal
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h b/src/plugins/remotelinux/qt4maemotarget.h
similarity index 89%
rename from src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
rename to src/plugins/remotelinux/qt4maemotarget.h
index 81dd1ea010e98ec46d87b1d74a64b46b7f1d7f83..8b385a4bb2e505bfc1e3fb64dbd4fa017994d613 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
+++ b/src/plugins/remotelinux/qt4maemotarget.h
@@ -33,7 +33,7 @@
 #ifndef QT4MAEMOTARGET_H
 #define QT4MAEMOTARGET_H
 
-#include "qt4target.h"
+#include <qt4projectmanager/qt4target.h>
 
 #include <QtCore/QIODevice>
 #include <QtCore/QSharedPointer>
@@ -41,24 +41,24 @@
 
 QT_FORWARD_DECLARE_CLASS(QFile)
 
-namespace Utils {
-class FileSystemWatcher;
-}
-namespace Qt4ProjectManager {
-class Qt4Project;
+namespace Qt4ProjectManager { class Qt4Project; }
+namespace Utils { class FileSystemWatcher; }
+
+namespace RemoteLinux {
 namespace Internal {
 class Qt4MaemoDeployConfigurationFactory;
 class WatchableFile;
 
-class AbstractQt4MaemoTarget : public Qt4BaseTarget
+class AbstractQt4MaemoTarget : public Qt4ProjectManager::Qt4BaseTarget
 {
     friend class Qt4MaemoTargetFactory;
     Q_OBJECT
 public:
-    explicit AbstractQt4MaemoTarget(Qt4Project *parent, const QString &id);
+    explicit AbstractQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent,
+        const QString &id);
     virtual ~AbstractQt4MaemoTarget();
 
-    Qt4BuildConfigurationFactory *buildConfigurationFactory() const;
+    Qt4ProjectManager::Qt4BuildConfigurationFactory *buildConfigurationFactory() const;
     void createApplicationProFiles();
     QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Node *n);
     QList<ProjectExplorer::ToolChain *> possibleToolChains(ProjectExplorer::BuildConfiguration *bc) const;
@@ -105,7 +105,7 @@ private:
     bool initPackagingSettingsFromOtherTarget();
     virtual bool initAdditionalPackagingSettingsFromOtherTarget()=0;
 
-    Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
+    Qt4ProjectManager::Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
     bool m_isInitialized;
 };
 
@@ -114,7 +114,8 @@ class AbstractDebBasedQt4MaemoTarget : public AbstractQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    AbstractDebBasedQt4MaemoTarget(Qt4Project *parent, const QString &id);
+    AbstractDebBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent,
+        const QString &id);
     ~AbstractDebBasedQt4MaemoTarget();
 
     QString debianDirPath() const;
@@ -182,7 +183,8 @@ class AbstractRpmBasedQt4MaemoTarget : public AbstractQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    AbstractRpmBasedQt4MaemoTarget(Qt4Project *parent, const QString &id);
+    AbstractRpmBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent,
+        const QString &id);
     ~AbstractRpmBasedQt4MaemoTarget();
 
     virtual bool allowsRemoteMounts() const { return false; }
@@ -225,7 +227,8 @@ class Qt4Maemo5Target : public AbstractDebBasedQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    explicit Qt4Maemo5Target(Qt4Project *parent, const QString &id);
+    explicit Qt4Maemo5Target(Qt4ProjectManager::Qt4Project *parent,
+        const QString &id);
     virtual ~Qt4Maemo5Target();
 
     virtual bool allowsRemoteMounts() const { return true; }
@@ -246,7 +249,8 @@ class Qt4HarmattanTarget : public AbstractDebBasedQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    explicit Qt4HarmattanTarget(Qt4Project *parent, const QString &id);
+    explicit Qt4HarmattanTarget(Qt4ProjectManager::Qt4Project *parent,
+        const QString &id);
     virtual ~Qt4HarmattanTarget();
 
     virtual bool allowsRemoteMounts() const { return false; }
@@ -267,7 +271,8 @@ class Qt4MeegoTarget : public AbstractRpmBasedQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    explicit Qt4MeegoTarget(Qt4Project *parent, const QString &id);
+    explicit Qt4MeegoTarget(Qt4ProjectManager::Qt4Project *parent,
+        const QString &id);
     virtual ~Qt4MeegoTarget();
     static QString defaultDisplayName();
 private:
@@ -275,6 +280,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // QT4MAEMOTARGET_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp b/src/plugins/remotelinux/qt4maemotargetfactory.cpp
similarity index 83%
rename from src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
rename to src/plugins/remotelinux/qt4maemotargetfactory.cpp
index 588d4fc1a748f44434940039547766fd26671773..a185f1855cd4b2e1c00f332c16ebe3a8c81795a9 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
+++ b/src/plugins/remotelinux/qt4maemotargetfactory.cpp
@@ -31,9 +31,6 @@
 **************************************************************************/
 
 #include "qt4maemotargetfactory.h"
-#include "buildconfigurationinfo.h"
-#include "qt4project.h"
-#include "qt4projectmanagerconstants.h"
 #include "maemoglobal.h"
 #include "maemopackagecreationstep.h"
 #include "maemorunconfiguration.h"
@@ -43,12 +40,18 @@
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/customexecutablerunconfiguration.h>
+#include <qt4projectmanager/buildconfigurationinfo.h>
+#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
 #include <utils/qtcassert.h>
 
 using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace Qt4ProjectManager::Constants;
 using ProjectExplorer::idFromMap;
 
+namespace RemoteLinux {
+namespace Internal {
+
 // -------------------------------------------------------------------------
 // Qt4MaemoTargetFactory
 // -------------------------------------------------------------------------
@@ -73,22 +76,22 @@ QStringList Qt4MaemoTargetFactory::supportedTargetIds(ProjectExplorer::Project *
     QStringList targetIds;
     if (parent && !qobject_cast<Qt4Project *>(parent))
         return targetIds;
-    if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID)).isEmpty())
-        targetIds << QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID);
-    if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID)).isEmpty())
-        targetIds << QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID);
-    if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID)).isEmpty())
-        targetIds << QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID);
+    if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(MAEMO5_DEVICE_TARGET_ID)).isEmpty())
+        targetIds << QLatin1String(MAEMO5_DEVICE_TARGET_ID);
+    if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(HARMATTAN_DEVICE_TARGET_ID)).isEmpty())
+        targetIds << QLatin1String(HARMATTAN_DEVICE_TARGET_ID);
+    if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(MEEGO_DEVICE_TARGET_ID)).isEmpty())
+        targetIds << QLatin1String(MEEGO_DEVICE_TARGET_ID);
     return targetIds;
 }
 
 QString Qt4MaemoTargetFactory::displayNameForId(const QString &id) const
 {
-    if (id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
+    if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID))
         return Qt4Maemo5Target::defaultDisplayName();
-    else if (id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID))
+    else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID))
         return Qt4HarmattanTarget::defaultDisplayName();
-    else if (id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID))
+    else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID))
         return Qt4MeegoTarget::defaultDisplayName();
     return QString();
 }
@@ -119,11 +122,11 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::restore(ProjectExplorer::Project
     const QString id = idFromMap(map);
     AbstractQt4MaemoTarget *target = 0;
     Qt4Project *qt4project = static_cast<Qt4Project *>(parent);
-    if (id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
+    if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID))
         target = new Qt4Maemo5Target(qt4project, QLatin1String("transient ID"));
-    else if (id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID))
+    else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID))
         target = new Qt4HarmattanTarget(qt4project, QLatin1String("transient ID"));
-    else if (id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID))
+    else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID))
         target = new Qt4MeegoTarget(qt4project, QLatin1String("transient ID"));
     if (target->fromMap(map))
         return target;
@@ -133,11 +136,11 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::restore(ProjectExplorer::Project
 
 QString Qt4MaemoTargetFactory::buildNameForId(const QString &id) const
 {
-    if (id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
+    if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID))
         return QLatin1String("maemo");
-    else if (id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID))
+    else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID))
         return QLatin1String("harmattan");
-    else if (id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID))
+    else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID))
         return QLatin1String("meego");
     else
         return QString();
@@ -198,14 +201,14 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project
 
     AbstractQt4MaemoTarget *target = 0;
     QStringList deployConfigIds;
-    if (id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID)) {
+    if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID)) {
         target = new Qt4Maemo5Target(static_cast<Qt4Project *>(parent), id);
         deployConfigIds << Qt4MaemoDeployConfiguration::FremantleWithPackagingId
             << Qt4MaemoDeployConfiguration::FremantleWithoutPackagingId;
-    } else if (id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID)) {
+    } else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID)) {
         target = new Qt4HarmattanTarget(static_cast<Qt4Project *>(parent), id);
         deployConfigIds << Qt4MaemoDeployConfiguration::HarmattanId;
-    } else if (id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID)) {
+    } else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID)) {
         target = new Qt4MeegoTarget(static_cast<Qt4Project *>(parent), id);
         deployConfigIds << Qt4MaemoDeployConfiguration::MeegoId;
     }
@@ -224,3 +227,6 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project
         target->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(target));
     return target;
 }
+
+} // namespace Internal
+} // namespace RemoteLinux
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.h b/src/plugins/remotelinux/qt4maemotargetfactory.h
similarity index 89%
rename from src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.h
rename to src/plugins/remotelinux/qt4maemotargetfactory.h
index 653a1a663be682bd8a494ee368a03d1509328352..05b49f152bf5686bf4953537f79a44a712761e74 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.h
+++ b/src/plugins/remotelinux/qt4maemotargetfactory.h
@@ -33,12 +33,12 @@
 #ifndef QT4MAEMOTARGETFACTORY_H
 #define QT4MAEMOTARGETFACTORY_H
 
-#include "qt4basetargetfactory.h"
+#include <qt4projectmanager/qt4basetargetfactory.h>
 
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
 namespace Internal {
 
-class Qt4MaemoTargetFactory : public Qt4BaseTargetFactory
+class Qt4MaemoTargetFactory : public Qt4ProjectManager::Qt4BaseTargetFactory
 {
     Q_OBJECT
 public:
@@ -59,13 +59,14 @@ public:
     bool supportsTargetId(const QString &id) const;
 
     ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id);
-    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id, const QList<BuildConfigurationInfo> &infos);
+    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id,
+        const QList<Qt4ProjectManager::BuildConfigurationInfo> &infos);
 
     bool isMobileTarget(const QString &id);
     bool supportsShadowBuilds(const QString &id);
 };
 
 } // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
 
 #endif // QT4MAEMOTARGETFACTORY_H
diff --git a/src/plugins/remotelinux/remotelinux.pri b/src/plugins/remotelinux/remotelinux.pri
new file mode 100644
index 0000000000000000000000000000000000000000..cfae991f6030e39d6f3c90dd3efece2405e28618
--- /dev/null
+++ b/src/plugins/remotelinux/remotelinux.pri
@@ -0,0 +1,3 @@
+include(remotelinux_dependencies.pri)
+
+LIBS *= -l$$qtLibraryName(RemoteLinux)
diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro
new file mode 100644
index 0000000000000000000000000000000000000000..7a61fa5de24a9eee7f14025df26c31648632c29f
--- /dev/null
+++ b/src/plugins/remotelinux/remotelinux.pro
@@ -0,0 +1,163 @@
+TEMPLATE = lib
+TARGET = RemoteLinux
+
+include(../../qtcreatorplugin.pri)
+include(../../shared/proparser/proparser.pri)
+include(remotelinux_dependencies.pri)
+
+message(target.path = $$target.path)
+
+HEADERS += \
+    remotelinuxplugin.h \
+    remotelinux_export.h \
+    maemoconfigtestdialog.h \
+    maemoconstants.h \
+    maemodeviceconfigurations.h \
+    maemorunconfiguration.h \
+    maemorunconfigurationwidget.h \
+    maemoruncontrol.h \
+    maemorunfactories.h \
+    maemosettingspages.h \
+    maemodeviceconfigurationssettingswidget.h \
+    maemosshconfigdialog.h \
+    maemotoolchain.h \
+    maemopackagecreationstep.h \
+    maemopackagecreationfactory.h \
+    maemopackagecreationwidget.h \
+    maemodeployablelistmodel.h \
+    maemoqemumanager.h \
+    maemodeployables.h \
+    maemodeployable.h \
+    maemodeploystepwidget.h \
+    maemodeploystepfactory.h \
+    maemoglobal.h \
+    maemosshrunner.h \
+    maemodebugsupport.h \
+    maemoanalyzersupport.h \
+    maemoremotemountsmodel.h \
+    maemodeviceenvreader.h \
+    maemomountspecification.h \
+    maemoremotemounter.h \
+    maemoprofilesupdatedialog.h \
+    maemousedportsgatherer.h \
+    maemoremoteprocesslist.h \
+    maemoremoteprocessesdialog.h \
+    maemopublishingwizardfactories.h \
+    maemopublishingbuildsettingspagefremantlefree.h \
+    maemopublishingfileselectiondialog.h \
+    maemopublishedprojectmodel.h \
+    maemopublishinguploadsettingspagefremantlefree.h \
+    maemopublishingwizardfremantlefree.h \
+    maemopublishingresultpagefremantlefree.h \
+    maemopublisherfremantlefree.h \
+    maemoqemuruntime.h \
+    maemoqemuruntimeparser.h \
+    maemoqemusettingswidget.h \
+    maemoqemusettings.h \
+    qt4maemotargetfactory.h \
+    qt4maemotarget.h \
+    qt4maemodeployconfiguration.h \
+    maemodeviceconfigwizard.h \
+    maemokeydeployer.h \
+    maemopertargetdeviceconfigurationlistmodel.h \
+    maemodeployconfigurationwidget.h \
+    maemoinstalltosysrootstep.h \
+    maemodeploymentmounter.h \
+    maemopackageuploader.h \
+    maemopackageinstaller.h \
+    maemoremotecopyfacility.h \
+    abstractmaemodeploystep.h \
+    maemodeploybymountstep.h \
+    maemouploadandinstalldeploystep.h \
+    maemodirectdeviceuploadstep.h \
+    abstractlinuxdevicedeploystep.h \
+    maemoqtversionfactory.h \
+    maemoqtversion.h
+
+SOURCES += \
+    remotelinuxplugin.cpp \
+    maemoconfigtestdialog.cpp \
+    maemodeviceconfigurations.cpp \
+    maemorunconfiguration.cpp \
+    maemorunconfigurationwidget.cpp \
+    maemoruncontrol.cpp \
+    maemorunfactories.cpp \
+    maemosettingspages.cpp \
+    maemodeviceconfigurationssettingswidget.cpp \
+    maemosshconfigdialog.cpp \
+    maemotoolchain.cpp \
+    maemopackagecreationstep.cpp \
+    maemopackagecreationfactory.cpp \
+    maemopackagecreationwidget.cpp \
+    maemodeployablelistmodel.cpp \
+    maemoqemumanager.cpp \
+    maemodeployables.cpp \
+    maemodeploystepwidget.cpp \
+    maemodeploystepfactory.cpp \
+    maemoglobal.cpp \
+    maemosshrunner.cpp \
+    maemodebugsupport.cpp \
+    maemoanalyzersupport.cpp \
+    maemoremotemountsmodel.cpp \
+    maemodeviceenvreader.cpp \
+    maemomountspecification.cpp \
+    maemoremotemounter.cpp \
+    maemoprofilesupdatedialog.cpp \
+    maemousedportsgatherer.cpp \
+    maemoremoteprocesslist.cpp \
+    maemoremoteprocessesdialog.cpp \
+    maemopublishingwizardfactories.cpp \
+    maemopublishingbuildsettingspagefremantlefree.cpp \
+    maemopublishingfileselectiondialog.cpp \
+    maemopublishedprojectmodel.cpp \
+    maemopublishinguploadsettingspagefremantlefree.cpp \
+    maemopublishingwizardfremantlefree.cpp \
+    maemopublishingresultpagefremantlefree.cpp \
+    maemopublisherfremantlefree.cpp \
+    maemoqemuruntimeparser.cpp \
+    maemoqemusettingswidget.cpp \
+    maemoqemusettings.cpp \
+    qt4maemotargetfactory.cpp \
+    qt4maemotarget.cpp \
+    qt4maemodeployconfiguration.cpp \
+    maemodeviceconfigwizard.cpp \
+    maemokeydeployer.cpp \
+    maemopertargetdeviceconfigurationlistmodel.cpp \
+    maemodeployconfigurationwidget.cpp \
+    maemoinstalltosysrootstep.cpp \
+    maemodeploymentmounter.cpp \
+    maemopackageuploader.cpp \
+    maemopackageinstaller.cpp \
+    maemoremotecopyfacility.cpp \
+    abstractmaemodeploystep.cpp \
+    maemodeploybymountstep.cpp \
+    maemouploadandinstalldeploystep.cpp \
+    maemodirectdeviceuploadstep.cpp \
+    abstractlinuxdevicedeploystep.cpp \
+    maemoqtversionfactory.cpp \
+    maemoqtversion.cpp
+
+FORMS += \
+    maemoconfigtestdialog.ui \
+    maemodeviceconfigurationssettingswidget.ui \
+    maemosshconfigdialog.ui \
+    maemopackagecreationwidget.ui \
+    maemodeploystepwidget.ui \
+    maemoprofilesupdatedialog.ui \
+    maemoremoteprocessesdialog.ui \
+    maemopublishingbuildsettingspagefremantlefree.ui \
+    maemopublishingfileselectiondialog.ui \
+    maemopublishinguploadsettingspagefremantlefree.ui \
+    maemopublishingresultpagefremantlefree.ui \
+    maemoqemusettingswidget.ui \
+    maemodeviceconfigwizardstartpage.ui \
+    maemodeviceconfigwizardpreviouskeysetupcheckpage.ui \
+    maemodeviceconfigwizardreusekeyscheckpage.ui \
+    maemodeviceconfigwizardkeycreationpage.ui \
+    maemodeviceconfigwizardkeydeploymentpage.ui \
+    maemodeployconfigurationwidget.ui \
+    maemodeviceconfigwizardlogindatapage.ui
+
+RESOURCES += qt-maemo.qrc
+DEFINES += QT_NO_CAST_TO_ASCII
+DEFINES += REMOTELINUX_LIBRARY
diff --git a/src/plugins/remotelinux/remotelinux_dependencies.pri b/src/plugins/remotelinux/remotelinux_dependencies.pri
new file mode 100644
index 0000000000000000000000000000000000000000..08885c7648f7fd558ec19c4ffd9ced3826c0839c
--- /dev/null
+++ b/src/plugins/remotelinux/remotelinux_dependencies.pri
@@ -0,0 +1,5 @@
+include(../../plugins/analyzerbase/analyzerbase.pri)
+include(../../plugins/coreplugin/coreplugin.pri)
+include(../../plugins/debugger/debugger.pri)
+include(../../plugins/projectexplorer/projectexplorer.pri)
+include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
diff --git a/src/plugins/remotelinux/remotelinux_export.h b/src/plugins/remotelinux/remotelinux_export.h
new file mode 100644
index 0000000000000000000000000000000000000000..489fec4fa955069e24e9fbf540e00d3211187611
--- /dev/null
+++ b/src/plugins/remotelinux/remotelinux_export.h
@@ -0,0 +1,44 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef REMOTE_LINUX_EXPORT_H
+#define REMOTE_LINUX_EXPORT_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(REMOTELINUX_LIBRARY)
+#  define REMOTELINUX_EXPORT Q_DECL_EXPORT
+#else
+#  define REMOTELINUX_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // REMOTE_LINUX_EXPORT_H
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a759ae825795bad8689ce1470e702a939f7bbddb
--- /dev/null
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -0,0 +1,97 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#include "remotelinuxplugin.h"
+
+#include "maemoconstants.h"
+#include "maemodeployable.h"
+#include "maemodeploystepfactory.h"
+#include "maemodeviceconfigurations.h"
+#include "maemoglobal.h"
+#include "maemopackagecreationfactory.h"
+#include "maemopublishingwizardfactories.h"
+#include "maemoqemumanager.h"
+#include "maemorunfactories.h"
+#include "maemosettingspages.h"
+#include "maemotoolchain.h"
+#include "qt4maemodeployconfiguration.h"
+#include "maemoqtversionfactory.h"
+#include "qt4maemotargetfactory.h"
+#include "qt4projectmanager/qt4projectmanagerconstants.h"
+
+#include <QtCore/QtPlugin>
+
+namespace RemoteLinux {
+namespace Internal {
+
+RemoteLinuxPlugin::RemoteLinuxPlugin()
+{
+}
+
+RemoteLinuxPlugin::~RemoteLinuxPlugin()
+{
+}
+
+bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
+    QString *error_message)
+{
+    Q_UNUSED(arguments)
+    Q_UNUSED(error_message)
+
+    MaemoQemuManager::instance(this);
+    MaemoDeviceConfigurations::instance(this);
+
+    addAutoReleasedObject(new MaemoRunControlFactory);
+    addAutoReleasedObject(new MaemoRunConfigurationFactory);
+    addAutoReleasedObject(new MaemoToolChainFactory);
+    addAutoReleasedObject(new Qt4MaemoDeployConfigurationFactory);
+    addAutoReleasedObject(new MaemoPackageCreationFactory);
+    addAutoReleasedObject(new MaemoDeployStepFactory);
+    addAutoReleasedObject(new MaemoDeviceConfigurationsSettingsPage);
+    addAutoReleasedObject(new MaemoQemuSettingsPage);
+    addAutoReleasedObject(new MaemoPublishingWizardFactoryFremantleFree);
+    addAutoReleasedObject(new Qt4MaemoTargetFactory);
+    addAutoReleasedObject(new MaemoQtVersionFactory);
+
+    qRegisterMetaType<MaemoDeployable>("MaemoDeployable");
+
+    return true;
+}
+
+void RemoteLinuxPlugin::extensionsInitialized()
+{
+}
+
+} // namespace Internal
+} // namespace RemoteLinux
+
+Q_EXPORT_PLUGIN(RemoteLinux::Internal::RemoteLinuxPlugin)
diff --git a/src/plugins/remotelinux/remotelinuxplugin.h b/src/plugins/remotelinux/remotelinuxplugin.h
new file mode 100644
index 0000000000000000000000000000000000000000..6acd2e52fa244e6c17e8ea29221cfd679a3ba783
--- /dev/null
+++ b/src/plugins/remotelinux/remotelinuxplugin.h
@@ -0,0 +1,55 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef REMOTELINUXPLUGIN_H
+#define REMOTELINUXPLUGIN_H
+
+#include <extensionsystem/iplugin.h>
+
+namespace RemoteLinux {
+namespace Internal {
+
+class RemoteLinuxPlugin : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+public:
+    RemoteLinuxPlugin();
+    ~RemoteLinuxPlugin();
+
+    bool initialize(const QStringList &arguments, QString *error_message);
+    void extensionsInitialized();
+};
+
+} // namespace Internal
+} // namespace RemoteLinux
+
+#endif // REMOTELINUXPLUGIN_H