-
-namespace Core
-{
-
-MainWindow::MainWindow(ExtensionSystem::IPluginManager *pluginManager, QWidget *parent)
- : QMainWindow(parent),
- m_pluginManager(0),
- m_menuManager(0),
- m_contextManager(0),
- m_coreImpl(0),
- m_lastDir("."),
- m_undoGroup(0),
- m_settings(0)
-{
- QCoreApplication::setApplicationName(QLatin1String("ObjectViewerQt"));
- QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::OVQT_VERSION_LONG));
- QCoreApplication::setOrganizationName(QLatin1String("RyzomCore"));
-
- setObjectName(Constants::MAIN_WINDOW);
- setWindowIcon(QIcon(Constants::ICON_PILL));
- setWindowTitle(tr("Object Viewer Qt"));
-
- m_pluginManager = pluginManager;
- m_settings = m_pluginManager->settings();
- m_coreImpl = new CoreImpl(this);
-
-#ifdef Q_WS_MAC
- m_menuBar = new QMenuBar(0);
-#else
- m_menuBar = new QMenuBar(this);
- setMenuBar(m_menuBar);
-#endif
-
- m_menuManager = new MenuManager(m_menuBar, this);
-
- m_tabWidget = new QTabWidget(this);
- m_tabWidget->setTabPosition(QTabWidget::South);
- m_tabWidget->setMovable(false);
- m_tabWidget->setDocumentMode(true);
- setCentralWidget(m_tabWidget);
-
- m_contextManager = new ContextManager(this, m_tabWidget);
-
- setDockNestingEnabled(true);
- m_originalPalette = QApplication::palette();
- m_undoGroup = new QUndoGroup(this);
-
- createDialogs();
- createActions();
- createMenus();
- createStatusBar();
- resize(1024, 768);
-}
-
-MainWindow::~MainWindow()
-{
- m_pluginManager->removeObject(m_coreImpl);
- m_pluginManager->removeObject(m_menuManager);
-
- delete m_coreImpl;
- m_coreImpl = 0;
-}
-
-bool MainWindow::initialize(QString *errorString)
-{
- Q_UNUSED(errorString);
- m_pluginManager->addObject(m_coreImpl);
- m_pluginManager->addObject(m_menuManager);
- return true;
-}
-
-void MainWindow::extensionsInitialized()
-{
- readSettings();
- connect(m_contextManager, SIGNAL(currentContextChanged(Core::IContext *)),
- this, SLOT(updateContext(Core::IContext *)));
- if (m_contextManager->currentContext() != NULL)
- updateContext(m_contextManager->currentContext());
- show();
-}
-
-MenuManager *MainWindow::menuManager() const
-{
- return m_menuManager;
-}
-
-ContextManager *MainWindow::contextManager() const
-{
- return m_contextManager;
-}
-
-QSettings *MainWindow::settings() const
-{
- return m_settings;
-}
-
-QUndoGroup *MainWindow::undoGroup() const
-{
- return m_undoGroup;
-}
-
-ExtensionSystem::IPluginManager *MainWindow::pluginManager() const
-{
- return m_pluginManager;
-}
-
-void MainWindow::addContextObject(IContext *context)
-{
- QUndoStack *stack = context->undoStack();
- if (stack)
- m_undoGroup->addStack(stack);
-}
-
-void MainWindow::removeContextObject(IContext *context)
-{
- QUndoStack *stack = context->undoStack();
- if (stack)
- m_undoGroup->removeStack(stack);
-}
-
-void MainWindow::open()
-{
- m_contextManager->currentContext()->open();
-}
-
-void MainWindow::newFile()
-{
- m_contextManager->currentContext()->newDocument();
-}
-
-void MainWindow::save()
-{
- m_contextManager->currentContext()->save();
-}
-
-void MainWindow::saveAs()
-{
- m_contextManager->currentContext()->saveAs();
-}
-
-void MainWindow::saveAll()
-{
-}
-
-void MainWindow::closeDocument()
-{
- m_contextManager->currentContext()->close();
-}
-
-
-void MainWindow::cut()
-{
-}
-
-void MainWindow::copy()
-{
-}
-
-void MainWindow::paste()
-{
-}
-
-void MainWindow::del()
-{
-}
-
-void MainWindow::find()
-{
-}
-
-void MainWindow::gotoPos()
-{
-}
-
-void MainWindow::setFullScreen(bool enabled)
-{
- if (bool(windowState() & Qt::WindowFullScreen) == enabled)
- return;
- if (enabled)
- setWindowState(windowState() | Qt::WindowFullScreen);
- else
- setWindowState(windowState() & ~Qt::WindowFullScreen);
-}
-
-bool MainWindow::showOptionsDialog(const QString &group,
- const QString &page,
- QWidget *parent)
-{
- if (!parent)
- parent = this;
- SettingsDialog settingsDialog(m_pluginManager, group, page, parent);
- settingsDialog.show();
- bool ok = settingsDialog.execDialog();
- if (ok)
- Q_EMIT m_coreImpl->changeSettings();
- return ok;
-}
-
-void MainWindow::about()
-{
- QMessageBox::about(this, tr("About Object Viewer Qt"),
- tr("Object Viewer Qt
"
- " Ryzom Core team
Compiled on %1 %2").arg(__DATE__).arg(__TIME__));
-}
-
-void MainWindow::updateContext(Core::IContext *context)
-{
- m_undoGroup->setActiveStack(context->undoStack());
-}
-
-void MainWindow::closeEvent(QCloseEvent *event)
-{
- QList listeners = m_pluginManager->getObjects();
- Q_FOREACH(ICoreListener *listener, listeners)
- {
- if (!listener->closeMainWindow())
- {
- event->ignore();
- return;
- }
- }
- Q_EMIT m_coreImpl->closeMainWindow();
-
- writeSettings();
- event->accept();
-}
-
-void MainWindow::createActions()
-{
- m_newAction = new QAction(tr("&New"), this);
- m_newAction->setIcon(QIcon(Constants::ICON_NEW));
- m_newAction->setShortcut(QKeySequence::New);
- menuManager()->registerAction(m_newAction, Constants::NEW);
- connect(m_newAction, SIGNAL(triggered()), this, SLOT(newFile()));
- m_newAction->setEnabled(false);
-
- m_openAction = new QAction(tr("&Open..."), this);
- m_openAction->setIcon(QIcon(Constants::ICON_OPEN));
- m_openAction->setShortcut(QKeySequence::Open);
- m_openAction->setStatusTip(tr("Open an existing file"));
- menuManager()->registerAction(m_openAction, Constants::OPEN);
- connect(m_openAction, SIGNAL(triggered()), this, SLOT(open()));
-
- m_saveAction = new QAction(tr("&Save"), this);
- m_saveAction->setIcon(QIcon(Constants::ICON_SAVE));
- m_saveAction->setShortcut(QKeySequence::Save);
- menuManager()->registerAction(m_saveAction, Constants::SAVE);
- connect(m_saveAction, SIGNAL(triggered()), this, SLOT(save()));
- m_saveAction->setEnabled(false);
-
- m_saveAsAction = new QAction(tr("Save &As..."), this);
- m_saveAsAction->setIcon(QIcon(Constants::ICON_SAVE_AS));
- m_saveAsAction->setShortcut(QKeySequence::SaveAs);
- menuManager()->registerAction(m_saveAsAction, Constants::SAVE_AS);
- connect(m_saveAsAction, SIGNAL(triggered()), this, SLOT(saveAs()));
- m_saveAsAction->setEnabled(false);
-
- m_saveAllAction = new QAction(tr("&Save A&ll"), this);
- m_saveAllAction->setShortcut(QKeySequence::SelectAll);
- menuManager()->registerAction(m_saveAllAction, Constants::SAVE_ALL);
- connect(m_saveAllAction, SIGNAL(triggered()), this, SLOT(saveAll()));
- m_saveAllAction->setEnabled(false);
-
- m_closeAction = new QAction(tr("Close"), this);
- m_closeAction->setShortcut(QKeySequence::Close);
- menuManager()->registerAction(m_closeAction, Constants::CLOSE);
- connect(m_closeAction, SIGNAL(triggered()), this, SLOT(closeDocument()));
- m_closeAction->setEnabled(false);
-
- m_exitAction = new QAction(tr("E&xit"), this);
- m_exitAction->setShortcut(QKeySequence(tr("Ctrl+Q")));
- m_exitAction->setStatusTip(tr("Exit the application"));
- menuManager()->registerAction(m_exitAction, Constants::EXIT);
- connect(m_exitAction, SIGNAL(triggered()), this, SLOT(close()));
-
- m_cutAction = new QAction(tr("Cu&t"), this);
- m_cutAction->setShortcut(QKeySequence::Cut);
- menuManager()->registerAction(m_cutAction, Constants::CUT);
- connect(m_cutAction, SIGNAL(triggered()), this, SLOT(cut()));
- m_cutAction->setEnabled(false);
-
- m_copyAction = new QAction(tr("&Copy"), this);
- m_copyAction->setShortcut(QKeySequence::Copy);
- menuManager()->registerAction(m_copyAction, Constants::COPY);
- connect(m_copyAction, SIGNAL(triggered()), this, SLOT(copy()));
- m_copyAction->setEnabled(false);
-
- m_pasteAction = new QAction(tr("&Paste"), this);
- m_pasteAction->setShortcut(QKeySequence::Paste);
- menuManager()->registerAction(m_pasteAction, Constants::PASTE);
- connect(m_pasteAction, SIGNAL(triggered()), this, SLOT(paste()));
- m_pasteAction->setEnabled(false);
-
- m_delAction = new QAction(tr("&Delete"), this);
- m_delAction->setShortcut(QKeySequence::Delete);
- menuManager()->registerAction(m_delAction, Constants::DEL);
- connect(m_delAction, SIGNAL(triggered()), this, SLOT(del()));
- m_delAction->setEnabled(false);
-
- m_selectAllAction = new QAction(tr("Select &All"), this);
- m_selectAllAction->setShortcut(QKeySequence::SelectAll);
- menuManager()->registerAction(m_selectAllAction, Constants::SELECT_ALL);
- connect(m_selectAllAction, SIGNAL(triggered()), this, SLOT(selectAll()));
- m_selectAllAction->setEnabled(false);
-
- m_findAction = new QAction(tr("&Find"), this);
- m_findAction->setShortcut(QKeySequence::Find);
- menuManager()->registerAction(m_findAction, Constants::FIND);
- connect(m_findAction, SIGNAL(triggered()), this, SLOT(find()));
- m_findAction->setEnabled(false);
-
- m_gotoAction = new QAction(tr("&Go To.."), this);
- m_gotoAction->setShortcut(QKeySequence(tr("Ctrl+G")));
- menuManager()->registerAction(m_gotoAction, Constants::GOTO_POS);
- connect(m_gotoAction, SIGNAL(triggered()), this, SLOT(gotoPos()));
- m_gotoAction->setEnabled(false);
-
- m_fullscreenAction = new QAction(tr("Fullscreen"), this);
- m_fullscreenAction->setCheckable(true);
- m_fullscreenAction->setShortcut(QKeySequence(tr("Ctrl+Shift+F11")));
- menuManager()->registerAction(m_fullscreenAction, Constants::TOGGLE_FULLSCREEN);
- connect(m_fullscreenAction, SIGNAL(triggered(bool)), this, SLOT(setFullScreen(bool)));
-
- m_settingsAction = new QAction(tr("&Settings"), this);
- m_settingsAction->setIcon(QIcon(":/images/preferences.png"));
- m_settingsAction->setShortcut(QKeySequence::Preferences);
- m_settingsAction->setStatusTip(tr("Open the settings dialog"));
- menuManager()->registerAction(m_settingsAction, Constants::SETTINGS);
- connect(m_settingsAction, SIGNAL(triggered()), this, SLOT(showOptionsDialog()));
-
- m_aboutAction = new QAction(tr("&About"), this);
- m_aboutAction->setStatusTip(tr("Show the application's About box"));
- menuManager()->registerAction(m_aboutAction, Constants::ABOUT);
- connect(m_aboutAction, SIGNAL(triggered()), this, SLOT(about()));
-
- m_aboutQtAction = new QAction(tr("About &Qt"), this);
- m_aboutQtAction->setStatusTip(tr("Show the Qt library's About box"));
- menuManager()->registerAction(m_aboutQtAction, Constants::ABOUT_QT);
- connect(m_aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
-
- m_pluginViewAction = new QAction(tr("About &Plugins"), this);
- m_pluginViewAction->setStatusTip(tr("Show the plugin view dialog"));
- menuManager()->registerAction(m_pluginViewAction, Constants::ABOUT_PLUGINS);
- connect(m_pluginViewAction, SIGNAL(triggered()), m_pluginView, SLOT(show()));
-
-#ifdef Q_WS_MAC
- m_exitAction->setMenuRole(QAction::QuitRole);
- m_settingsAction->setMenuRole(QAction::PreferencesRole);
- m_aboutAction->setMenuRole(QAction::AboutRole);
- m_aboutQtAction->setMenuRole(QAction::AboutQtRole);
- m_pluginViewAction->setMenuRole(QAction::ApplicationSpecificRole);
-#endif
-}
-
-void MainWindow::createMenus()
-{
- m_fileMenu = m_menuBar->addMenu(tr("&File"));
- menuManager()->registerMenu(m_fileMenu, Constants::M_FILE);
- m_fileMenu->addAction(m_newAction);
- m_fileMenu->addAction(m_openAction);
- m_fileMenu->addSeparator();
- m_fileMenu->addAction(m_saveAction);
- m_fileMenu->addAction(m_saveAsAction);
- m_fileMenu->addAction(m_saveAllAction);
- m_fileMenu->addAction(m_closeAction);
- m_fileMenu->addSeparator();
-
- m_recentFilesMenu = m_fileMenu->addMenu(tr("Recent &Files"));
- m_recentFilesMenu->setEnabled(false);
- menuManager()->registerMenu(m_recentFilesMenu, Constants::M_FILE_RECENTFILES);
-
- m_fileMenu->addSeparator();
- m_fileMenu->addAction(m_exitAction);
-
- m_editMenu = m_menuBar->addMenu(tr("&Edit"));
- QAction *undoAction = m_undoGroup->createUndoAction(this);
- menuManager()->registerAction(undoAction, Constants::UNDO);
- undoAction->setIcon(QIcon(Constants::ICON_UNDO));
- undoAction->setShortcut(QKeySequence::Undo);
- QAction *redoAction = m_undoGroup->createRedoAction(this);
- menuManager()->registerAction(redoAction, Constants::REDO);
- redoAction->setIcon(QIcon(Constants::ICON_REDO));
- redoAction->setShortcut(QKeySequence::Redo);
- m_editMenu->addAction(undoAction);
- m_editMenu->addAction(redoAction);
-
- m_editMenu->addSeparator();
- m_editMenu->addAction(m_cutAction);
- m_editMenu->addAction(m_copyAction);
- m_editMenu->addAction(m_pasteAction);
- m_editMenu->addAction(m_delAction);
- m_editMenu->addSeparator();
- m_editMenu->addAction(m_selectAllAction);
- m_editMenu->addSeparator();
- m_editMenu->addAction(m_findAction);
- m_editMenu->addAction(m_gotoAction);
- menuManager()->registerMenu(m_editMenu, Constants::M_EDIT);
-
- m_viewMenu = m_menuBar->addMenu(tr("&View"));
- m_viewMenu->addAction(m_fullscreenAction);
- m_viewMenu->addAction(m_dockWidget->toggleViewAction());
- menuManager()->registerMenu(m_viewMenu, Constants::M_VIEW);
-
- m_toolsMenu = m_menuBar->addMenu(tr("&Tools"));
- menuManager()->registerMenu(m_toolsMenu, Constants::M_TOOLS);
-
- m_sheetMenu = m_toolsMenu->addMenu(tr("&Sheet"));
- menuManager()->registerMenu(m_sheetMenu, Constants::M_SHEET);
-
-// m_toolsMenu->addSeparator();
-
- m_toolsMenu->addAction(m_settingsAction);
-
- m_menuBar->addSeparator();
-
- m_helpMenu = m_menuBar->addMenu(tr("&Help"));
- menuManager()->registerMenu(m_helpMenu, Constants::M_HELP);
- m_helpMenu->addAction(m_aboutAction);
- m_helpMenu->addAction(m_aboutQtAction);
- m_helpMenu->addAction(m_pluginViewAction);
-}
-
-void MainWindow::createStatusBar()
-{
- statusBar()->showMessage(tr("StatusReady"));
-}
-
-void MainWindow::createDialogs()
-{
- m_pluginView = new PluginView(m_pluginManager, this);
-
- // Create undo/redo command list
- m_dockWidget = new QDockWidget("Command List", this);
- m_dockWidget->setObjectName(QString::fromUtf8("UndoRedoCommandDockWidget"));
- QUndoView *undoView = new QUndoView(m_undoGroup, m_dockWidget);
- m_dockWidget->setWidget(undoView);
- addDockWidget(Qt::RightDockWidgetArea, m_dockWidget);
-}
-
-void MainWindow::readSettings()
-{
- m_settings->beginGroup(Constants::MAIN_WINDOW_SECTION);
- restoreState(m_settings->value(Constants::MAIN_WINDOW_STATE).toByteArray());
- restoreGeometry(m_settings->value(Constants::MAIN_WINDOW_GEOMETRY).toByteArray());
- m_settings->endGroup();
-}
-
-void MainWindow::writeSettings()
-{
- m_settings->beginGroup(Constants::MAIN_WINDOW_SECTION);
- m_settings->setValue(Constants::MAIN_WINDOW_STATE, saveState());
- m_settings->setValue(Constants::MAIN_WINDOW_GEOMETRY, saveGeometry());
- m_settings->endGroup();
-}
-
-} /* namespace Core */
-
-/* end of file */
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h
deleted file mode 100644
index d258a5eba..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h
+++ /dev/null
@@ -1,147 +0,0 @@
-// Object Viewer Qt - MMORPG Framework
-// Copyright (C) 2010 Winch Gate Property Limited
-// Copyright (C) 2011 Dzmitry Kamiahin
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-#ifndef MAIN_WINDOW_H
-#define MAIN_WINDOW_H
-
-// Project includes
-#include "../../extension_system/iplugin_manager.h"
-#include "plugin_view_dialog.h"
-
-// STL includes
-
-// Qt includes
-#include
-#include
-#include
-
-namespace Core
-{
-class CSettingsDialog;
-class CorePlugin;
-class IContext;
-class MenuManager;
-class ContextManager;
-class CoreImpl;
-
-class MainWindow : public QMainWindow
-{
- Q_OBJECT
-
-public:
- MainWindow(ExtensionSystem::IPluginManager *pluginManager, QWidget *parent = 0);
- ~MainWindow();
-
- bool initialize(QString *errorString);
- void extensionsInitialized();
-
- MenuManager *menuManager() const;
- ContextManager *contextManager() const;
- QSettings *settings() const;
- QUndoGroup *undoGroup() const;
-
- ExtensionSystem::IPluginManager *pluginManager() const;
-
- void addContextObject(IContext *context);
- void removeContextObject(IContext *context);
-
-public Q_SLOTS:
- bool showOptionsDialog(const QString &group = QString(),
- const QString &page = QString(),
- QWidget *parent = 0);
- void updateContext(Core::IContext *context);
-
-private Q_SLOTS:
- void open();
- void newFile();
- void save();
- void saveAs();
- void saveAll();
- void closeDocument();
- void cut();
- void copy();
- void paste();
- void del();
- void find();
- void gotoPos();
- void setFullScreen(bool enabled);
- void about();
-
-protected:
- virtual void closeEvent(QCloseEvent *event);
-
-private:
- void createActions();
- void createMenus();
- void createStatusBar();
- void createDialogs();
-
- void readSettings();
- void writeSettings();
-
- ExtensionSystem::IPluginManager *m_pluginManager;
- PluginView *m_pluginView;
- MenuManager *m_menuManager;
- ContextManager *m_contextManager;
- CoreImpl *m_coreImpl;
-
- QPalette m_originalPalette;
- QString m_lastDir;
-
- QDockWidget *m_dockWidget;
- QUndoGroup *m_undoGroup;
- QSettings *m_settings;
-
- QTimer *m_mainTimer;
- QTimer *m_statusBarTimer;
-
- QTabWidget *m_tabWidget;
-
- QMenu *m_fileMenu;
- QMenu *m_recentFilesMenu;
- QMenu *m_editMenu;
- QMenu *m_viewMenu;
- QMenu *m_toolsMenu;
- QMenu *m_helpMenu;
- QMenuBar *m_menuBar;
- QMenu *m_sheetMenu;
-
- QAction *m_newAction;
- QAction *m_openAction;
- QAction *m_saveAction;
- QAction *m_saveAsAction;
- QAction *m_saveAllAction;
- QAction *m_closeAction;
- QAction *m_exitAction;
- QAction *m_cutAction;
- QAction *m_copyAction;
- QAction *m_pasteAction;
- QAction *m_delAction;
- QAction *m_selectAllAction;
- QAction *m_findAction;
- QAction *m_gotoAction;
- QAction *m_fullscreenAction;
- QAction *m_settingsAction;
- QAction *m_pluginViewAction;
- QAction *m_aboutAction;
- QAction *m_aboutQtAction;
-
-};/* class MainWindow */
-
-} /* namespace Core */
-
-#endif // MAIN_WINDOW_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/menu_manager.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/menu_manager.cpp
deleted file mode 100644
index 3e6272f0a..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/menu_manager.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// Object Viewer Qt - MMORPG Framework
-// Copyright (C) 2010 Winch Gate Property Limited
-// Copyright (C) 2011 Dzmitry Kamiahin
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-// Project includes
-#include "menu_manager.h"
-
-// NeL includes
-#include
-
-namespace Core
-{
-struct MenuManagerPrivate
-{
- MenuManagerPrivate(): m_menuBar(0) {}
- QMenuBar *m_menuBar;
- typedef QHash IdMenuMap;
- IdMenuMap m_menuMap;
- typedef QHash IdActionMap;
- IdActionMap m_actionMap;
-};
-
-MenuManager::MenuManager(QMenuBar *menuBar, QObject *parent)
- : QObject(parent),
- d(new MenuManagerPrivate())
-{
- d->m_menuBar = menuBar;
-}
-
-MenuManager::~MenuManager()
-{
- d->m_menuMap.clear();
- delete d;
-}
-
-void MenuManager::registerMenu(QMenu *menu, const QString &id)
-{
- menu->setObjectName(id);
- d->m_menuMap.insert(id, menu);
-}
-
-void MenuManager::registerAction(QAction *action, const QString &id)
-{
- action->setObjectName(id);
- d->m_actionMap.insert(id, action);
-}
-
-QMenu *MenuManager::menu(const QString &id) const
-{
- QMenu *result = 0;
- if (!d->m_menuMap.contains(id))
- nlwarning("QMenu %s not found", id.toUtf8().constData());
- else
- result = d->m_menuMap.value(id);
- return result;
-}
-
-QAction *MenuManager::action(const QString &id) const
-{
- QAction *result = 0;
- if (!d->m_actionMap.contains(id))
- nlwarning("QAction %s not found", id.toUtf8().constData());
- else
- result = d->m_actionMap.value(id);
- return result;
-}
-
-void MenuManager::unregisterMenu(const QString &id)
-{
- d->m_menuMap.remove(id);
-}
-
-void MenuManager::unregisterAction(const QString &id)
-{
- d->m_actionMap.remove(id);
-}
-
-QMenuBar *MenuManager::menuBar() const
-{
- return d->m_menuBar;
-}
-
-} /* namespace Core */
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/menu_manager.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/menu_manager.h
deleted file mode 100644
index fd6af8f3a..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/menu_manager.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Object Viewer Qt - MMORPG Framework
-// Copyright (C) 2010 Winch Gate Property Limited
-// Copyright (C) 2011 Dzmitry Kamiahin
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-#ifndef MENU_MANAGER_H
-#define MENU_MANAGER_H
-
-// Project includes
-#include "core_global.h"
-
-// Qt includes
-#include
-#include
-#include
-#include
-#include
-#include
-
-namespace Core
-{
-struct MenuManagerPrivate;
-
-/*
-@interface MenuManager
-@brief The MenuManager provide the interface for registration of menus and menu item.
-@details The MenuManager provides centralized access to menus and menu items.
-All menus and menu items should be registered in the MenuManager.
-*/
-class CORE_EXPORT MenuManager: public QObject
-{
- Q_OBJECT
-
-public:
- MenuManager(QMenuBar *menuBar, QObject *parent = 0);
- virtual ~MenuManager();
-
- void registerMenu(QMenu *menu, const QString &id);
- void registerAction(QAction *action, const QString &id);
-
- QMenu *menu(const QString &id) const;
- QAction *action(const QString &id) const;
-
- void unregisterMenu(const QString &id);
- void unregisterAction(const QString &id);
-
- QMenuBar *menuBar() const;
-private:
-
- MenuManagerPrivate *d;
-};
-
-} // namespace Core
-
-#endif // MENU_MANAGER_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/ovqt_plugin_core.xml b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/ovqt_plugin_core.xml
deleted file mode 100644
index 2f5d6e9a8..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/ovqt_plugin_core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
- ovqt_plugin_core
- Core
- 0.8
- Ryzom Core
- Core plugin.
-
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.cpp
deleted file mode 100644
index 175902d39..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// Object Viewer Qt - MMORPG Framework
-// Copyright (C) 2010 Winch Gate Property Limited
-// Copyright (C) 2011 Dzmitry Kamiahin
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-#include "plugin_view_dialog.h"
-#include "core_constants.h"
-
-#include "nel/misc/debug.h"
-
-// Qt includes
-#include
-#include
-#include
-#include
-
-// Project includes
-#include "../../extension_system/iplugin_spec.h"
-#include "../../extension_system/iplugin_manager.h"
-
-namespace Core
-{
-
-PluginView::PluginView(ExtensionSystem::IPluginManager *pluginManager, QWidget *parent)
- : QDialog(parent),
- m_checkStateColumn(0)
-{
- m_ui.setupUi(this);
- m_pluginManager = pluginManager;
-
- connect(m_pluginManager, SIGNAL(pluginsChanged()), this, SLOT(updateList()));
- connect(this, SIGNAL(accepted()), this, SLOT(updateSettings()));
-
- // WhiteList is list of plugins which can not disable.
- m_whiteList << Constants::OVQT_CORE_PLUGIN;
- updateList();
-}
-
-PluginView::~PluginView()
-{
-}
-
-void PluginView::updateList()
-{
- static QIcon okIcon = QApplication::style()->standardIcon(QStyle::SP_DialogApplyButton);
- static QIcon errorIcon = QApplication::style()->standardIcon(QStyle::SP_DialogCancelButton);
- static QIcon notLoadedIcon = QApplication::style()->standardIcon(QStyle::SP_DialogResetButton);
-
- m_specToItem.clear();
-
- QList items;
- Q_FOREACH (ExtensionSystem::IPluginSpec *spec, m_pluginManager->plugins())
- {
- QTreeWidgetItem *item = new QTreeWidgetItem(QStringList()
- << spec->name()
- << QString("%1").arg(spec->version())
- << spec->vendor()
- << QDir::toNativeSeparators(spec->filePath()));
-
- bool ok = !spec->hasError();
- QIcon icon = ok ? okIcon : errorIcon;
- if (ok && (spec->state() != ExtensionSystem::State::Running))
- icon = notLoadedIcon;
-
- item->setIcon(m_checkStateColumn, icon);
-
- if (!m_whiteList.contains(spec->name()))
- item->setCheckState(m_checkStateColumn, spec->isEnabled() ? Qt::Checked : Qt::Unchecked);
-
- items.append(item);
- m_specToItem.insert(spec, item);
- }
-
- m_ui.pluginTreeWidget->clear();
- if (!items.isEmpty())
- m_ui.pluginTreeWidget->addTopLevelItems(items);
-
- m_ui.pluginTreeWidget->resizeColumnToContents(m_checkStateColumn);
-}
-
-void PluginView::updateSettings()
-{
- Q_FOREACH (ExtensionSystem::IPluginSpec *spec, m_pluginManager->plugins())
- {
- if (m_specToItem.contains(spec) && (!m_whiteList.contains(spec->name())))
- {
- QTreeWidgetItem *item = m_specToItem.value(spec);
- if (item->checkState(m_checkStateColumn) == Qt::Checked)
- spec->setEnabled(true);
- else
- spec->setEnabled(false);
- }
- }
-}
-
-} /* namespace Core */
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.h
deleted file mode 100644
index aae16749d..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Object Viewer Qt - MMORPG Framework
-// Copyright (C) 2010 Winch Gate Property Limited
-// Copyright (C) 2011 Dzmitry Kamiahin
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-#ifndef PLUGIN_VIEW_H
-#define PLUGIN_VIEW_H
-
-#include "ui_plugin_view_dialog.h"
-
-#include
-#include
-
-namespace ExtensionSystem
-{
-class IPluginManager;
-class IPluginSpec;
-}
-
-namespace Core
-{
-
-class PluginView: public QDialog
-{
- Q_OBJECT
-
-public:
- PluginView(ExtensionSystem::IPluginManager *pluginManager, QWidget *parent = 0);
- ~PluginView();
-
-private Q_SLOTS:
- void updateList();
- void updateSettings();
-
-private:
-
- const int m_checkStateColumn;
- QMap m_specToItem;
- QStringList m_whiteList;
- ExtensionSystem::IPluginManager *m_pluginManager;
- Ui::PluginView m_ui;
-}; /* class PluginView */
-
-} /* namespace Core */
-
-#endif // PLUGIN_VIEW_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.ui
deleted file mode 100644
index 9d7d395be..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/plugin_view_dialog.ui
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
- PluginView
-
-
-
- 0
- 0
- 756
- 296
-
-
-
- About plugins
-
-
- true
-
-
- -
-
-
- true
-
-
- 0
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
-
- Name
-
-
-
-
- Version
-
-
-
-
- Vendor
-
-
-
-
- Location
-
-
-
-
- -
-
-
- false
-
-
- Details
-
-
-
- -
-
-
- false
-
-
- Error details
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 427
- 20
-
-
-
-
- -
-
-
- Close
-
-
-
- -
-
-
- false
-
-
- All objects list
-
-
-
-
-
-
-
-
-
-
- closePushButton
- clicked()
- PluginView
- accept()
-
-
- 620
- 232
-
-
- 507
- 226
-
-
-
-
-
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/qtwin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/qtwin.cpp
deleted file mode 100644
index 115203ded..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/qtwin.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Use, modification and distribution is allowed without limitation,
-** warranty, liability or support of any kind.
-**
-****************************************************************************/
-
-#include "qtwin.h"
-#include
-#include
-#include
-#include
-#include
-
-#ifdef Q_WS_WIN
-
-#include
-
-// Blur behind data structures
-#define DWM_BB_ENABLE 0x00000001 // fEnable has been specified
-#define DWM_BB_BLURREGION 0x00000002 // hRgnBlur has been specified
-#define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 // fTransitionOnMaximized has been specified
-#define WM_DWMCOMPOSITIONCHANGED 0x031E // Composition changed window message
-
-typedef struct _DWM_BLURBEHIND
-{
- DWORD dwFlags;
- BOOL fEnable;
- HRGN hRgnBlur;
- BOOL fTransitionOnMaximized;
-} DWM_BLURBEHIND, *PDWM_BLURBEHIND;
-
-typedef struct _MARGINS
-{
- int cxLeftWidth;
- int cxRightWidth;
- int cyTopHeight;
- int cyBottomHeight;
-} MARGINS, *PMARGINS;
-
-typedef HRESULT (WINAPI *PtrDwmIsCompositionEnabled)(BOOL *pfEnabled);
-typedef HRESULT (WINAPI *PtrDwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS *pMarInset);
-typedef HRESULT (WINAPI *PtrDwmEnableBlurBehindWindow)(HWND hWnd, const DWM_BLURBEHIND *pBlurBehind);
-typedef HRESULT (WINAPI *PtrDwmGetColorizationColor)(DWORD *pcrColorization, BOOL *pfOpaqueBlend);
-
-static PtrDwmIsCompositionEnabled pDwmIsCompositionEnabled= 0;
-static PtrDwmEnableBlurBehindWindow pDwmEnableBlurBehindWindow = 0;
-static PtrDwmExtendFrameIntoClientArea pDwmExtendFrameIntoClientArea = 0;
-static PtrDwmGetColorizationColor pDwmGetColorizationColor = 0;
-
-
-/*
- * Internal helper class that notifies windows if the
- * DWM compositing state changes and updates the widget
- * flags correspondingly.
- */
-class WindowNotifier : public QWidget
-{
-public:
- WindowNotifier()
- {
- winId();
- }
- void addWidget(QWidget *widget)
- {
- widgets.append(widget);
- }
- void removeWidget(QWidget *widget)
- {
- widgets.removeAll(widget);
- }
- bool winEvent(MSG *message, long *result);
-
-private:
- QWidgetList widgets;
-};
-
-static bool resolveLibs()
-{
- if (!pDwmIsCompositionEnabled)
- {
- QLibrary dwmLib(QString::fromAscii("dwmapi"));
- pDwmIsCompositionEnabled =(PtrDwmIsCompositionEnabled)dwmLib.resolve("DwmIsCompositionEnabled");
- pDwmExtendFrameIntoClientArea = (PtrDwmExtendFrameIntoClientArea)dwmLib.resolve("DwmExtendFrameIntoClientArea");
- pDwmEnableBlurBehindWindow = (PtrDwmEnableBlurBehindWindow)dwmLib.resolve("DwmEnableBlurBehindWindow");
- pDwmGetColorizationColor = (PtrDwmGetColorizationColor)dwmLib.resolve("DwmGetColorizationColor");
- }
- return pDwmIsCompositionEnabled != 0;
-}
-
-#endif
-
-/*!
- * Chekcs and returns true if Windows DWM composition
- * is currently enabled on the system.
- *
- * To get live notification on the availability of
- * this feature, you will currently have to
- * reimplement winEvent() on your widget and listen
- * for the WM_DWMCOMPOSITIONCHANGED event to occur.
- *
- */
-bool QtWin::isCompositionEnabled()
-{
-#ifdef Q_WS_WIN
- if (resolveLibs())
- {
- HRESULT hr = S_OK;
- BOOL isEnabled = false;
- hr = pDwmIsCompositionEnabled(&isEnabled);
- if (SUCCEEDED(hr))
- return isEnabled;
- }
-#endif
- return false;
-}
-
-/*!
- * Enables Blur behind on a Widget.
- *
- * \a enable tells if the blur should be enabled or not
- */
-bool QtWin::enableBlurBehindWindow(QWidget *widget, bool enable)
-{
- Q_ASSERT(widget);
- bool result = false;
-#ifdef Q_WS_WIN
- if (resolveLibs())
- {
- DWM_BLURBEHIND bb = {0};
- HRESULT hr = S_OK;
- bb.fEnable = enable;
- bb.dwFlags = DWM_BB_ENABLE;
- bb.hRgnBlur = NULL;
- widget->setAttribute(Qt::WA_TranslucentBackground, enable);
- widget->setAttribute(Qt::WA_NoSystemBackground, enable);
- hr = pDwmEnableBlurBehindWindow(widget->winId(), &bb);
- if (SUCCEEDED(hr))
- {
- result = true;
- windowNotifier()->addWidget(widget);
- }
- }
-#endif
- return result;
-}
-
-/*!
- * ExtendFrameIntoClientArea.
- *
- * This controls the rendering of the frame inside the window.
- * Note that passing margins of -1 (the default value) will completely
- * remove the frame from the window.
- *
- * \note you should not call enableBlurBehindWindow before calling
- * this functions
- *
- * \a enable tells if the blur should be enabled or not
- */
-bool QtWin::extendFrameIntoClientArea(QWidget *widget, int left, int top, int right, int bottom)
-{
-
- Q_ASSERT(widget);
- Q_UNUSED(left);
- Q_UNUSED(top);
- Q_UNUSED(right);
- Q_UNUSED(bottom);
-
- bool result = false;
-#ifdef Q_WS_WIN
- if (resolveLibs())
- {
- QLibrary dwmLib(QString::fromAscii("dwmapi"));
- HRESULT hr = S_OK;
- MARGINS m = {left, top, right, bottom};
- hr = pDwmExtendFrameIntoClientArea(widget->winId(), &m);
- if (SUCCEEDED(hr))
- {
- result = true;
- windowNotifier()->addWidget(widget);
- }
- widget->setAttribute(Qt::WA_TranslucentBackground, result);
- }
-#endif
- return result;
-}
-
-/*!
- * Returns the current colorizationColor for the window.
- *
- * \a enable tells if the blur should be enabled or not
- */
-QColor QtWin::colorizatinColor()
-{
- QColor resultColor = QApplication::palette().window().color();
-
-#ifdef Q_WS_WIN
- if (resolveLibs())
- {
- DWORD color = 0;
- BOOL opaque = FALSE;
- QLibrary dwmLib(QString::fromAscii("dwmapi"));
- HRESULT hr = S_OK;
- hr = pDwmGetColorizationColor(&color, &opaque);
- if (SUCCEEDED(hr))
- resultColor = QColor(color);
- }
-#endif
- return resultColor;
-}
-
-#ifdef Q_WS_WIN
-WindowNotifier *QtWin::windowNotifier()
-{
- static WindowNotifier *windowNotifierInstance = 0;
- if (!windowNotifierInstance)
- windowNotifierInstance = new WindowNotifier;
- return windowNotifierInstance;
-}
-
-
-/* Notify all enabled windows that the DWM state changed */
-bool WindowNotifier::winEvent(MSG *message, long *result)
-{
- if (message && message->message == WM_DWMCOMPOSITIONCHANGED)
- {
- bool compositionEnabled = QtWin::isCompositionEnabled();
- Q_FOREACH(QWidget * widget, widgets)
- {
- if (widget)
- {
- widget->setAttribute(Qt::WA_NoSystemBackground, compositionEnabled);
- }
- widget->update();
- }
- }
- return QWidget::winEvent(message, result);
-}
-#endif
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/qtwin.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/qtwin.h
deleted file mode 100644
index 5692a34fb..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/qtwin.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Use, modification and distribution is allowed without limitation,
-** warranty, liability or support of any kind.
-**
-****************************************************************************/
-
-#ifndef QTWIN_H
-#define QTWIN_H
-
-#include
-#include
-/**
- * This is a helper class for using the Desktop Window Manager
- * functionality on Windows 7 and Windows Vista. On other platforms
- * these functions will simply not do anything.
- */
-
-class WindowNotifier;
-
-class QtWin
-{
-public:
- static bool enableBlurBehindWindow(QWidget *widget, bool enable = true);
- static bool extendFrameIntoClientArea(QWidget *widget,
- int left = -1, int top = -1,
- int right = -1, int bottom = -1);
- static bool isCompositionEnabled();
- static QColor colorizatinColor();
-
-private:
- static WindowNotifier *windowNotifier();
-};
-
-#endif // QTWIN_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.cpp
deleted file mode 100644
index e76d6c796..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-// Object Viewer Qt - MMORPG Framework
-// Copyright (C) 2010 Winch Gate Property Limited
-// Copyright (C) 2011 Dzmitry Kamiahin
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-// Project includes
-#include "search_paths_settings_page.h"
-#include "core_constants.h"
-#include "icore.h"
-
-// NeL includes
-#include
-
-// Qt includes
-#include
-#include
-#include
-
-namespace Core
-{
-
-QString lastDir = ".";
-
-SearchPathsSettingsPage::SearchPathsSettingsPage(bool recurse, QObject *parent)
- : IOptionsPage(parent),
- m_recurse(recurse),
- m_page(0)
-{
-}
-
-SearchPathsSettingsPage::~SearchPathsSettingsPage()
-{
-}
-
-QString SearchPathsSettingsPage::id() const
-{
- if (m_recurse)
- return QLatin1String("search_recurse_paths");
- else
- return QLatin1String("search_paths");
-}
-
-QString SearchPathsSettingsPage::trName() const
-{
- if (m_recurse)
- return tr("Search Recurse Paths");
- else
- return tr("Search Paths");
-}
-
-QString SearchPathsSettingsPage::category() const
-{
- return QLatin1String(Constants::SETTINGS_CATEGORY_GENERAL);
-}
-
-QString SearchPathsSettingsPage::trCategory() const
-{
- return tr(Constants::SETTINGS_TR_CATEGORY_GENERAL);
-}
-
-QIcon SearchPathsSettingsPage::categoryIcon() const
-{
- return QIcon();
-}
-
-QWidget *SearchPathsSettingsPage::createPage(QWidget *parent)
-{
- m_page = new QWidget(parent);
- m_ui.setupUi(m_page);
-
- readSettings();
- checkEnabledButton();
- connect(m_ui.addToolButton, SIGNAL(clicked()), this, SLOT(addPath()));
- connect(m_ui.removeToolButton, SIGNAL(clicked()), this, SLOT(delPath()));
- connect(m_ui.upToolButton, SIGNAL(clicked()), this, SLOT(upPath()));
- connect(m_ui.downToolButton, SIGNAL(clicked()), this, SLOT(downPath()));
- connect(m_ui.resetToolButton, SIGNAL(clicked()), m_ui.pathsListWidget, SLOT(clear()));
- return m_page;
-}
-
-void SearchPathsSettingsPage::apply()
-{
- writeSettings();
- applySearchPaths();
-}
-
-void SearchPathsSettingsPage::finish()
-{
- delete m_page;
- m_page = 0;
-}
-
-void SearchPathsSettingsPage::applySearchPaths()
-{
- QStringList paths, remapExt;
- QSettings *settings = Core::ICore::instance()->settings();
- settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
- if (m_recurse)
- paths = settings->value(Core::Constants::RECURSIVE_SEARCH_PATHS).toStringList();
- else
- paths = settings->value(Core::Constants::SEARCH_PATHS).toStringList();
-
- remapExt = settings->value(Core::Constants::REMAP_EXTENSIONS).toStringList();
- settings->endGroup();
-
- for (int i = 1; i < remapExt.size(); i += 2)
- NLMISC::CPath::remapExtension(remapExt.at(i - 1).toUtf8().constData(), remapExt.at(i).toUtf8().constData(), true);
-
- Q_FOREACH(QString path, paths)
- {
- NLMISC::CPath::addSearchPath(path.toUtf8().constData(), m_recurse, false);
- }
-}
-
-void SearchPathsSettingsPage::addPath()
-{
- QString newPath = QFileDialog::getExistingDirectory(m_page, "", lastDir);
- if (!newPath.isEmpty())
- {
- QListWidgetItem *newItem = new QListWidgetItem;
- newItem->setText(newPath);
- newItem->setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- m_ui.pathsListWidget->addItem(newItem);
- lastDir = newPath;
- }
-
- checkEnabledButton();
-}
-
-void SearchPathsSettingsPage::delPath()
-{
- QListWidgetItem *removeItem = m_ui.pathsListWidget->takeItem(m_ui.pathsListWidget->currentRow());
- if (!removeItem)
- delete removeItem;
-
- checkEnabledButton();
-}
-
-void SearchPathsSettingsPage::upPath()
-{
- int currentRow = m_ui.pathsListWidget->currentRow();
- if (!(currentRow == 0))
- {
- QListWidgetItem *item = m_ui.pathsListWidget->takeItem(currentRow);
- m_ui.pathsListWidget->insertItem(--currentRow, item);
- m_ui.pathsListWidget->setCurrentRow(currentRow);
- }
-}
-
-void SearchPathsSettingsPage::downPath()
-{
- int currentRow = m_ui.pathsListWidget->currentRow();
- if (!(currentRow == m_ui.pathsListWidget->count()-1))
- {
- QListWidgetItem *item = m_ui.pathsListWidget->takeItem(currentRow);
- m_ui.pathsListWidget->insertItem(++currentRow, item);
- m_ui.pathsListWidget->setCurrentRow(currentRow);
- }
-}
-
-void SearchPathsSettingsPage::readSettings()
-{
- QStringList paths;
- QSettings *settings = Core::ICore::instance()->settings();
- settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
- if (m_recurse)
- paths = settings->value(Core::Constants::RECURSIVE_SEARCH_PATHS).toStringList();
- else
- paths = settings->value(Core::Constants::SEARCH_PATHS).toStringList();
- settings->endGroup();
- Q_FOREACH(QString path, paths)
- {
- QListWidgetItem *newItem = new QListWidgetItem;
- newItem->setText(path);
- newItem->setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- m_ui.pathsListWidget->addItem(newItem);
- }
-}
-
-void SearchPathsSettingsPage::writeSettings()
-{
- QStringList paths;
- for (int i = 0; i < m_ui.pathsListWidget->count(); ++i)
- paths << m_ui.pathsListWidget->item(i)->text();
-
- QSettings *settings = Core::ICore::instance()->settings();
- settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
- if (m_recurse)
- settings->setValue(Core::Constants::RECURSIVE_SEARCH_PATHS, paths);
- else
- settings->setValue(Core::Constants::SEARCH_PATHS, paths);
- settings->endGroup();
- settings->sync();
-}
-
-void SearchPathsSettingsPage::checkEnabledButton()
-{
- bool bEnabled = true;
- if (m_ui.pathsListWidget->count() == 0)
- bEnabled = false;
-
- m_ui.removeToolButton->setEnabled(bEnabled);
- m_ui.upToolButton->setEnabled(bEnabled);
- m_ui.downToolButton->setEnabled(bEnabled);
-}
-
-} /* namespace Core */
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.h
deleted file mode 100644
index c45b29571..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Object Viewer Qt - MMORPG Framework
-// Copyright (C) 2010 Winch Gate Property Limited
-// Copyright (C) 2011 Dzmitry Kamiahin
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-
-#ifndef SEARCH_PATHS_SETTINGS_PAGE_H
-#define SEARCH_PATHS_SETTINGS_PAGE_H
-
-#include
-
-#include "ioptions_page.h"
-
-#include "ui_search_paths_settings_page.h"
-
-class QWidget;
-
-namespace Core
-{
-/**
-@class SearchPathsSettingsPage
-*/
-class SearchPathsSettingsPage : public Core::IOptionsPage
-{
- Q_OBJECT
-
-public:
- explicit SearchPathsSettingsPage(bool recurse, QObject *parent = 0);
- ~SearchPathsSettingsPage();
-
- QString id() const;
- QString trName() const;
- QString category() const;
- QString trCategory() const;
- QIcon categoryIcon() const;
- QWidget *createPage(QWidget *parent);
-
- void apply();
- void finish();
-
- // Set of the search paths(not recursive) and the remap extensions (loading from settings file)
- void applySearchPaths();
-
-private Q_SLOTS:
- void addPath();
- void delPath();
- void upPath();
- void downPath();
-
-private:
- void readSettings();
- void writeSettings();
- void checkEnabledButton();
-
- bool m_recurse;
- QWidget *m_page;
- Ui::SearchPathsSettingsPage m_ui;
-};
-
-} // namespace Core
-
-#endif // SEARCH_PATHS_SETTINGS_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.ui
deleted file mode 100644
index cf47314b8..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.ui
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
- SearchPathsSettingsPage
-
-
-
- 0
- 0
- 431
- 285
-
-
-
- Form
-
-
-
- 6
-
-
- 3
-
- -
-
-
- Search paths
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 228
- 20
-
-
-
-
- -
-
-
- 3
-
-
-
-
-
-
- 0
- 0
-
-
-
- Add
-
-
-
-
-
-
- :/core/icons/ic_nel_add_item.png:/core/icons/ic_nel_add_item.png
-
-
-
- 20
- 20
-
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Delete
-
-
-
-
-
-
- :/core/icons/ic_nel_delete_item.png:/core/icons/ic_nel_delete_item.png
-
-
-
- 20
- 20
-
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Up
-
-
-
-
-
-
- :/core/icons/ic_nel_up_item.png:/core/icons/ic_nel_up_item.png
-
-
-
- 20
- 20
-
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Down
-
-
-
-
-
-
- :/core/icons/ic_nel_down_item.png:/core/icons/ic_nel_down_item.png
-
-
-
- 20
- 20
-
-
-
- true
-
-
-
- -
-
-
- Reset
-
-
-
-
-
-
- :/core/icons/ic_nel_reset_all.png:/core/icons/ic_nel_reset_all.png
-
-
-
- 20
- 20
-
-
-
- true
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.cpp
deleted file mode 100644
index 4b7bbac3a..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-// Object Viewer Qt - MMORPG Framework
-// Copyright (C) 2010 Winch Gate Property Limited
-// Copyright (C) 2011 Dzmitry Kamiahin
-// Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-// Project includes
-#include "settings_dialog.h"
-#include "ioptions_page.h"
-
-// Qt includes
-#include
-#include
-
-struct PageData
-{
- int index;
- QString category;
- QString id;
-};
-
-Q_DECLARE_METATYPE(PageData);
-
-namespace Core
-{
-SettingsDialog::SettingsDialog(ExtensionSystem::IPluginManager *pluginManager,
- const QString &categoryId,
- const QString &pageId,
- QWidget *parent)
- : QDialog(parent),
- m_applied(false)
-{
- m_ui.setupUi(this);
-
- m_plugMan = pluginManager;
-
- QString initialCategory = categoryId;
- QString initialPage = pageId;
-
- m_ui.buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-
- connect(m_ui.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(apply()));
-
- m_ui.splitter->setCollapsible(1, false);
- m_ui.pageTree->header()->setVisible(false);
-
- connect(m_ui.pageTree, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
- this, SLOT(pageSelected()));
-
- QMap categories;
-
- QList pages = m_plugMan->getObjects();
-
- int index = 0;
- Q_FOREACH(IOptionsPage *page, pages)
- {
- PageData pageData;
- pageData.index = index;
- pageData.category = page->category();
- pageData.id = page->id();
-
- QTreeWidgetItem *item = new QTreeWidgetItem;
- item->setText(0, page->trName());
- item->setData(0, Qt::UserRole, qVariantFromValue(pageData));
-
- QStringList categoriesId = page->category().split(QLatin1Char('|'));
- QStringList trCategories = page->trCategory().split(QLatin1Char('|'));
- QString currentCategory = categoriesId.at(0);
-
- QTreeWidgetItem *treeitem;
- if (!categories.contains(currentCategory))
- {
- treeitem = new QTreeWidgetItem(m_ui.pageTree);
- treeitem->setText(0, trCategories.at(0));
- treeitem->setData(0, Qt::UserRole, qVariantFromValue(pageData));
- categories.insert(currentCategory, treeitem);
- }
-
- int catCount = 1;
- while (catCount < categoriesId.count())
- {
- if (!categories.contains(currentCategory + QLatin1Char('|') + categoriesId.at(catCount)))
- {
- treeitem = new QTreeWidgetItem(categories.value(currentCategory));
- currentCategory += QLatin1Char('|') + categoriesId.at(catCount);
- treeitem->setText(0, trCategories.at(catCount));
- treeitem->setData(0, Qt::UserRole, qVariantFromValue(pageData));
- categories.insert(currentCategory, treeitem);
- }
- else
- {
- currentCategory += QLatin1Char('|') + categoriesId.at(catCount);
- }
- ++catCount;
- }
-
- categories.value(currentCategory)->addChild(item);
-
- m_pages.append(page);
- m_ui.stackedPages->addWidget(page->createPage(m_ui.stackedPages));
-
- if (page->id() == initialPage && currentCategory == initialCategory)
- {
- m_ui.stackedPages->setCurrentIndex(m_ui.stackedPages->count());
- m_ui.pageTree->setCurrentItem(item);
- }
-
- index++;
- }
-
- QList sizes;
- sizes << 150 << 300;
- m_ui.splitter->setSizes(sizes);
-
- m_ui.splitter->setStretchFactor(m_ui.splitter->indexOf(m_ui.pageTree), 0);
- m_ui.splitter->setStretchFactor(m_ui.splitter->indexOf(m_ui.layoutWidget), 1);
-}
-
-SettingsDialog::~SettingsDialog()
-{
-}
-
-void SettingsDialog::pageSelected()
-{
- QTreeWidgetItem *item = m_ui.pageTree->currentItem();
- PageData data = item->data(0, Qt::UserRole).value();
- int index = data.index;
- m_currentCategory = data.category;
- m_currentPage = data.id;
- m_ui.stackedPages->setCurrentIndex(index);
-}
-
-void SettingsDialog::accept()
-{
- m_applied = true;
- Q_FOREACH(IOptionsPage *page, m_pages)
- {
- page->apply();
- page->finish();
- }
- done(QDialog::Accepted);
-}
-
-void SettingsDialog::reject()
-{
- Q_FOREACH(IOptionsPage *page, m_pages)
- page->finish();
- done(QDialog::Rejected);
-}
-
-void SettingsDialog::apply()
-{
- Q_FOREACH(IOptionsPage *page, m_pages)
- page->apply();
- m_applied = true;
-}
-
-bool SettingsDialog::execDialog()
-{
- m_applied = false;
- exec();
- return m_applied;
-}
-
-void SettingsDialog::done(int val)
-{
- QDialog::done(val);
-}
-
-} /* namespace Core */
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.h
deleted file mode 100644
index 9e1c86444..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Object Viewer Qt - MMORPG Framework
-// Copyright (C) 2010 Winch Gate Property Limited
-// Copyright (C) 2011 Dzmitry Kamiahin
-// Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-#ifndef SETTINGS_DIALOG_H
-#define SETTINGS_DIALOG_H
-
-#include "ui_settings_dialog.h"
-
-// Qt includes
-#include
-
-// Project includes
-#include "../../extension_system/iplugin_manager.h"
-
-namespace Core
-{
-class IOptionsPage;
-
-/**
-@class CSettingsDialog
-@brief Settings dialog
-*/
-class SettingsDialog: public QDialog
-{
- Q_OBJECT
-
-public:
- SettingsDialog(ExtensionSystem::IPluginManager *pluginManager,
- const QString &initialCategory = QString(),
- const QString &initialPage = QString(),
- QWidget *parent = 0);
-
- ~SettingsDialog();
-
- /// Run the dialog and return true if 'Ok' was choosen or 'Apply' was invoked at least once
- bool execDialog();
-
-public Q_SLOTS:
- void done(int);
-
-private Q_SLOTS:
- void pageSelected();
- void accept();
- void reject();
- void apply();
-
-private:
- QList m_pages;
- bool m_applied;
- QString m_currentCategory;
- QString m_currentPage;
-
- ExtensionSystem::IPluginManager *m_plugMan;
-
- Ui::SettingsDialog m_ui;
-}; /* class CSettingsDialog */
-
-} /* namespace Core */
-
-#endif // SETTINGS_DIALOG_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.ui
deleted file mode 100644
index 8e9780c9a..000000000
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.ui
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
- SettingsDialog
-
-
-
- 0
- 0
- 697
- 476
-
-
-
- Settings
-
-
-
- :/core/images/preferences.png:/core/images/preferences.png
-
-
-
- 6
-
-
- 9
-
- -
-
-
- Qt::Horizontal
-
-
-
-
- 0
- 0
-
-
-
- 1
-
-
-
- 0
-
-
-
-
-
-
- 6
-
-
- 0
-
-
-
-
-
-
- 350
- 250
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
-
-
-
- buttonBox
- accepted()
- SettingsDialog
- accept()
-
-
- 297
- 361
-
-
- 297
- 193
-
-
-
-
- buttonBox
- rejected()
- SettingsDialog
- reject()
-
-
- 297
- 361
-
-
- 297
- 193
-
-
-
-
-
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_generic_settings.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_generic_settings.png
deleted file mode 100644
index 799bacb28..000000000
Binary files a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_generic_settings.png and /dev/null differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_down_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_down_item.png
deleted file mode 100644
index fc86c4f6d..000000000
Binary files a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_down_item.png and /dev/null differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_pill.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_pill.png
deleted file mode 100644
index e748b8190..000000000
Binary files a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_pill.png and /dev/null differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_reset_all.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_reset_all.png
deleted file mode 100644
index aea193c70..000000000
Binary files a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_reset_all.png and /dev/null differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_up_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_up_item.png
deleted file mode 100644
index ee471023e..000000000
Binary files a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_up_item.png and /dev/null differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_add_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_add_item.png
deleted file mode 100644
index bde338f78..000000000
Binary files a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_add_item.png and /dev/null differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_delete_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_delete_item.png
deleted file mode 100644
index a5a1787d5..000000000
Binary files a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_delete_item.png and /dev/null differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_open.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_open.png
deleted file mode 100644
index c4992affd..000000000
Binary files a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_open.png and /dev/null differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/nel.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/nel.png
deleted file mode 100644
index d2139bb25..000000000
Binary files a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/nel.png and /dev/null differ
diff --git a/code/nel/tools/3d/object_viewer_qt/CMakeLists.txt b/code/studio/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/CMakeLists.txt
rename to code/studio/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/data/andbasr.ttf b/code/studio/data/andbasr.ttf
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/data/andbasr.ttf
rename to code/studio/data/andbasr.ttf
diff --git a/code/nel/tools/3d/object_viewer_qt/doc/html/cdirection_widget.png b/code/studio/doc/html/cdirection_widget.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/doc/html/cdirection_widget.png
rename to code/studio/doc/html/cdirection_widget.png
diff --git a/code/nel/tools/3d/object_viewer_qt/doc/html/cedit_color_widget.png b/code/studio/doc/html/cedit_color_widget.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/doc/html/cedit_color_widget.png
rename to code/studio/doc/html/cedit_color_widget.png
diff --git a/code/nel/tools/3d/object_viewer_qt/doc/html/cedit_range_float_widget.png b/code/studio/doc/html/cedit_range_float_widget.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/doc/html/cedit_range_float_widget.png
rename to code/studio/doc/html/cedit_range_float_widget.png
diff --git a/code/nel/tools/3d/object_viewer_qt/doc/html/cedit_range_int_widget.png b/code/studio/doc/html/cedit_range_int_widget.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/doc/html/cedit_range_int_widget.png
rename to code/studio/doc/html/cedit_range_int_widget.png
diff --git a/code/nel/tools/3d/object_viewer_qt/doc/html/gui_struct.png b/code/studio/doc/html/gui_struct.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/doc/html/gui_struct.png
rename to code/studio/doc/html/gui_struct.png
diff --git a/code/nel/tools/3d/object_viewer_qt/doc/html/object_viewer_qt_window.png b/code/studio/doc/html/object_viewer_qt_window.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/doc/html/object_viewer_qt_window.png
rename to code/studio/doc/html/object_viewer_qt_window.png
diff --git a/code/nel/tools/3d/object_viewer_qt/doc/make_ovqt_dox.bat b/code/studio/doc/make_ovqt_dox.bat
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/doc/make_ovqt_dox.bat
rename to code/studio/doc/make_ovqt_dox.bat
diff --git a/code/nel/tools/3d/object_viewer_qt/doc/make_ovqt_dox.sh b/code/studio/doc/make_ovqt_dox.sh
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/doc/make_ovqt_dox.sh
rename to code/studio/doc/make_ovqt_dox.sh
diff --git a/code/nel/tools/3d/object_viewer_qt/doc/ovqt.dox b/code/studio/doc/ovqt.dox
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/doc/ovqt.dox
rename to code/studio/doc/ovqt.dox
diff --git a/code/nel/tools/3d/object_viewer_qt/ovqt_config.h.cmake b/code/studio/ovqt_config.h.cmake
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/ovqt_config.h.cmake
rename to code/studio/ovqt_config.h.cmake
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/CMakeLists.txt b/code/studio/src/3rdparty/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/CMakeLists.txt
rename to code/studio/src/3rdparty/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/CMakeLists.txt b/code/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/CMakeLists.txt
rename to code/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/LGPL_EXCEPTION.txt b/code/studio/src/3rdparty/qtpropertybrowser/LGPL_EXCEPTION.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/LGPL_EXCEPTION.txt
rename to code/studio/src/3rdparty/qtpropertybrowser/LGPL_EXCEPTION.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/LICENSE.GPL3 b/code/studio/src/3rdparty/qtpropertybrowser/LICENSE.GPL3
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/LICENSE.GPL3
rename to code/studio/src/3rdparty/qtpropertybrowser/LICENSE.GPL3
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/LICENSE.LGPL b/code/studio/src/3rdparty/qtpropertybrowser/LICENSE.LGPL
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/LICENSE.LGPL
rename to code/studio/src/3rdparty/qtpropertybrowser/LICENSE.LGPL
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtAbstractEditorFactoryBase b/code/studio/src/3rdparty/qtpropertybrowser/QtAbstractEditorFactoryBase
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtAbstractEditorFactoryBase
rename to code/studio/src/3rdparty/qtpropertybrowser/QtAbstractEditorFactoryBase
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtAbstractPropertyBrowser b/code/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyBrowser
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtAbstractPropertyBrowser
rename to code/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyBrowser
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtAbstractPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtAbstractPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtAbstractPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtBoolPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtBoolPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtBoolPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtBoolPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtBrowserItem b/code/studio/src/3rdparty/qtpropertybrowser/QtBrowserItem
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtBrowserItem
rename to code/studio/src/3rdparty/qtpropertybrowser/QtBrowserItem
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtButtonPropertyBrowser b/code/studio/src/3rdparty/qtpropertybrowser/QtButtonPropertyBrowser
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtButtonPropertyBrowser
rename to code/studio/src/3rdparty/qtpropertybrowser/QtButtonPropertyBrowser
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCharEditorFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtCharEditorFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCharEditorFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtCharEditorFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCharPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtCharPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCharPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtCharPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCheckBoxFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtCheckBoxFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCheckBoxFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtCheckBoxFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtColorEditorFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtColorEditorFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtColorEditorFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtColorEditorFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtColorPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtColorPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtColorPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtColorPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCursorEditorFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtCursorEditorFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCursorEditorFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtCursorEditorFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCursorPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtCursorPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtCursorPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtCursorPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDateEditFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtDateEditFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDateEditFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtDateEditFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDatePropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtDatePropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDatePropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtDatePropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDateTimeEditFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtDateTimeEditFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDateTimeEditFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtDateTimeEditFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDateTimePropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtDateTimePropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDateTimePropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtDateTimePropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDoublePropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtDoublePropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDoublePropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtDoublePropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDoubleSpinBoxFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtDoubleSpinBoxFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtDoubleSpinBoxFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtDoubleSpinBoxFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtEnumEditorFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtEnumEditorFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtEnumEditorFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtEnumEditorFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtEnumPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtEnumPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtEnumPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtEnumPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtFlagPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtFlagPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtFlagPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtFlagPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtFontEditorFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtFontEditorFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtFontEditorFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtFontEditorFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtFontPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtFontPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtFontPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtFontPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtGroupBoxPropertyBrowser b/code/studio/src/3rdparty/qtpropertybrowser/QtGroupBoxPropertyBrowser
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtGroupBoxPropertyBrowser
rename to code/studio/src/3rdparty/qtpropertybrowser/QtGroupBoxPropertyBrowser
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtGroupPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtGroupPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtGroupPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtGroupPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtIntPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtIntPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtIntPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtIntPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtKeySequenceEditorFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtKeySequenceEditorFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtKeySequenceEditorFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtKeySequenceEditorFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtKeySequencePropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtKeySequencePropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtKeySequencePropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtKeySequencePropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtLineEditFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtLineEditFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtLineEditFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtLineEditFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtLocalePropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtLocalePropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtLocalePropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtLocalePropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtPointFPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtPointFPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtPointFPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtPointFPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtPointPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtPointPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtPointPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtPointPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtProperty b/code/studio/src/3rdparty/qtpropertybrowser/QtProperty
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtProperty
rename to code/studio/src/3rdparty/qtpropertybrowser/QtProperty
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtRectFPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtRectFPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtRectFPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtRectFPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtRectPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtRectPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtRectPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtRectPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtScrollBarFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtScrollBarFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtScrollBarFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtScrollBarFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSizeFPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtSizeFPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSizeFPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtSizeFPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSizePolicyPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtSizePolicyPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSizePolicyPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtSizePolicyPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSizePropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtSizePropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSizePropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtSizePropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSliderFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtSliderFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSliderFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtSliderFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSpinBoxFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtSpinBoxFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtSpinBoxFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtSpinBoxFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtStringPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtStringPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtStringPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtStringPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtTimeEditFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtTimeEditFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtTimeEditFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtTimeEditFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtTimePropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtTimePropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtTimePropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtTimePropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtTreePropertyBrowser b/code/studio/src/3rdparty/qtpropertybrowser/QtTreePropertyBrowser
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtTreePropertyBrowser
rename to code/studio/src/3rdparty/qtpropertybrowser/QtTreePropertyBrowser
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtVariantEditorFactory b/code/studio/src/3rdparty/qtpropertybrowser/QtVariantEditorFactory
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtVariantEditorFactory
rename to code/studio/src/3rdparty/qtpropertybrowser/QtVariantEditorFactory
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtVariantProperty b/code/studio/src/3rdparty/qtpropertybrowser/QtVariantProperty
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtVariantProperty
rename to code/studio/src/3rdparty/qtpropertybrowser/QtVariantProperty
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtVariantPropertyManager b/code/studio/src/3rdparty/qtpropertybrowser/QtVariantPropertyManager
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/QtVariantPropertyManager
rename to code/studio/src/3rdparty/qtpropertybrowser/QtVariantPropertyManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/README.TXT b/code/studio/src/3rdparty/qtpropertybrowser/README.TXT
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/README.TXT
rename to code/studio/src/3rdparty/qtpropertybrowser/README.TXT
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-arrow.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-arrow.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-arrow.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-arrow.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-busy.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-busy.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-busy.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-busy.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-closedhand.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-closedhand.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-closedhand.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-closedhand.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-cross.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-cross.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-cross.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-cross.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-forbidden.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-forbidden.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-forbidden.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-forbidden.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-hand.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-hand.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-hand.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-hand.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-hsplit.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-hsplit.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-hsplit.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-hsplit.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-ibeam.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-ibeam.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-ibeam.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-ibeam.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-openhand.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-openhand.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-openhand.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-openhand.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizeall.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeall.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizeall.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeall.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizeb.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeb.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizeb.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeb.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizef.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizef.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizef.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizef.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizeh.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeh.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizeh.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizeh.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizev.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizev.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-sizev.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-sizev.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-uparrow.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-uparrow.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-uparrow.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-uparrow.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-vsplit.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-vsplit.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-vsplit.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-vsplit.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-wait.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-wait.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-wait.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-wait.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-whatsthis.png b/code/studio/src/3rdparty/qtpropertybrowser/images/cursor-whatsthis.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/cursor-whatsthis.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/cursor-whatsthis.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/resetproperty.png b/code/studio/src/3rdparty/qtpropertybrowser/images/resetproperty.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/images/resetproperty.png
rename to code/studio/src/3rdparty/qtpropertybrowser/images/resetproperty.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.cpp
rename to code/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.h b/code/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.h
rename to code/studio/src/3rdparty/qtpropertybrowser/qtbuttonpropertybrowser.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp
rename to code/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qteditorfactory.h b/code/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qteditorfactory.h
rename to code/studio/src/3rdparty/qtpropertybrowser/qteditorfactory.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
rename to code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.h b/code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.h
rename to code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp
rename to code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowser.h b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowser.h
rename to code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowser.pri b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.pri
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowser.pri
rename to code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.pri
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowser.qrc b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowser.qrc
rename to code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils.cpp
rename to code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils_p.h b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils_p.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils_p.h
rename to code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowserutils_p.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertymanager.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertymanager.cpp
rename to code/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertymanager.h b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtpropertymanager.h
rename to code/studio/src/3rdparty/qtpropertybrowser/qtpropertymanager.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.cpp
rename to code/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.h b/code/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.h
rename to code/studio/src/3rdparty/qtpropertybrowser/qttreepropertybrowser.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp
rename to code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtvariantproperty.h b/code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qtvariantproperty.h
rename to code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt b/code/studio/src/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/CMakeLists.txt
rename to code/studio/src/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/description.h b/code/studio/src/description.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/description.h
rename to code/studio/src/description.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/extension_system/iplugin.h b/code/studio/src/extension_system/iplugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/extension_system/iplugin.h
rename to code/studio/src/extension_system/iplugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/extension_system/iplugin_manager.h b/code/studio/src/extension_system/iplugin_manager.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/extension_system/iplugin_manager.h
rename to code/studio/src/extension_system/iplugin_manager.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/extension_system/iplugin_spec.h b/code/studio/src/extension_system/iplugin_spec.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/extension_system/iplugin_spec.h
rename to code/studio/src/extension_system/iplugin_spec.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_manager.cpp b/code/studio/src/extension_system/plugin_manager.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_manager.cpp
rename to code/studio/src/extension_system/plugin_manager.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_manager.h b/code/studio/src/extension_system/plugin_manager.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_manager.h
rename to code/studio/src/extension_system/plugin_manager.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp b/code/studio/src/extension_system/plugin_spec.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp
rename to code/studio/src/extension_system/plugin_spec.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.h b/code/studio/src/extension_system/plugin_spec.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.h
rename to code/studio/src/extension_system/plugin_spec.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/ic_nel_pill.ico b/code/studio/src/ic_nel_pill.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/ic_nel_pill.ico
rename to code/studio/src/ic_nel_pill.ico
diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/nel_ide_load.png b/code/studio/src/images/nel_ide_load.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/images/nel_ide_load.png
rename to code/studio/src/images/nel_ide_load.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/main.cpp b/code/studio/src/main.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/main.cpp
rename to code/studio/src/main.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.qrc b/code/studio/src/object_viewer_qt.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.qrc
rename to code/studio/src/object_viewer_qt.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.rc b/code/studio/src/object_viewer_qt.rc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/object_viewer_qt.rc
rename to code/studio/src/object_viewer_qt.rc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt b/code/studio/src/plugins/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt
rename to code/studio/src/plugins/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/CMakeLists.txt b/code/studio/src/plugins/bnp_manager/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/CMakeLists.txt
rename to code/studio/src/plugins/bnp_manager/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp b/code/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp
rename to code/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.h b/code/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.h
rename to code/studio/src/plugins/bnp_manager/bnp_dirtree_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_form.ui b/code/studio/src/plugins/bnp_manager/bnp_dirtree_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_form.ui
rename to code/studio/src/plugins/bnp_manager/bnp_dirtree_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp b/code/studio/src/plugins/bnp_manager/bnp_file.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp
rename to code/studio/src/plugins/bnp_manager/bnp_file.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h b/code/studio/src/plugins/bnp_manager/bnp_file.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h
rename to code/studio/src/plugins/bnp_manager/bnp_file.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.cpp b/code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.cpp
rename to code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.h b/code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.h
rename to code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.ui b/code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.ui
rename to code/studio/src/plugins/bnp_manager/bnp_filelist_dialog.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.cpp b/code/studio/src/plugins/bnp_manager/bnp_filesystem_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.cpp
rename to code/studio/src/plugins/bnp_manager/bnp_filesystem_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.h b/code/studio/src/plugins/bnp_manager/bnp_filesystem_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.h
rename to code/studio/src/plugins/bnp_manager/bnp_filesystem_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager.qrc b/code/studio/src/plugins/bnp_manager/bnp_manager.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager.qrc
rename to code/studio/src/plugins/bnp_manager/bnp_manager.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_constants.h b/code/studio/src/plugins/bnp_manager/bnp_manager_constants.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_constants.h
rename to code/studio/src/plugins/bnp_manager/bnp_manager_constants.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.cpp b/code/studio/src/plugins/bnp_manager/bnp_manager_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.cpp
rename to code/studio/src/plugins/bnp_manager/bnp_manager_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.h b/code/studio/src/plugins/bnp_manager/bnp_manager_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.h
rename to code/studio/src/plugins/bnp_manager/bnp_manager_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.cpp b/code/studio/src/plugins/bnp_manager/bnp_manager_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.cpp
rename to code/studio/src/plugins/bnp_manager/bnp_manager_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.h b/code/studio/src/plugins/bnp_manager/bnp_manager_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.h
rename to code/studio/src/plugins/bnp_manager/bnp_manager_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.ui b/code/studio/src/plugins/bnp_manager/bnp_manager_window.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.ui
rename to code/studio/src/plugins/bnp_manager/bnp_manager_window.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.cpp b/code/studio/src/plugins/bnp_manager/bnp_proxy_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.cpp
rename to code/studio/src/plugins/bnp_manager/bnp_proxy_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.h b/code/studio/src/plugins/bnp_manager/bnp_proxy_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.h
rename to code/studio/src/plugins/bnp_manager/bnp_proxy_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_add_item.png b/code/studio/src/plugins/bnp_manager/images/ic_nel_add_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_add_item.png
rename to code/studio/src/plugins/bnp_manager/images/ic_nel_add_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_bnp_make.png b/code/studio/src/plugins/bnp_manager/images/ic_nel_bnp_make.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_bnp_make.png
rename to code/studio/src/plugins/bnp_manager/images/ic_nel_bnp_make.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_delete_item.png b/code/studio/src/plugins/bnp_manager/images/ic_nel_delete_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_delete_item.png
rename to code/studio/src/plugins/bnp_manager/images/ic_nel_delete_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_export.png b/code/studio/src/plugins/bnp_manager/images/ic_nel_export.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_export.png
rename to code/studio/src/plugins/bnp_manager/images/ic_nel_export.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_new.png b/code/studio/src/plugins/bnp_manager/images/ic_nel_new.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_new.png
rename to code/studio/src/plugins/bnp_manager/images/ic_nel_new.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_reset_all.png b/code/studio/src/plugins/bnp_manager/images/ic_nel_reset_all.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_reset_all.png
rename to code/studio/src/plugins/bnp_manager/images/ic_nel_reset_all.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml b/code/studio/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml
rename to code/studio/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/CMakeLists.txt b/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/CMakeLists.txt
rename to code/studio/src/plugins/disp_sheet_id/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp b/code/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp
rename to code/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h b/code/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h
rename to code/studio/src/plugins/disp_sheet_id/disp_sheet_id_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/ovqt_plugin_disp_sheet_id.xml b/code/studio/src/plugins/disp_sheet_id/ovqt_plugin_disp_sheet_id.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/ovqt_plugin_disp_sheet_id.xml
rename to code/studio/src/plugins/disp_sheet_id/ovqt_plugin_disp_sheet_id.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/sheet_id_view.cpp b/code/studio/src/plugins/disp_sheet_id/sheet_id_view.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/sheet_id_view.cpp
rename to code/studio/src/plugins/disp_sheet_id/sheet_id_view.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/sheet_id_view.h b/code/studio/src/plugins/disp_sheet_id/sheet_id_view.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/sheet_id_view.h
rename to code/studio/src/plugins/disp_sheet_id/sheet_id_view.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/sheet_id_view.ui b/code/studio/src/plugins/disp_sheet_id/sheet_id_view.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/disp_sheet_id/sheet_id_view.ui
rename to code/studio/src/plugins/disp_sheet_id/sheet_id_view.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/CMakeLists.txt b/code/studio/src/plugins/example/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/CMakeLists.txt
rename to code/studio/src/plugins/example/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_plugin.cpp b/code/studio/src/plugins/example/example_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_plugin.cpp
rename to code/studio/src/plugins/example/example_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_plugin.h b/code/studio/src/plugins/example/example_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_plugin.h
rename to code/studio/src/plugins/example/example_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_settings_page.cpp b/code/studio/src/plugins/example/example_settings_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_settings_page.cpp
rename to code/studio/src/plugins/example/example_settings_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_settings_page.h b/code/studio/src/plugins/example/example_settings_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_settings_page.h
rename to code/studio/src/plugins/example/example_settings_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_settings_page.ui b/code/studio/src/plugins/example/example_settings_page.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/example_settings_page.ui
rename to code/studio/src/plugins/example/example_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/ovqt_plugin_example.xml b/code/studio/src/plugins/example/ovqt_plugin_example.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/ovqt_plugin_example.xml
rename to code/studio/src/plugins/example/ovqt_plugin_example.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.cpp b/code/studio/src/plugins/example/qnel_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.cpp
rename to code/studio/src/plugins/example/qnel_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.h b/code/studio/src/plugins/example/qnel_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.h
rename to code/studio/src/plugins/example/qnel_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/simple_viewer.cpp b/code/studio/src/plugins/example/simple_viewer.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/simple_viewer.cpp
rename to code/studio/src/plugins/example/simple_viewer.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/simple_viewer.h b/code/studio/src/plugins/example/simple_viewer.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/example/simple_viewer.h
rename to code/studio/src/plugins/example/simple_viewer.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/CMakeLists.txt b/code/studio/src/plugins/georges_editor/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/CMakeLists.txt
rename to code/studio/src/plugins/georges_editor/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/actions.cpp b/code/studio/src/plugins/georges_editor/actions.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/actions.cpp
rename to code/studio/src/plugins/georges_editor/actions.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/actions.h b/code/studio/src/plugins/georges_editor/actions.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/actions.h
rename to code/studio/src/plugins/georges_editor/actions.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.cpp b/code/studio/src/plugins/georges_editor/expandable_headerview.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.cpp
rename to code/studio/src/plugins/georges_editor/expandable_headerview.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.h b/code/studio/src/plugins/georges_editor/expandable_headerview.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.h
rename to code/studio/src/plugins/georges_editor/expandable_headerview.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.cpp b/code/studio/src/plugins/georges_editor/formdelegate.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.cpp
rename to code/studio/src/plugins/georges_editor/formdelegate.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.h b/code/studio/src/plugins/georges_editor/formdelegate.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.h
rename to code/studio/src/plugins/georges_editor/formdelegate.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.cpp b/code/studio/src/plugins/georges_editor/formitem.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.cpp
rename to code/studio/src/plugins/georges_editor/formitem.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.h b/code/studio/src/plugins/georges_editor/formitem.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.h
rename to code/studio/src/plugins/georges_editor/formitem.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.cpp b/code/studio/src/plugins/georges_editor/georges.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.cpp
rename to code/studio/src/plugins/georges_editor/georges.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.h b/code/studio/src/plugins/georges_editor/georges.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.h
rename to code/studio/src/plugins/georges_editor/georges.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.cpp b/code/studio/src/plugins/georges_editor/georges_dirtree_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.cpp
rename to code/studio/src/plugins/georges_editor/georges_dirtree_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.h b/code/studio/src/plugins/georges_editor/georges_dirtree_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.h
rename to code/studio/src/plugins/georges_editor/georges_dirtree_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_form.ui b/code/studio/src/plugins/georges_editor/georges_dirtree_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_form.ui
rename to code/studio/src/plugins/georges_editor/georges_dirtree_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor.qrc b/code/studio/src/plugins/georges_editor/georges_editor.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor.qrc
rename to code/studio/src/plugins/georges_editor/georges_editor.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_constants.h b/code/studio/src/plugins/georges_editor/georges_editor_constants.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_constants.h
rename to code/studio/src/plugins/georges_editor/georges_editor_constants.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.cpp b/code/studio/src/plugins/georges_editor/georges_editor_form.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.cpp
rename to code/studio/src/plugins/georges_editor/georges_editor_form.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.h b/code/studio/src/plugins/georges_editor/georges_editor_form.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.h
rename to code/studio/src/plugins/georges_editor/georges_editor_form.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.ui b/code/studio/src/plugins/georges_editor/georges_editor_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.ui
rename to code/studio/src/plugins/georges_editor/georges_editor_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.cpp b/code/studio/src/plugins/georges_editor/georges_editor_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.cpp
rename to code/studio/src/plugins/georges_editor/georges_editor_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.h b/code/studio/src/plugins/georges_editor/georges_editor_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.h
rename to code/studio/src/plugins/georges_editor/georges_editor_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.cpp b/code/studio/src/plugins/georges_editor/georges_filesystem_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.cpp
rename to code/studio/src/plugins/georges_editor/georges_filesystem_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.h b/code/studio/src/plugins/georges_editor/georges_filesystem_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.h
rename to code/studio/src/plugins/georges_editor/georges_filesystem_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.cpp b/code/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.cpp
rename to code/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.h b/code/studio/src/plugins/georges_editor/georges_treeview_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.h
rename to code/studio/src/plugins/georges_editor/georges_treeview_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_form.ui b/code/studio/src/plugins/georges_editor/georges_treeview_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_form.ui
rename to code/studio/src/plugins/georges_editor/georges_treeview_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.cpp b/code/studio/src/plugins/georges_editor/georgesform_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.cpp
rename to code/studio/src/plugins/georges_editor/georgesform_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.h b/code/studio/src/plugins/georges_editor/georgesform_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.h
rename to code/studio/src/plugins/georges_editor/georgesform_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.cpp b/code/studio/src/plugins/georges_editor/georgesform_proxy_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.cpp
rename to code/studio/src/plugins/georges_editor/georgesform_proxy_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.h b/code/studio/src/plugins/georges_editor/georgesform_proxy_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.h
rename to code/studio/src/plugins/georges_editor/georgesform_proxy_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/array.ico b/code/studio/src/plugins/georges_editor/images/array.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/array.ico
rename to code/studio/src/plugins/georges_editor/images/array.ico
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/header.ico b/code/studio/src/plugins/georges_editor/images/header.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/header.ico
rename to code/studio/src/plugins/georges_editor/images/header.ico
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/hold.ico b/code/studio/src/plugins/georges_editor/images/hold.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/hold.ico
rename to code/studio/src/plugins/georges_editor/images/hold.ico
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/ic_nel_georges_editor.png b/code/studio/src/plugins/georges_editor/images/ic_nel_georges_editor.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/ic_nel_georges_editor.png
rename to code/studio/src/plugins/georges_editor/images/ic_nel_georges_editor.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/root.ico b/code/studio/src/plugins/georges_editor/images/root.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/root.ico
rename to code/studio/src/plugins/georges_editor/images/root.ico
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/struct.ico b/code/studio/src/plugins/georges_editor/images/struct.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/struct.ico
rename to code/studio/src/plugins/georges_editor/images/struct.ico
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/vstruct.ico b/code/studio/src/plugins/georges_editor/images/vstruct.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/vstruct.ico
rename to code/studio/src/plugins/georges_editor/images/vstruct.ico
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/zfee51.ico b/code/studio/src/plugins/georges_editor/images/zfee51.ico
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/images/zfee51.ico
rename to code/studio/src/plugins/georges_editor/images/zfee51.ico
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/ovqt_plugin_georges_editor.xml b/code/studio/src/plugins/georges_editor/ovqt_plugin_georges_editor.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/ovqt_plugin_georges_editor.xml
rename to code/studio/src/plugins/georges_editor/ovqt_plugin_georges_editor.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/stdpch.cpp b/code/studio/src/plugins/georges_editor/stdpch.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/stdpch.cpp
rename to code/studio/src/plugins/georges_editor/stdpch.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/stdpch.h b/code/studio/src/plugins/georges_editor/stdpch.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/stdpch.h
rename to code/studio/src/plugins/georges_editor/stdpch.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/CMakeLists.txt b/code/studio/src/plugins/gui_editor/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/CMakeLists.txt
rename to code/studio/src/plugins/gui_editor/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/action_editor.cpp b/code/studio/src/plugins/gui_editor/action_editor.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/action_editor.cpp
rename to code/studio/src/plugins/gui_editor/action_editor.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/action_editor.h b/code/studio/src/plugins/gui_editor/action_editor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/action_editor.h
rename to code/studio/src/plugins/gui_editor/action_editor.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/action_editor.ui b/code/studio/src/plugins/gui_editor/action_editor.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/action_editor.ui
rename to code/studio/src/plugins/gui_editor/action_editor.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/add_widget_widget.cpp b/code/studio/src/plugins/gui_editor/add_widget_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/add_widget_widget.cpp
rename to code/studio/src/plugins/gui_editor/add_widget_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/add_widget_widget.h b/code/studio/src/plugins/gui_editor/add_widget_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/add_widget_widget.h
rename to code/studio/src/plugins/gui_editor/add_widget_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/add_widget_widget.ui b/code/studio/src/plugins/gui_editor/add_widget_widget.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/add_widget_widget.ui
rename to code/studio/src/plugins/gui_editor/add_widget_widget.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/editor_message_processor.cpp b/code/studio/src/plugins/gui_editor/editor_message_processor.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/editor_message_processor.cpp
rename to code/studio/src/plugins/gui_editor/editor_message_processor.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/editor_message_processor.h b/code/studio/src/plugins/gui_editor/editor_message_processor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/editor_message_processor.h
rename to code/studio/src/plugins/gui_editor/editor_message_processor.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/editor_selection_watcher.cpp b/code/studio/src/plugins/gui_editor/editor_selection_watcher.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/editor_selection_watcher.cpp
rename to code/studio/src/plugins/gui_editor/editor_selection_watcher.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/editor_selection_watcher.h b/code/studio/src/plugins/gui_editor/editor_selection_watcher.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/editor_selection_watcher.h
rename to code/studio/src/plugins/gui_editor/editor_selection_watcher.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_constants.h b/code/studio/src/plugins/gui_editor/gui_editor_constants.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_constants.h
rename to code/studio/src/plugins/gui_editor/gui_editor_constants.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_context.cpp b/code/studio/src/plugins/gui_editor/gui_editor_context.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_context.cpp
rename to code/studio/src/plugins/gui_editor/gui_editor_context.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_context.h b/code/studio/src/plugins/gui_editor/gui_editor_context.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_context.h
rename to code/studio/src/plugins/gui_editor/gui_editor_context.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_core_listener.cpp b/code/studio/src/plugins/gui_editor/gui_editor_core_listener.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_core_listener.cpp
rename to code/studio/src/plugins/gui_editor/gui_editor_core_listener.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_core_listener.h b/code/studio/src/plugins/gui_editor/gui_editor_core_listener.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_core_listener.h
rename to code/studio/src/plugins/gui_editor/gui_editor_core_listener.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_global.h b/code/studio/src/plugins/gui_editor/gui_editor_global.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_global.h
rename to code/studio/src/plugins/gui_editor/gui_editor_global.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_plugin.cpp b/code/studio/src/plugins/gui_editor/gui_editor_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_plugin.cpp
rename to code/studio/src/plugins/gui_editor/gui_editor_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_plugin.h b/code/studio/src/plugins/gui_editor/gui_editor_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_plugin.h
rename to code/studio/src/plugins/gui_editor/gui_editor_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.cpp b/code/studio/src/plugins/gui_editor/gui_editor_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.cpp
rename to code/studio/src/plugins/gui_editor/gui_editor_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.h b/code/studio/src/plugins/gui_editor/gui_editor_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.h
rename to code/studio/src/plugins/gui_editor/gui_editor_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.ui b/code/studio/src/plugins/gui_editor/gui_editor_window.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/gui_editor_window.ui
rename to code/studio/src/plugins/gui_editor/gui_editor_window.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_editor.cpp b/code/studio/src/plugins/gui_editor/link_editor.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_editor.cpp
rename to code/studio/src/plugins/gui_editor/link_editor.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_editor.h b/code/studio/src/plugins/gui_editor/link_editor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_editor.h
rename to code/studio/src/plugins/gui_editor/link_editor.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_editor.ui b/code/studio/src/plugins/gui_editor/link_editor.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_editor.ui
rename to code/studio/src/plugins/gui_editor/link_editor.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_list.cpp b/code/studio/src/plugins/gui_editor/link_list.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_list.cpp
rename to code/studio/src/plugins/gui_editor/link_list.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_list.h b/code/studio/src/plugins/gui_editor/link_list.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_list.h
rename to code/studio/src/plugins/gui_editor/link_list.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_list.ui b/code/studio/src/plugins/gui_editor/link_list.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/link_list.ui
rename to code/studio/src/plugins/gui_editor/link_list.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/nel3d_widget.cpp b/code/studio/src/plugins/gui_editor/nel3d_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/nel3d_widget.cpp
rename to code/studio/src/plugins/gui_editor/nel3d_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/nel3d_widget.h b/code/studio/src/plugins/gui_editor/nel3d_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/nel3d_widget.h
rename to code/studio/src/plugins/gui_editor/nel3d_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/nelgui_widget.cpp b/code/studio/src/plugins/gui_editor/nelgui_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/nelgui_widget.cpp
rename to code/studio/src/plugins/gui_editor/nelgui_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/nelgui_widget.h b/code/studio/src/plugins/gui_editor/nelgui_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/nelgui_widget.h
rename to code/studio/src/plugins/gui_editor/nelgui_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_property_widget.cpp b/code/studio/src/plugins/gui_editor/new_property_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_property_widget.cpp
rename to code/studio/src/plugins/gui_editor/new_property_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_property_widget.h b/code/studio/src/plugins/gui_editor/new_property_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_property_widget.h
rename to code/studio/src/plugins/gui_editor/new_property_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_property_widget.ui b/code/studio/src/plugins/gui_editor/new_property_widget.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_property_widget.ui
rename to code/studio/src/plugins/gui_editor/new_property_widget.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_widget_widget.cpp b/code/studio/src/plugins/gui_editor/new_widget_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_widget_widget.cpp
rename to code/studio/src/plugins/gui_editor/new_widget_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_widget_widget.h b/code/studio/src/plugins/gui_editor/new_widget_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_widget_widget.h
rename to code/studio/src/plugins/gui_editor/new_widget_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_widget_widget.ui b/code/studio/src/plugins/gui_editor/new_widget_widget.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/new_widget_widget.ui
rename to code/studio/src/plugins/gui_editor/new_widget_widget.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/ovqt_plugin_gui_editor.xml b/code/studio/src/plugins/gui_editor/ovqt_plugin_gui_editor.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/ovqt_plugin_gui_editor.xml
rename to code/studio/src/plugins/gui_editor/ovqt_plugin_gui_editor.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_editor.cpp b/code/studio/src/plugins/gui_editor/proc_editor.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_editor.cpp
rename to code/studio/src/plugins/gui_editor/proc_editor.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_editor.h b/code/studio/src/plugins/gui_editor/proc_editor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_editor.h
rename to code/studio/src/plugins/gui_editor/proc_editor.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_editor.ui b/code/studio/src/plugins/gui_editor/proc_editor.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_editor.ui
rename to code/studio/src/plugins/gui_editor/proc_editor.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_list.cpp b/code/studio/src/plugins/gui_editor/proc_list.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_list.cpp
rename to code/studio/src/plugins/gui_editor/proc_list.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_list.h b/code/studio/src/plugins/gui_editor/proc_list.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_list.h
rename to code/studio/src/plugins/gui_editor/proc_list.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_list.ui b/code/studio/src/plugins/gui_editor/proc_list.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/proc_list.ui
rename to code/studio/src/plugins/gui_editor/proc_list.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_file_parser.cpp b/code/studio/src/plugins/gui_editor/project_file_parser.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_file_parser.cpp
rename to code/studio/src/plugins/gui_editor/project_file_parser.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_file_parser.h b/code/studio/src/plugins/gui_editor/project_file_parser.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_file_parser.h
rename to code/studio/src/plugins/gui_editor/project_file_parser.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_file_serializer.cpp b/code/studio/src/plugins/gui_editor/project_file_serializer.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_file_serializer.cpp
rename to code/studio/src/plugins/gui_editor/project_file_serializer.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_file_serializer.h b/code/studio/src/plugins/gui_editor/project_file_serializer.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_file_serializer.h
rename to code/studio/src/plugins/gui_editor/project_file_serializer.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_files.h b/code/studio/src/plugins/gui_editor/project_files.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_files.h
rename to code/studio/src/plugins/gui_editor/project_files.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_files/login.xml b/code/studio/src/plugins/gui_editor/project_files/login.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_files/login.xml
rename to code/studio/src/plugins/gui_editor/project_files/login.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_window.cpp b/code/studio/src/plugins/gui_editor/project_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_window.cpp
rename to code/studio/src/plugins/gui_editor/project_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_window.h b/code/studio/src/plugins/gui_editor/project_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_window.h
rename to code/studio/src/plugins/gui_editor/project_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_window.ui b/code/studio/src/plugins/gui_editor/project_window.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/project_window.ui
rename to code/studio/src/plugins/gui_editor/project_window.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/property_browser_ctrl.cpp b/code/studio/src/plugins/gui_editor/property_browser_ctrl.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/property_browser_ctrl.cpp
rename to code/studio/src/plugins/gui_editor/property_browser_ctrl.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/property_browser_ctrl.h b/code/studio/src/plugins/gui_editor/property_browser_ctrl.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/property_browser_ctrl.h
rename to code/studio/src/plugins/gui_editor/property_browser_ctrl.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.cpp b/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.cpp
rename to code/studio/src/plugins/gui_editor/widget_hierarchy.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.h b/code/studio/src/plugins/gui_editor/widget_hierarchy.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.h
rename to code/studio/src/plugins/gui_editor/widget_hierarchy.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.ui b/code/studio/src/plugins/gui_editor/widget_hierarchy.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.ui
rename to code/studio/src/plugins/gui_editor/widget_hierarchy.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info.h b/code/studio/src/plugins/gui_editor/widget_info.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info.h
rename to code/studio/src/plugins/gui_editor/widget_info.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_serializer.cpp b/code/studio/src/plugins/gui_editor/widget_info_serializer.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_serializer.cpp
rename to code/studio/src/plugins/gui_editor/widget_info_serializer.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_serializer.h b/code/studio/src/plugins/gui_editor/widget_info_serializer.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_serializer.h
rename to code/studio/src/plugins/gui_editor/widget_info_serializer.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_tree.h b/code/studio/src/plugins/gui_editor/widget_info_tree.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_tree.h
rename to code/studio/src/plugins/gui_editor/widget_info_tree.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_tree_node.h b/code/studio/src/plugins/gui_editor/widget_info_tree_node.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_tree_node.h
rename to code/studio/src/plugins/gui_editor/widget_info_tree_node.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_tree_visitor.h b/code/studio/src/plugins/gui_editor/widget_info_tree_visitor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_info_tree_visitor.h
rename to code/studio/src/plugins/gui_editor/widget_info_tree_visitor.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties.cpp b/code/studio/src/plugins/gui_editor/widget_properties.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties.cpp
rename to code/studio/src/plugins/gui_editor/widget_properties.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties.h b/code/studio/src/plugins/gui_editor/widget_properties.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties.h
rename to code/studio/src/plugins/gui_editor/widget_properties.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties.ui b/code/studio/src/plugins/gui_editor/widget_properties.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties.ui
rename to code/studio/src/plugins/gui_editor/widget_properties.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties_parser.cpp b/code/studio/src/plugins/gui_editor/widget_properties_parser.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties_parser.cpp
rename to code/studio/src/plugins/gui_editor/widget_properties_parser.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties_parser.h b/code/studio/src/plugins/gui_editor/widget_properties_parser.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_properties_parser.h
rename to code/studio/src/plugins/gui_editor/widget_properties_parser.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_serializer.cpp b/code/studio/src/plugins/gui_editor/widget_serializer.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_serializer.cpp
rename to code/studio/src/plugins/gui_editor/widget_serializer.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_serializer.h b/code/studio/src/plugins/gui_editor/widget_serializer.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_serializer.h
rename to code/studio/src/plugins/gui_editor/widget_serializer.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlBase.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlBase.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlBase.xml
rename to code/studio/src/plugins/gui_editor/widgets/CtrlBase.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlBaseButton.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
rename to code/studio/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlButton.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlButton.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlButton.xml
rename to code/studio/src/plugins/gui_editor/widgets/CtrlButton.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlColPick.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlColPick.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlColPick.xml
rename to code/studio/src/plugins/gui_editor/widgets/CtrlColPick.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlScroll.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlScroll.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlScroll.xml
rename to code/studio/src/plugins/gui_editor/widgets/CtrlScroll.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTabButton.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlTabButton.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTabButton.xml
rename to code/studio/src/plugins/gui_editor/widgets/CtrlTabButton.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTextButton.xml b/code/studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTextButton.xml
rename to code/studio/src/plugins/gui_editor/widgets/CtrlTextButton.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml b/code/studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml
rename to code/studio/src/plugins/gui_editor/widgets/DBGroupSelectNumber.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewBar.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewBar.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewBar.xml
rename to code/studio/src/plugins/gui_editor/widgets/DBViewBar.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewBar3.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewBar3.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewBar3.xml
rename to code/studio/src/plugins/gui_editor/widgets/DBViewBar3.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewDigit.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewDigit.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewDigit.xml
rename to code/studio/src/plugins/gui_editor/widgets/DBViewDigit.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewNumber.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewNumber.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewNumber.xml
rename to code/studio/src/plugins/gui_editor/widgets/DBViewNumber.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewQuantity.xml b/code/studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/DBViewQuantity.xml
rename to code/studio/src/plugins/gui_editor/widgets/DBViewQuantity.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupCell.xml b/code/studio/src/plugins/gui_editor/widgets/GroupCell.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupCell.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupCell.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupContainer.xml b/code/studio/src/plugins/gui_editor/widgets/GroupContainer.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupContainer.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupContainer.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupEditBox.xml b/code/studio/src/plugins/gui_editor/widgets/GroupEditBox.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupEditBox.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupEditBox.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupFrame.xml b/code/studio/src/plugins/gui_editor/widgets/GroupFrame.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupFrame.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupFrame.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupHTML.xml b/code/studio/src/plugins/gui_editor/widgets/GroupHTML.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupHTML.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupHTML.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupHeader.xml b/code/studio/src/plugins/gui_editor/widgets/GroupHeader.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupHeader.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupHeader.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupList.xml b/code/studio/src/plugins/gui_editor/widgets/GroupList.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupList.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupList.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupMenu.xml b/code/studio/src/plugins/gui_editor/widgets/GroupMenu.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupMenu.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupMenu.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupModal.xml b/code/studio/src/plugins/gui_editor/widgets/GroupModal.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupModal.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupModal.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupParagraph.xml b/code/studio/src/plugins/gui_editor/widgets/GroupParagraph.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupParagraph.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupParagraph.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupScrollText.xml b/code/studio/src/plugins/gui_editor/widgets/GroupScrollText.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupScrollText.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupScrollText.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupTab.xml b/code/studio/src/plugins/gui_editor/widgets/GroupTab.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupTab.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupTab.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupTable.xml b/code/studio/src/plugins/gui_editor/widgets/GroupTable.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupTable.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupTable.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupTree.xml b/code/studio/src/plugins/gui_editor/widgets/GroupTree.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/GroupTree.xml
rename to code/studio/src/plugins/gui_editor/widgets/GroupTree.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/InterfaceElement.xml b/code/studio/src/plugins/gui_editor/widgets/InterfaceElement.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/InterfaceElement.xml
rename to code/studio/src/plugins/gui_editor/widgets/InterfaceElement.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/InterfaceGroup.xml b/code/studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/InterfaceGroup.xml
rename to code/studio/src/plugins/gui_editor/widgets/InterfaceGroup.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml b/code/studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml
rename to code/studio/src/plugins/gui_editor/widgets/InterfaceGroupWheel.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/RootGroup.xml b/code/studio/src/plugins/gui_editor/widgets/RootGroup.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/RootGroup.xml
rename to code/studio/src/plugins/gui_editor/widgets/RootGroup.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewBitmap.xml b/code/studio/src/plugins/gui_editor/widgets/ViewBitmap.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewBitmap.xml
rename to code/studio/src/plugins/gui_editor/widgets/ViewBitmap.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml b/code/studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml
rename to code/studio/src/plugins/gui_editor/widgets/ViewBitmapCombo.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewText.xml b/code/studio/src/plugins/gui_editor/widgets/ViewText.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewText.xml
rename to code/studio/src/plugins/gui_editor/widgets/ViewText.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewTextFormated.xml b/code/studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewTextFormated.xml
rename to code/studio/src/plugins/gui_editor/widgets/ViewTextFormated.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewTextID.xml b/code/studio/src/plugins/gui_editor/widgets/ViewTextID.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewTextID.xml
rename to code/studio/src/plugins/gui_editor/widgets/ViewTextID.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml b/code/studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml
rename to code/studio/src/plugins/gui_editor/widgets/ViewTextIDFormated.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/CMakeLists.txt b/code/studio/src/plugins/landscape_editor/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/CMakeLists.txt
rename to code/studio/src/plugins/landscape_editor/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone.cpp b/code/studio/src/plugins/landscape_editor/builder_zone.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone.cpp
rename to code/studio/src/plugins/landscape_editor/builder_zone.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone.h b/code/studio/src/plugins/landscape_editor/builder_zone.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone.h
rename to code/studio/src/plugins/landscape_editor/builder_zone.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_base.cpp b/code/studio/src/plugins/landscape_editor/builder_zone_base.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_base.cpp
rename to code/studio/src/plugins/landscape_editor/builder_zone_base.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_base.h b/code/studio/src/plugins/landscape_editor/builder_zone_base.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_base.h
rename to code/studio/src/plugins/landscape_editor/builder_zone_base.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.cpp b/code/studio/src/plugins/landscape_editor/builder_zone_region.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.cpp
rename to code/studio/src/plugins/landscape_editor/builder_zone_region.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.h b/code/studio/src/plugins/landscape_editor/builder_zone_region.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.h
rename to code/studio/src/plugins/landscape_editor/builder_zone_region.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_grid.png b/code/studio/src/plugins/landscape_editor/icons/ic_grid.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_grid.png
rename to code/studio/src/plugins/landscape_editor/icons/ic_grid.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_landscape_item.png b/code/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_landscape_item.png
rename to code/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_landscape_settings.png b/code/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_settings.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_landscape_settings.png
rename to code/studio/src/plugins/landscape_editor/icons/ic_nel_landscape_settings.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_transition_land.png b/code/studio/src/plugins/landscape_editor/icons/ic_nel_transition_land.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_transition_land.png
rename to code/studio/src/plugins/landscape_editor/icons/ic_nel_transition_land.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_world_editor.png b/code/studio/src/plugins/landscape_editor/icons/ic_nel_world_editor.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_world_editor.png
rename to code/studio/src/plugins/landscape_editor/icons/ic_nel_world_editor.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_zone.png b/code/studio/src/plugins/landscape_editor/icons/ic_nel_zone.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_zone.png
rename to code/studio/src/plugins/landscape_editor/icons/ic_nel_zone.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_zonel.png b/code/studio/src/plugins/landscape_editor/icons/ic_nel_zonel.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_zonel.png
rename to code/studio/src/plugins/landscape_editor/icons/ic_nel_zonel.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_zones.png b/code/studio/src/plugins/landscape_editor/icons/ic_nel_zones.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_nel_zones.png
rename to code/studio/src/plugins/landscape_editor/icons/ic_nel_zones.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_snapshot.png b/code/studio/src/plugins/landscape_editor/icons/ic_snapshot.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/icons/ic_snapshot.png
rename to code/studio/src/plugins/landscape_editor/icons/ic_snapshot.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_actions.cpp b/code/studio/src/plugins/landscape_editor/landscape_actions.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_actions.cpp
rename to code/studio/src/plugins/landscape_editor/landscape_actions.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_actions.h b/code/studio/src/plugins/landscape_editor/landscape_actions.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_actions.h
rename to code/studio/src/plugins/landscape_editor/landscape_actions.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor.qrc b/code/studio/src/plugins/landscape_editor/landscape_editor.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor.qrc
rename to code/studio/src/plugins/landscape_editor/landscape_editor.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_constants.h b/code/studio/src/plugins/landscape_editor/landscape_editor_constants.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_constants.h
rename to code/studio/src/plugins/landscape_editor/landscape_editor_constants.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_global.h b/code/studio/src/plugins/landscape_editor/landscape_editor_global.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_global.h
rename to code/studio/src/plugins/landscape_editor/landscape_editor_global.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_plugin.cpp b/code/studio/src/plugins/landscape_editor/landscape_editor_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_plugin.cpp
rename to code/studio/src/plugins/landscape_editor/landscape_editor_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_plugin.h b/code/studio/src/plugins/landscape_editor/landscape_editor_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_plugin.h
rename to code/studio/src/plugins/landscape_editor/landscape_editor_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_window.cpp b/code/studio/src/plugins/landscape_editor/landscape_editor_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_window.cpp
rename to code/studio/src/plugins/landscape_editor/landscape_editor_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_window.h b/code/studio/src/plugins/landscape_editor/landscape_editor_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_window.h
rename to code/studio/src/plugins/landscape_editor/landscape_editor_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_window.ui b/code/studio/src/plugins/landscape_editor/landscape_editor_window.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_window.ui
rename to code/studio/src/plugins/landscape_editor/landscape_editor_window.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene.cpp b/code/studio/src/plugins/landscape_editor/landscape_scene.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene.cpp
rename to code/studio/src/plugins/landscape_editor/landscape_scene.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene.h b/code/studio/src/plugins/landscape_editor/landscape_scene.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene.h
rename to code/studio/src/plugins/landscape_editor/landscape_scene.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene_base.cpp b/code/studio/src/plugins/landscape_editor/landscape_scene_base.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene_base.cpp
rename to code/studio/src/plugins/landscape_editor/landscape_scene_base.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene_base.h b/code/studio/src/plugins/landscape_editor/landscape_scene_base.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene_base.h
rename to code/studio/src/plugins/landscape_editor/landscape_scene_base.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_view.cpp b/code/studio/src/plugins/landscape_editor/landscape_view.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_view.cpp
rename to code/studio/src/plugins/landscape_editor/landscape_view.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_view.h b/code/studio/src/plugins/landscape_editor/landscape_view.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_view.h
rename to code/studio/src/plugins/landscape_editor/landscape_view.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.cpp b/code/studio/src/plugins/landscape_editor/list_zones_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.cpp
rename to code/studio/src/plugins/landscape_editor/list_zones_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.h b/code/studio/src/plugins/landscape_editor/list_zones_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.h
rename to code/studio/src/plugins/landscape_editor/list_zones_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.cpp b/code/studio/src/plugins/landscape_editor/list_zones_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.cpp
rename to code/studio/src/plugins/landscape_editor/list_zones_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.h b/code/studio/src/plugins/landscape_editor/list_zones_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.h
rename to code/studio/src/plugins/landscape_editor/list_zones_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.ui b/code/studio/src/plugins/landscape_editor/list_zones_widget.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.ui
rename to code/studio/src/plugins/landscape_editor/list_zones_widget.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/ovqt_plugin_landscape_editor.xml b/code/studio/src/plugins/landscape_editor/ovqt_plugin_landscape_editor.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/ovqt_plugin_landscape_editor.xml
rename to code/studio/src/plugins/landscape_editor/ovqt_plugin_landscape_editor.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.cpp b/code/studio/src/plugins/landscape_editor/pixmap_database.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.cpp
rename to code/studio/src/plugins/landscape_editor/pixmap_database.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.h b/code/studio/src/plugins/landscape_editor/pixmap_database.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.h
rename to code/studio/src/plugins/landscape_editor/pixmap_database.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/project_settings_dialog.cpp b/code/studio/src/plugins/landscape_editor/project_settings_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/project_settings_dialog.cpp
rename to code/studio/src/plugins/landscape_editor/project_settings_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/project_settings_dialog.h b/code/studio/src/plugins/landscape_editor/project_settings_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/project_settings_dialog.h
rename to code/studio/src/plugins/landscape_editor/project_settings_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/project_settings_dialog.ui b/code/studio/src/plugins/landscape_editor/project_settings_dialog.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/project_settings_dialog.ui
rename to code/studio/src/plugins/landscape_editor/project_settings_dialog.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/shapshot_dialog.ui b/code/studio/src/plugins/landscape_editor/shapshot_dialog.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/shapshot_dialog.ui
rename to code/studio/src/plugins/landscape_editor/shapshot_dialog.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/snapshot_dialog.cpp b/code/studio/src/plugins/landscape_editor/snapshot_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/snapshot_dialog.cpp
rename to code/studio/src/plugins/landscape_editor/snapshot_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/snapshot_dialog.h b/code/studio/src/plugins/landscape_editor/snapshot_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/snapshot_dialog.h
rename to code/studio/src/plugins/landscape_editor/snapshot_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/zone_region_editor.cpp b/code/studio/src/plugins/landscape_editor/zone_region_editor.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/zone_region_editor.cpp
rename to code/studio/src/plugins/landscape_editor/zone_region_editor.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/zone_region_editor.h b/code/studio/src/plugins/landscape_editor/zone_region_editor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/zone_region_editor.h
rename to code/studio/src/plugins/landscape_editor/zone_region_editor.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt b/code/studio/src/plugins/log/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt
rename to code/studio/src/plugins/log/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_form.ui b/code/studio/src/plugins/log/log_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_form.ui
rename to code/studio/src/plugins/log/log_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp b/code/studio/src/plugins/log/log_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp
rename to code/studio/src/plugins/log/log_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h b/code/studio/src/plugins/log/log_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h
rename to code/studio/src/plugins/log/log_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.cpp b/code/studio/src/plugins/log/log_settings_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.cpp
rename to code/studio/src/plugins/log/log_settings_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.h b/code/studio/src/plugins/log/log_settings_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.h
rename to code/studio/src/plugins/log/log_settings_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.ui b/code/studio/src/plugins/log/log_settings_page.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.ui
rename to code/studio/src/plugins/log/log_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/ovqt_plugin_log.xml b/code/studio/src/plugins/log/ovqt_plugin_log.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/ovqt_plugin_log.xml
rename to code/studio/src/plugins/log/ovqt_plugin_log.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/qt_displayer.cpp b/code/studio/src/plugins/log/qt_displayer.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/qt_displayer.cpp
rename to code/studio/src/plugins/log/qt_displayer.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/qt_displayer.h b/code/studio/src/plugins/log/qt_displayer.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/log/qt_displayer.h
rename to code/studio/src/plugins/log/qt_displayer.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/CMakeLists.txt b/code/studio/src/plugins/mission_compiler/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/CMakeLists.txt
rename to code/studio/src/plugins/mission_compiler/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/arrow-left-2.png b/code/studio/src/plugins/mission_compiler/images/arrow-left-2.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/arrow-left-2.png
rename to code/studio/src/plugins/mission_compiler/images/arrow-left-2.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/arrow-left-double-2.png b/code/studio/src/plugins/mission_compiler/images/arrow-left-double-2.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/arrow-left-double-2.png
rename to code/studio/src/plugins/mission_compiler/images/arrow-left-double-2.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/arrow-right-2.png b/code/studio/src/plugins/mission_compiler/images/arrow-right-2.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/arrow-right-2.png
rename to code/studio/src/plugins/mission_compiler/images/arrow-right-2.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/arrow-right-double-2.png b/code/studio/src/plugins/mission_compiler/images/arrow-right-double-2.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/arrow-right-double-2.png
rename to code/studio/src/plugins/mission_compiler/images/arrow-right-double-2.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/document-export-4.png b/code/studio/src/plugins/mission_compiler/images/document-export-4.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/document-export-4.png
rename to code/studio/src/plugins/mission_compiler/images/document-export-4.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_add_item.png b/code/studio/src/plugins/mission_compiler/images/ic_nel_add_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_add_item.png
rename to code/studio/src/plugins/mission_compiler/images/ic_nel_add_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_delete_item.png b/code/studio/src/plugins/mission_compiler/images/ic_nel_delete_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_delete_item.png
rename to code/studio/src/plugins/mission_compiler/images/ic_nel_delete_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_down_item.png b/code/studio/src/plugins/mission_compiler/images/ic_nel_down_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_down_item.png
rename to code/studio/src/plugins/mission_compiler/images/ic_nel_down_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_generic_settings.png b/code/studio/src/plugins/mission_compiler/images/ic_nel_generic_settings.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_generic_settings.png
rename to code/studio/src/plugins/mission_compiler/images/ic_nel_generic_settings.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_reset_all.png b/code/studio/src/plugins/mission_compiler/images/ic_nel_reset_all.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_reset_all.png
rename to code/studio/src/plugins/mission_compiler/images/ic_nel_reset_all.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_up_item.png b/code/studio/src/plugins/mission_compiler/images/ic_nel_up_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_up_item.png
rename to code/studio/src/plugins/mission_compiler/images/ic_nel_up_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/news-subscribe-2.png b/code/studio/src/plugins/mission_compiler/images/news-subscribe-2.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/news-subscribe-2.png
rename to code/studio/src/plugins/mission_compiler/images/news-subscribe-2.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/run-build-2.png b/code/studio/src/plugins/mission_compiler/images/run-build-2.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/run-build-2.png
rename to code/studio/src/plugins/mission_compiler/images/run-build-2.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler.qrc b/code/studio/src/plugins/mission_compiler/mission_compiler.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler.qrc
rename to code/studio/src/plugins/mission_compiler/mission_compiler.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp b/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp
rename to code/studio/src/plugins/mission_compiler/mission_compiler_main_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.h b/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.h
rename to code/studio/src/plugins/mission_compiler/mission_compiler_main_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.ui b/code/studio/src/plugins/mission_compiler/mission_compiler_main_window.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.ui
rename to code/studio/src/plugins/mission_compiler/mission_compiler_main_window.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_plugin.cpp b/code/studio/src/plugins/mission_compiler/mission_compiler_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_plugin.cpp
rename to code/studio/src/plugins/mission_compiler/mission_compiler_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_plugin.h b/code/studio/src/plugins/mission_compiler/mission_compiler_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_plugin.h
rename to code/studio/src/plugins/mission_compiler/mission_compiler_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_plugin_constants.h b/code/studio/src/plugins/mission_compiler/mission_compiler_plugin_constants.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_plugin_constants.h
rename to code/studio/src/plugins/mission_compiler/mission_compiler_plugin_constants.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_settings_page.cpp b/code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_settings_page.cpp
rename to code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_settings_page.h b/code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_settings_page.h
rename to code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_settings_page.ui b/code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_settings_page.ui
rename to code/studio/src/plugins/mission_compiler/mission_compiler_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/ovqt_plugin_mission_compiler.xml b/code/studio/src/plugins/mission_compiler/ovqt_plugin_mission_compiler.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/ovqt_plugin_mission_compiler.xml
rename to code/studio/src/plugins/mission_compiler/ovqt_plugin_mission_compiler.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/server_entry_dialog.cpp b/code/studio/src/plugins/mission_compiler/server_entry_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/server_entry_dialog.cpp
rename to code/studio/src/plugins/mission_compiler/server_entry_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/server_entry_dialog.h b/code/studio/src/plugins/mission_compiler/server_entry_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/server_entry_dialog.h
rename to code/studio/src/plugins/mission_compiler/server_entry_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/server_entry_dialog.ui b/code/studio/src/plugins/mission_compiler/server_entry_dialog.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/server_entry_dialog.ui
rename to code/studio/src/plugins/mission_compiler/server_entry_dialog.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/validation_file.cpp b/code/studio/src/plugins/mission_compiler/validation_file.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/validation_file.cpp
rename to code/studio/src/plugins/mission_compiler/validation_file.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/validation_file.h b/code/studio/src/plugins/mission_compiler/validation_file.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/validation_file.h
rename to code/studio/src/plugins/mission_compiler/validation_file.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/CMakeLists.txt b/code/studio/src/plugins/object_viewer/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/CMakeLists.txt
rename to code/studio/src/plugins/object_viewer/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_settings_page.cpp b/code/studio/src/plugins/object_viewer/graphics_settings_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_settings_page.cpp
rename to code/studio/src/plugins/object_viewer/graphics_settings_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_settings_page.h b/code/studio/src/plugins/object_viewer/graphics_settings_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_settings_page.h
rename to code/studio/src/plugins/object_viewer/graphics_settings_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_settings_page.ui b/code/studio/src/plugins/object_viewer/graphics_settings_page.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_settings_page.ui
rename to code/studio/src/plugins/object_viewer/graphics_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_viewport.cpp b/code/studio/src/plugins/object_viewer/graphics_viewport.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_viewport.cpp
rename to code/studio/src/plugins/object_viewer/graphics_viewport.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_viewport.h b/code/studio/src/plugins/object_viewer/graphics_viewport.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/graphics_viewport.h
rename to code/studio/src/plugins/object_viewer/graphics_viewport.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_add_item.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_add_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_add_item.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_add_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_anim.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_anim.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_anim.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_anim.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_animset.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_animset.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_animset.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_animset.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_append_item.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_append_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_append_item.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_append_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_bgcolor.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_bgcolor.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_bgcolor.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_bgcolor.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_camera_3dedit.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_camera_3dedit.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_camera_3dedit.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_camera_3dedit.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_camera_add.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_camera_add.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_camera_add.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_camera_add.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_camera_del.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_camera_del.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_camera_del.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_camera_del.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_camera_fps.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_camera_fps.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_camera_fps.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_camera_fps.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_daynight.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_daynight.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_daynight.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_daynight.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_delete_item.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_delete_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_delete_item.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_delete_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_down_item.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_down_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_down_item.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_down_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_framedelay.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_framedelay.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_framedelay.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_framedelay.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_insert_item.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_insert_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_insert_item.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_insert_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_mixer.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_mixer.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_mixer.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_mixer.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_mrm_mesh.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_mrm_mesh.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_mrm_mesh.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_mrm_mesh.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_new.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_new.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_new.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_new.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_open.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_open.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_open.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_open.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_particle_system.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_particle_system.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_particle_system.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_particle_system.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_particle_system_close.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_particle_system_close.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_particle_system_close.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_particle_system_close.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_particles.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_particles.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_particles.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_particles.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_pill.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_pill.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/core/icons/ic_nel_pill.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_pill.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_reset_all.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_reset_all.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_reset_all.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_reset_all.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_reset_camera.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_reset_camera.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_reset_camera.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_reset_camera.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_save.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_save.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_save.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_save.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_save_as.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_save_as.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_save_as.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_save_as.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_skelscale.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_skelscale.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_skelscale.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_skelscale.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_sound.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_sound.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_sound.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_sound.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_up_item.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_up_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/images/ic_nel_up_item.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_up_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_veget.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_veget.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_veget.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_veget.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_vegetset.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_vegetset.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_vegetset.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_vegetset.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_water.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_water.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_water.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_water.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_wind.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_wind.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_wind.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_wind.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_workspace_item.png b/code/studio/src/plugins/object_viewer/icons/ic_nel_workspace_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_workspace_item.png
rename to code/studio/src/plugins/object_viewer/icons/ic_nel_workspace_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_collision_zone_item_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_collision_zone_item_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_collision_zone_item_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_collision_zone_item_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_emitter_item_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_emitter_item_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_emitter_item_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_emitter_item_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_force_item_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_force_item_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_force_item_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_force_item_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_instance_item_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_instance_item_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_instance_item_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_instance_item_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_light_item_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_light_item_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_light_item_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_light_item_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_located_item_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_located_item_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_located_item_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_located_item_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_item_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_item_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_item_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_item_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_close_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_close_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_close_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_particle_system_close_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_sound_item_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_sound_item_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_sound_item_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_sound_item_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_workspace_item_24.png b/code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_workspace_item_24.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/particles_system_24/ic_nel_workspace_item_24.png
rename to code/studio/src/plugins/object_viewer/icons/particles_system_24/ic_nel_workspace_item_24.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/dqynight.png b/code/studio/src/plugins/object_viewer/images/dqynight.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/dqynight.png
rename to code/studio/src/plugins/object_viewer/images/dqynight.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_mrm_mesh.png b/code/studio/src/plugins/object_viewer/images/ico_mrm_mesh.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/ico_mrm_mesh.png
rename to code/studio/src/plugins/object_viewer/images/ico_mrm_mesh.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/mixer.png b/code/studio/src/plugins/object_viewer/images/mixer.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/mixer.png
rename to code/studio/src/plugins/object_viewer/images/mixer.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/images/nel.png b/code/studio/src/plugins/object_viewer/images/nel.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/core/images/nel.png
rename to code/studio/src/plugins/object_viewer/images/nel.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/pause.png b/code/studio/src/plugins/object_viewer/images/pause.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/pause.png
rename to code/studio/src/plugins/object_viewer/images/pause.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/play.png b/code/studio/src/plugins/object_viewer/images/play.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/play.png
rename to code/studio/src/plugins/object_viewer/images/play.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/polymode.png b/code/studio/src/plugins/object_viewer/images/polymode.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/polymode.png
rename to code/studio/src/plugins/object_viewer/images/polymode.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/pqrticles.png b/code/studio/src/plugins/object_viewer/images/pqrticles.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/pqrticles.png
rename to code/studio/src/plugins/object_viewer/images/pqrticles.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/refresh.png b/code/studio/src/plugins/object_viewer/images/refresh.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/refresh.png
rename to code/studio/src/plugins/object_viewer/images/refresh.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmfill.png b/code/studio/src/plugins/object_viewer/images/rmfill.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmfill.png
rename to code/studio/src/plugins/object_viewer/images/rmfill.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmline.png b/code/studio/src/plugins/object_viewer/images/rmline.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmline.png
rename to code/studio/src/plugins/object_viewer/images/rmline.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmpoints.png b/code/studio/src/plugins/object_viewer/images/rmpoints.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/rmpoints.png
rename to code/studio/src/plugins/object_viewer/images/rmpoints.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/seek-backward.png b/code/studio/src/plugins/object_viewer/images/seek-backward.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/seek-backward.png
rename to code/studio/src/plugins/object_viewer/images/seek-backward.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/seek-forward.png b/code/studio/src/plugins/object_viewer/images/seek-forward.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/seek-forward.png
rename to code/studio/src/plugins/object_viewer/images/seek-forward.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/skip-backward.png b/code/studio/src/plugins/object_viewer/images/skip-backward.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/skip-backward.png
rename to code/studio/src/plugins/object_viewer/images/skip-backward.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/skip-forward.png b/code/studio/src/plugins/object_viewer/images/skip-forward.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/skip-forward.png
rename to code/studio/src/plugins/object_viewer/images/skip-forward.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/sound.png b/code/studio/src/plugins/object_viewer/images/sound.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/sound.png
rename to code/studio/src/plugins/object_viewer/images/sound.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/stop.png b/code/studio/src/plugins/object_viewer/images/stop.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/stop.png
rename to code/studio/src/plugins/object_viewer/images/stop.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/water.png b/code/studio/src/plugins/object_viewer/images/water.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/water.png
rename to code/studio/src/plugins/object_viewer/images/water.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/wind.png b/code/studio/src/plugins/object_viewer/images/wind.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/wind.png
rename to code/studio/src/plugins/object_viewer/images/wind.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.cpp b/code/studio/src/plugins/object_viewer/main_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.cpp
rename to code/studio/src/plugins/object_viewer/main_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.h b/code/studio/src/plugins/object_viewer/main_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.h
rename to code/studio/src/plugins/object_viewer/main_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.cpp b/code/studio/src/plugins/object_viewer/modules.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.cpp
rename to code/studio/src/plugins/object_viewer/modules.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.h b/code/studio/src/plugins/object_viewer/modules.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/modules.h
rename to code/studio/src/plugins/object_viewer/modules.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.cpp b/code/studio/src/plugins/object_viewer/object_viewer.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.cpp
rename to code/studio/src/plugins/object_viewer/object_viewer.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.h b/code/studio/src/plugins/object_viewer/object_viewer.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.h
rename to code/studio/src/plugins/object_viewer/object_viewer.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.qrc b/code/studio/src/plugins/object_viewer/object_viewer.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer.qrc
rename to code/studio/src/plugins/object_viewer/object_viewer.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_constants.h b/code/studio/src/plugins/object_viewer/object_viewer_constants.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_constants.h
rename to code/studio/src/plugins/object_viewer/object_viewer_constants.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.cpp b/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.cpp
rename to code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.h b/code/studio/src/plugins/object_viewer/object_viewer_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/object_viewer_plugin.h
rename to code/studio/src/plugins/object_viewer/object_viewer_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ovqt_plugin_object_viewer.xml b/code/studio/src/plugins/object_viewer/ovqt_plugin_object_viewer.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/ovqt_plugin_object_viewer.xml
rename to code/studio/src/plugins/object_viewer/ovqt_plugin_object_viewer.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/attrib_form.ui b/code/studio/src/plugins/object_viewer/particle_system/attrib_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/attrib_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/attrib_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/attrib_widget.cpp b/code/studio/src/plugins/object_viewer/particle_system/attrib_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/attrib_widget.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/attrib_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/attrib_widget.h b/code/studio/src/plugins/object_viewer/particle_system/attrib_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/attrib_widget.h
rename to code/studio/src/plugins/object_viewer/particle_system/attrib_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/auto_lod_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/auto_lod_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/auto_lod_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/auto_lod_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/auto_lod_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/auto_lod_form.ui b/code/studio/src/plugins/object_viewer/particle_system/auto_lod_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/auto_lod_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/auto_lod_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_form.ui b/code/studio/src/plugins/object_viewer/particle_system/basic_edit_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/basic_edit_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp b/code/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_widget.h b/code/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_widget.h
rename to code/studio/src/plugins/object_viewer/particle_system/basic_edit_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/bin_op_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/bin_op_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/bin_op_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/bin_op_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/bin_op_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/constraint_mesh_form.ui b/code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/constraint_mesh_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/constraint_mesh_widget.cpp b/code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/constraint_mesh_widget.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/constraint_mesh_widget.h b/code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/constraint_mesh_widget.h
rename to code/studio/src/plugins/object_viewer/particle_system/constraint_mesh_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/curve_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/curve_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/curve_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/curve_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/curve_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/curve_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/curve_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/curve_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/curve_form.ui b/code/studio/src/plugins/object_viewer/particle_system/curve_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/curve_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/curve_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/direction_form.ui b/code/studio/src/plugins/object_viewer/particle_system/direction_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/direction_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/direction_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/direction_widget.cpp b/code/studio/src/plugins/object_viewer/particle_system/direction_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/direction_widget.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/direction_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/direction_widget.h b/code/studio/src/plugins/object_viewer/particle_system/direction_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/direction_widget.h
rename to code/studio/src/plugins/object_viewer/particle_system/direction_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/dup_ps.cpp b/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/dup_ps.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/dup_ps.h b/code/studio/src/plugins/object_viewer/particle_system/dup_ps.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/dup_ps.h
rename to code/studio/src/plugins/object_viewer/particle_system/dup_ps.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/emitter_form.ui b/code/studio/src/plugins/object_viewer/particle_system/emitter_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/emitter_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/emitter_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/emitter_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/emitter_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/emitter_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/emitter_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/emitter_page.h b/code/studio/src/plugins/object_viewer/particle_system/emitter_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/emitter_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/emitter_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/follow_path_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/follow_path_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/follow_path_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/follow_path_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/follow_path_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_form.ui b/code/studio/src/plugins/object_viewer/particle_system/located_bindable_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/located_bindable_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/located_bindable_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/located_bindable_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.h b/code/studio/src/plugins/object_viewer/particle_system/located_bindable_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/located_bindable_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_form.ui b/code/studio/src/plugins/object_viewer/particle_system/located_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/located_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/located_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/located_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_page.h b/code/studio/src/plugins/object_viewer/particle_system/located_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/located_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/mesh_form.ui b/code/studio/src/plugins/object_viewer/particle_system/mesh_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/mesh_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/mesh_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/mesh_widget.cpp b/code/studio/src/plugins/object_viewer/particle_system/mesh_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/mesh_widget.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/mesh_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/mesh_widget.h b/code/studio/src/plugins/object_viewer/particle_system/mesh_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/mesh_widget.h
rename to code/studio/src/plugins/object_viewer/particle_system/mesh_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/morph_mesh_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/morph_mesh_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/morph_mesh_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/morph_mesh_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/morph_mesh_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/morph_mesh_form.ui b/code/studio/src/plugins/object_viewer/particle_system/morph_mesh_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/morph_mesh_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/morph_mesh_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/multi_tex_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/multi_tex_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/multi_tex_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/multi_tex_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/multi_tex_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/multi_tex_form.ui b/code/studio/src/plugins/object_viewer/particle_system/multi_tex_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/multi_tex_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/multi_tex_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_control_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_control_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_control_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_control_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_control_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_control_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_control_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_control_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_control_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_editor.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_editor.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_editor.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_editor.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_editor.h b/code/studio/src/plugins/object_viewer/particle_system/particle_editor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_editor.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_editor.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_force_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_force_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_force_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_force_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_force_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_force_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_force_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_force_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_force_page.h b/code/studio/src/plugins/object_viewer/particle_system/particle_force_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_force_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_force_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_light_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_light_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_light_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_light_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_light_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_light_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_light_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_light_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_light_page.h b/code/studio/src/plugins/object_viewer/particle_system/particle_light_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_light_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_light_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_link_skeleton_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_link_skeleton_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_link_skeleton_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_node.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_node.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_node.h b/code/studio/src/plugins/object_viewer/particle_system/particle_node.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_node.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_node.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_property_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_property_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_property_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_property_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_property_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_sound_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_sound_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_sound_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_sound_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_sound_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_sound_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_sound_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_sound_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_sound_page.h b/code/studio/src/plugins/object_viewer/particle_system/particle_sound_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_sound_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_sound_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_system_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_system_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_system_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_system_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_system_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_system_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_system_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_system_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_system_page.h b/code/studio/src/plugins/object_viewer/particle_system/particle_system_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_system_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_system_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_anim_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_anim_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.h b/code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_texture_anim_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_texture_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_texture_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_widget.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_widget.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_widget.h b/code/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_texture_widget.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_texture_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_tree_model.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_tree_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_tree_model.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_tree_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_tree_model.h b/code/studio/src/plugins/object_viewer/particle_system/particle_tree_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_tree_model.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_tree_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_workspace_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_workspace_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_page.h b/code/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_workspace_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_workspace_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_zone_form.ui b/code/studio/src/plugins/object_viewer/particle_system/particle_zone_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_zone_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/particle_zone_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_zone_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_zone_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_zone_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/particle_zone_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_zone_page.h b/code/studio/src/plugins/object_viewer/particle_system/particle_zone_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_zone_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/particle_zone_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_initial_pos.cpp b/code/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_initial_pos.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_initial_pos.h b/code/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_initial_pos.h
rename to code/studio/src/plugins/object_viewer/particle_system/ps_initial_pos.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_mover_form.ui b/code/studio/src/plugins/object_viewer/particle_system/ps_mover_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_mover_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/ps_mover_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_mover_page.cpp b/code/studio/src/plugins/object_viewer/particle_system/ps_mover_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_mover_page.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/ps_mover_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_mover_page.h b/code/studio/src/plugins/object_viewer/particle_system/ps_mover_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_mover_page.h
rename to code/studio/src/plugins/object_viewer/particle_system/ps_mover_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_wrapper.h b/code/studio/src/plugins/object_viewer/particle_system/ps_wrapper.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/ps_wrapper.h
rename to code/studio/src/plugins/object_viewer/particle_system/ps_wrapper.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_bank_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_bank_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_bank_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_bank_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/scheme_bank_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_bank_form.ui b/code/studio/src/plugins/object_viewer/particle_system/scheme_bank_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_bank_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/scheme_bank_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_manager.cpp b/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_manager.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_manager.h b/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/scheme_manager.h
rename to code/studio/src/plugins/object_viewer/particle_system/scheme_manager.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/spinner_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/spinner_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/spinner_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/spinner_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/spinner_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/spinner_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/spinner_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/spinner_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/tail_form.ui b/code/studio/src/plugins/object_viewer/particle_system/tail_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/tail_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/tail_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/tail_particle_widget.cpp b/code/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/tail_particle_widget.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/tail_particle_widget.h b/code/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/tail_particle_widget.h
rename to code/studio/src/plugins/object_viewer/particle_system/tail_particle_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_blender_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_blender_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_blender_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_blender_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/value_blender_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/value_from_emitter_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_gradient_dialog.cpp b/code/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_gradient_dialog.cpp
rename to code/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_gradient_dialog.h b/code/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_gradient_dialog.h
rename to code/studio/src/plugins/object_viewer/particle_system/value_gradient_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_gradient_form.ui b/code/studio/src/plugins/object_viewer/particle_system/value_gradient_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/value_gradient_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/value_gradient_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/workspace_form.ui b/code/studio/src/plugins/object_viewer/particle_system/workspace_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/workspace_form.ui
rename to code/studio/src/plugins/object_viewer/particle_system/workspace_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/animation_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/animation_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_dialog.h b/code/studio/src/plugins/object_viewer/scene/animation_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/animation_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_form.ui b/code/studio/src/plugins/object_viewer/scene/animation_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_form.ui
rename to code/studio/src/plugins/object_viewer/scene/animation_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_set_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/animation_set_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_set_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/animation_set_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_set_dialog.h b/code/studio/src/plugins/object_viewer/scene/animation_set_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_set_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/animation_set_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_set_form.ui b/code/studio/src/plugins/object_viewer/scene/animation_set_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/animation_set_form.ui
rename to code/studio/src/plugins/object_viewer/scene/animation_set_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/camera_control.cpp b/code/studio/src/plugins/object_viewer/scene/camera_control.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/camera_control.cpp
rename to code/studio/src/plugins/object_viewer/scene/camera_control.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/camera_control.h b/code/studio/src/plugins/object_viewer/scene/camera_control.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/camera_control.h
rename to code/studio/src/plugins/object_viewer/scene/camera_control.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/day_night_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/day_night_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/day_night_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/day_night_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/day_night_dialog.h b/code/studio/src/plugins/object_viewer/scene/day_night_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/day_night_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/day_night_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/day_night_form.ui b/code/studio/src/plugins/object_viewer/scene/day_night_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/day_night_form.ui
rename to code/studio/src/plugins/object_viewer/scene/day_night_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/entity.cpp b/code/studio/src/plugins/object_viewer/scene/entity.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/entity.cpp
rename to code/studio/src/plugins/object_viewer/scene/entity.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/entity.h b/code/studio/src/plugins/object_viewer/scene/entity.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/entity.h
rename to code/studio/src/plugins/object_viewer/scene/entity.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/global_wind_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/global_wind_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/global_wind_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/global_wind_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/global_wind_dialog.h b/code/studio/src/plugins/object_viewer/scene/global_wind_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/global_wind_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/global_wind_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/global_wind_form.ui b/code/studio/src/plugins/object_viewer/scene/global_wind_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/global_wind_form.ui
rename to code/studio/src/plugins/object_viewer/scene/global_wind_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/setup_fog_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/setup_fog_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/setup_fog_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/setup_fog_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/setup_fog_dialog.h b/code/studio/src/plugins/object_viewer/scene/setup_fog_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/setup_fog_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/setup_fog_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/setup_fog_form.ui b/code/studio/src/plugins/object_viewer/scene/setup_fog_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/setup_fog_form.ui
rename to code/studio/src/plugins/object_viewer/scene/setup_fog_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_scale_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_scale_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_scale_dialog.h b/code/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_scale_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/skeleton_scale_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_scale_form.ui b/code/studio/src/plugins/object_viewer/scene/skeleton_scale_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_scale_form.ui
rename to code/studio/src/plugins/object_viewer/scene/skeleton_scale_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_tree_model.cpp b/code/studio/src/plugins/object_viewer/scene/skeleton_tree_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_tree_model.cpp
rename to code/studio/src/plugins/object_viewer/scene/skeleton_tree_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_tree_model.h b/code/studio/src/plugins/object_viewer/scene/skeleton_tree_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/skeleton_tree_model.h
rename to code/studio/src/plugins/object_viewer/scene/skeleton_tree_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/slot_form.ui b/code/studio/src/plugins/object_viewer/scene/slot_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/slot_form.ui
rename to code/studio/src/plugins/object_viewer/scene/slot_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/slot_manager_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/slot_manager_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/slot_manager_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/slot_manager_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/slot_manager_dialog.h b/code/studio/src/plugins/object_viewer/scene/slot_manager_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/slot_manager_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/slot_manager_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/sun_color_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/sun_color_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/sun_color_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/sun_color_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/sun_color_dialog.h b/code/studio/src/plugins/object_viewer/scene/sun_color_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/sun_color_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/sun_color_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/sun_color_form.ui b/code/studio/src/plugins/object_viewer/scene/sun_color_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/sun_color_form.ui
rename to code/studio/src/plugins/object_viewer/scene/sun_color_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_mrm_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_mrm_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_mrm_dialog.h b/code/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_mrm_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/tune_mrm_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_mrm_form.ui b/code/studio/src/plugins/object_viewer/scene/tune_mrm_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_mrm_form.ui
rename to code/studio/src/plugins/object_viewer/scene/tune_mrm_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_timer_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/tune_timer_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_timer_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/tune_timer_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_timer_dialog.h b/code/studio/src/plugins/object_viewer/scene/tune_timer_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_timer_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/tune_timer_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_timer_form.ui b/code/studio/src/plugins/object_viewer/scene/tune_timer_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/tune_timer_form.ui
rename to code/studio/src/plugins/object_viewer/scene/tune_timer_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/water_pool_dialog.cpp b/code/studio/src/plugins/object_viewer/scene/water_pool_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/water_pool_dialog.cpp
rename to code/studio/src/plugins/object_viewer/scene/water_pool_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/water_pool_dialog.h b/code/studio/src/plugins/object_viewer/scene/water_pool_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/water_pool_dialog.h
rename to code/studio/src/plugins/object_viewer/scene/water_pool_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/water_pool_form.ui b/code/studio/src/plugins/object_viewer/scene/water_pool_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/scene/water_pool_form.ui
rename to code/studio/src/plugins/object_viewer/scene/water_pool_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_settings_page.cpp b/code/studio/src/plugins/object_viewer/sound_settings_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_settings_page.cpp
rename to code/studio/src/plugins/object_viewer/sound_settings_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_settings_page.h b/code/studio/src/plugins/object_viewer/sound_settings_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_settings_page.h
rename to code/studio/src/plugins/object_viewer/sound_settings_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_settings_page.ui b/code/studio/src/plugins/object_viewer/sound_settings_page.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_settings_page.ui
rename to code/studio/src/plugins/object_viewer/sound_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_system.cpp b/code/studio/src/plugins/object_viewer/sound_system.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_system.cpp
rename to code/studio/src/plugins/object_viewer/sound_system.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_system.h b/code/studio/src/plugins/object_viewer/sound_system.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/sound_system.h
rename to code/studio/src/plugins/object_viewer/sound_system.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/stdpch.cpp b/code/studio/src/plugins/object_viewer/stdpch.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/stdpch.cpp
rename to code/studio/src/plugins/object_viewer/stdpch.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/stdpch.h b/code/studio/src/plugins/object_viewer/stdpch.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/stdpch.h
rename to code/studio/src/plugins/object_viewer/stdpch.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_appearance_page.cpp b/code/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_appearance_page.cpp
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_appearance_page.h b/code/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_appearance_page.h
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_appearance_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_apperance_form.ui b/code/studio/src/plugins/object_viewer/vegetable/vegetable_apperance_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_apperance_form.ui
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_apperance_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_density_form.ui b/code/studio/src/plugins/object_viewer/vegetable/vegetable_density_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_density_form.ui
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_density_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_density_page.cpp b/code/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_density_page.cpp
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_density_page.h b/code/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_density_page.h
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_density_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_dialog.cpp b/code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_dialog.cpp
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_dialog.h b/code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_dialog.h
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_dialog_form.ui b/code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_dialog_form.ui
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_dialog_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_editor.cpp b/code/studio/src/plugins/object_viewer/vegetable/vegetable_editor.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_editor.cpp
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_editor.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_editor.h b/code/studio/src/plugins/object_viewer/vegetable/vegetable_editor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_editor.h
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_editor.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_landscape_form.ui b/code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_landscape_form.ui
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_landscape_page.cpp b/code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_landscape_page.cpp
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_landscape_page.h b/code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_landscape_page.h
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_landscape_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_node.cpp b/code/studio/src/plugins/object_viewer/vegetable/vegetable_node.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_node.cpp
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_node.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_node.h b/code/studio/src/plugins/object_viewer/vegetable/vegetable_node.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_node.h
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_node.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_noise_value_form.ui b/code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_noise_value_form.ui
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.cpp b/code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.cpp
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.h b/code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.h
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_noise_value_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_rotate_form.ui b/code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_rotate_form.ui
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_rotate_page.cpp b/code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_rotate_page.cpp
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_rotate_page.h b/code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_rotate_page.h
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_rotate_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_scale_form.ui b/code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_scale_form.ui
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_scale_page.cpp b/code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_scale_page.cpp
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_scale_page.h b/code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable/vegetable_scale_page.h
rename to code/studio/src/plugins/object_viewer/vegetable/vegetable_scale_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_settings_page.cpp b/code/studio/src/plugins/object_viewer/vegetable_settings_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_settings_page.cpp
rename to code/studio/src/plugins/object_viewer/vegetable_settings_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_settings_page.h b/code/studio/src/plugins/object_viewer/vegetable_settings_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_settings_page.h
rename to code/studio/src/plugins/object_viewer/vegetable_settings_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_settings_page.ui b/code/studio/src/plugins/object_viewer/vegetable_settings_page.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/vegetable_settings_page.ui
rename to code/studio/src/plugins/object_viewer/vegetable_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/color_edit_form.ui b/code/studio/src/plugins/object_viewer/widgets/color_edit_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/color_edit_form.ui
rename to code/studio/src/plugins/object_viewer/widgets/color_edit_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/color_edit_widget.cpp b/code/studio/src/plugins/object_viewer/widgets/color_edit_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/color_edit_widget.cpp
rename to code/studio/src/plugins/object_viewer/widgets/color_edit_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/color_edit_widget.h b/code/studio/src/plugins/object_viewer/widgets/color_edit_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/color_edit_widget.h
rename to code/studio/src/plugins/object_viewer/widgets/color_edit_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_float_form.ui b/code/studio/src/plugins/object_viewer/widgets/edit_range_float_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_float_form.ui
rename to code/studio/src/plugins/object_viewer/widgets/edit_range_float_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_uint_form.ui b/code/studio/src/plugins/object_viewer/widgets/edit_range_uint_form.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_uint_form.ui
rename to code/studio/src/plugins/object_viewer/widgets/edit_range_uint_form.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.cpp b/code/studio/src/plugins/object_viewer/widgets/edit_range_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.cpp
rename to code/studio/src/plugins/object_viewer/widgets/edit_range_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h b/code/studio/src/plugins/object_viewer/widgets/edit_range_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h
rename to code/studio/src/plugins/object_viewer/widgets/edit_range_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/hoverpoints.cpp b/code/studio/src/plugins/object_viewer/widgets/hoverpoints.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/hoverpoints.cpp
rename to code/studio/src/plugins/object_viewer/widgets/hoverpoints.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/hoverpoints.h b/code/studio/src/plugins/object_viewer/widgets/hoverpoints.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/hoverpoints.h
rename to code/studio/src/plugins/object_viewer/widgets/hoverpoints.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/CMakeLists.txt b/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/CMakeLists.txt
rename to code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_plugin_sheet_builder.xml b/code/studio/src/plugins/ovqt_sheet_builder/ovqt_plugin_sheet_builder.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_plugin_sheet_builder.xml
rename to code/studio/src/plugins/ovqt_sheet_builder/ovqt_plugin_sheet_builder.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp b/code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp
rename to code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h b/code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h
rename to code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.pro b/code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.pro
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.pro
rename to code/studio/src/plugins/ovqt_sheet_builder/ovqt_sheet_builder.pro
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilder.h b/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilder.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilder.h
rename to code/studio/src/plugins/ovqt_sheet_builder/sheetbuilder.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.cpp b/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.cpp
rename to code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.h b/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.h
rename to code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderconfgdialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp b/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp
rename to code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.h b/code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.h
rename to code/studio/src/plugins/ovqt_sheet_builder/sheetbuilderdialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/CMakeLists.txt b/code/studio/src/plugins/tile_editor/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/CMakeLists.txt
rename to code/studio/src/plugins/tile_editor/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/add_tile.png b/code/studio/src/plugins/tile_editor/images/add_tile.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/add_tile.png
rename to code/studio/src/plugins/tile_editor/images/add_tile.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/delete_image.png b/code/studio/src/plugins/tile_editor/images/delete_image.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/delete_image.png
rename to code/studio/src/plugins/tile_editor/images/delete_image.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/delete_tile.png b/code/studio/src/plugins/tile_editor/images/delete_tile.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/delete_tile.png
rename to code/studio/src/plugins/tile_editor/images/delete_tile.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/down.png b/code/studio/src/plugins/tile_editor/images/down.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/down.png
rename to code/studio/src/plugins/tile_editor/images/down.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/empty_image.png b/code/studio/src/plugins/tile_editor/images/empty_image.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/empty_image.png
rename to code/studio/src/plugins/tile_editor/images/empty_image.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_add_item.png b/code/studio/src/plugins/tile_editor/images/ic_nel_add_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_add_item.png
rename to code/studio/src/plugins/tile_editor/images/ic_nel_add_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_delete_item.png b/code/studio/src/plugins/tile_editor/images/ic_nel_delete_item.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_delete_item.png
rename to code/studio/src/plugins/tile_editor/images/ic_nel_delete_item.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_new.png b/code/studio/src/plugins/tile_editor/images/ic_nel_new.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_new.png
rename to code/studio/src/plugins/tile_editor/images/ic_nel_new.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_open.png b/code/studio/src/plugins/tile_editor/images/ic_nel_open.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/icons/ic_nel_open.png
rename to code/studio/src/plugins/tile_editor/images/ic_nel_open.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_save.png b/code/studio/src/plugins/tile_editor/images/ic_nel_save.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_save.png
rename to code/studio/src/plugins/tile_editor/images/ic_nel_save.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_save_as.png b/code/studio/src/plugins/tile_editor/images/ic_nel_save_as.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/ic_nel_save_as.png
rename to code/studio/src/plugins/tile_editor/images/ic_nel_save_as.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/left.png b/code/studio/src/plugins/tile_editor/images/left.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/left.png
rename to code/studio/src/plugins/tile_editor/images/left.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/nel.png b/code/studio/src/plugins/tile_editor/images/nel.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/images/nel.png
rename to code/studio/src/plugins/tile_editor/images/nel.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/replace_image.png b/code/studio/src/plugins/tile_editor/images/replace_image.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/replace_image.png
rename to code/studio/src/plugins/tile_editor/images/replace_image.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/reset.png b/code/studio/src/plugins/tile_editor/images/reset.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/reset.png
rename to code/studio/src/plugins/tile_editor/images/reset.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/right.png b/code/studio/src/plugins/tile_editor/images/right.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/right.png
rename to code/studio/src/plugins/tile_editor/images/right.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/rotation0.png b/code/studio/src/plugins/tile_editor/images/rotation0.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/rotation0.png
rename to code/studio/src/plugins/tile_editor/images/rotation0.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/rotation180.png b/code/studio/src/plugins/tile_editor/images/rotation180.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/rotation180.png
rename to code/studio/src/plugins/tile_editor/images/rotation180.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/rotation270.png b/code/studio/src/plugins/tile_editor/images/rotation270.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/rotation270.png
rename to code/studio/src/plugins/tile_editor/images/rotation270.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/rotation90.png b/code/studio/src/plugins/tile_editor/images/rotation90.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/rotation90.png
rename to code/studio/src/plugins/tile_editor/images/rotation90.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/up.png b/code/studio/src/plugins/tile_editor/images/up.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/images/up.png
rename to code/studio/src/plugins/tile_editor/images/up.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/ovqt_plugin_tile_editor.xml b/code/studio/src/plugins/tile_editor/ovqt_plugin_tile_editor.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/ovqt_plugin_tile_editor.xml
rename to code/studio/src/plugins/tile_editor/ovqt_plugin_tile_editor.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor.qrc b/code/studio/src/plugins/tile_editor/tile_editor.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor.qrc
rename to code/studio/src/plugins/tile_editor/tile_editor.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_main_window.cpp b/code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_main_window.cpp
rename to code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_main_window.h b/code/studio/src/plugins/tile_editor/tile_editor_main_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_main_window.h
rename to code/studio/src/plugins/tile_editor/tile_editor_main_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_main_window.ui b/code/studio/src/plugins/tile_editor/tile_editor_main_window.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_main_window.ui
rename to code/studio/src/plugins/tile_editor/tile_editor_main_window.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_plugin.cpp b/code/studio/src/plugins/tile_editor/tile_editor_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_plugin.cpp
rename to code/studio/src/plugins/tile_editor/tile_editor_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_plugin.h b/code/studio/src/plugins/tile_editor/tile_editor_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_plugin.h
rename to code/studio/src/plugins/tile_editor/tile_editor_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_item.cpp b/code/studio/src/plugins/tile_editor/tile_item.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_item.cpp
rename to code/studio/src/plugins/tile_editor/tile_item.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_item.h b/code/studio/src/plugins/tile_editor/tile_item.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_item.h
rename to code/studio/src/plugins/tile_editor/tile_item.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_item_delegate.cpp b/code/studio/src/plugins/tile_editor/tile_item_delegate.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_item_delegate.cpp
rename to code/studio/src/plugins/tile_editor/tile_item_delegate.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_item_delegate.h b/code/studio/src/plugins/tile_editor/tile_item_delegate.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_item_delegate.h
rename to code/studio/src/plugins/tile_editor/tile_item_delegate.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_model.cpp b/code/studio/src/plugins/tile_editor/tile_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_model.cpp
rename to code/studio/src/plugins/tile_editor/tile_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_model.h b/code/studio/src/plugins/tile_editor/tile_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_model.h
rename to code/studio/src/plugins/tile_editor/tile_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/CMakeLists.txt b/code/studio/src/plugins/translation_manager/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/CMakeLists.txt
rename to code/studio/src/plugins/translation_manager/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/README b/code/studio/src/plugins/translation_manager/README
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/README
rename to code/studio/src/plugins/translation_manager/README
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_phrase.cpp b/code/studio/src/plugins/translation_manager/editor_phrase.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_phrase.cpp
rename to code/studio/src/plugins/translation_manager/editor_phrase.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_phrase.h b/code/studio/src/plugins/translation_manager/editor_phrase.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_phrase.h
rename to code/studio/src/plugins/translation_manager/editor_phrase.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp b/code/studio/src/plugins/translation_manager/editor_worksheet.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp
rename to code/studio/src/plugins/translation_manager/editor_worksheet.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.h b/code/studio/src/plugins/translation_manager/editor_worksheet.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.h
rename to code/studio/src/plugins/translation_manager/editor_worksheet.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_bot_names.cpp b/code/studio/src/plugins/translation_manager/extract_bot_names.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_bot_names.cpp
rename to code/studio/src/plugins/translation_manager/extract_bot_names.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_bot_names.h b/code/studio/src/plugins/translation_manager/extract_bot_names.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_bot_names.h
rename to code/studio/src/plugins/translation_manager/extract_bot_names.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.cpp b/code/studio/src/plugins/translation_manager/extract_new_sheet_names.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.cpp
rename to code/studio/src/plugins/translation_manager/extract_new_sheet_names.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.h b/code/studio/src/plugins/translation_manager/extract_new_sheet_names.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.h
rename to code/studio/src/plugins/translation_manager/extract_new_sheet_names.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.cpp b/code/studio/src/plugins/translation_manager/ftp_selection.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.cpp
rename to code/studio/src/plugins/translation_manager/ftp_selection.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.h b/code/studio/src/plugins/translation_manager/ftp_selection.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.h
rename to code/studio/src/plugins/translation_manager/ftp_selection.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.qrc b/code/studio/src/plugins/translation_manager/ftp_selection.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.qrc
rename to code/studio/src/plugins/translation_manager/ftp_selection.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.ui b/code/studio/src/plugins/translation_manager/ftp_selection.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.ui
rename to code/studio/src/plugins/translation_manager/ftp_selection.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/images/cdtoparent.png b/code/studio/src/plugins/translation_manager/images/cdtoparent.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/images/cdtoparent.png
rename to code/studio/src/plugins/translation_manager/images/cdtoparent.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/images/dir.png b/code/studio/src/plugins/translation_manager/images/dir.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/images/dir.png
rename to code/studio/src/plugins/translation_manager/images/dir.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/images/file.png b/code/studio/src/plugins/translation_manager/images/file.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/images/file.png
rename to code/studio/src/plugins/translation_manager/images/file.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ovqt_plugin_translation_manager.xml b/code/studio/src/plugins/translation_manager/ovqt_plugin_translation_manager.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ovqt_plugin_translation_manager.xml
rename to code/studio/src/plugins/translation_manager/ovqt_plugin_translation_manager.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/source_selection.cpp b/code/studio/src/plugins/translation_manager/source_selection.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/source_selection.cpp
rename to code/studio/src/plugins/translation_manager/source_selection.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/source_selection.h b/code/studio/src/plugins/translation_manager/source_selection.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/source_selection.h
rename to code/studio/src/plugins/translation_manager/source_selection.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/source_selection.ui b/code/studio/src/plugins/translation_manager/source_selection.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/source_selection.ui
rename to code/studio/src/plugins/translation_manager/source_selection.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_constants.h b/code/studio/src/plugins/translation_manager/translation_manager_constants.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_constants.h
rename to code/studio/src/plugins/translation_manager/translation_manager_constants.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_editor.h b/code/studio/src/plugins/translation_manager/translation_manager_editor.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_editor.h
rename to code/studio/src/plugins/translation_manager/translation_manager_editor.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.cpp b/code/studio/src/plugins/translation_manager/translation_manager_main_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.cpp
rename to code/studio/src/plugins/translation_manager/translation_manager_main_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.h b/code/studio/src/plugins/translation_manager/translation_manager_main_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.h
rename to code/studio/src/plugins/translation_manager/translation_manager_main_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.ui b/code/studio/src/plugins/translation_manager/translation_manager_main_window.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.ui
rename to code/studio/src/plugins/translation_manager/translation_manager_main_window.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_plugin.cpp b/code/studio/src/plugins/translation_manager/translation_manager_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_plugin.cpp
rename to code/studio/src/plugins/translation_manager/translation_manager_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_plugin.h b/code/studio/src/plugins/translation_manager/translation_manager_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_plugin.h
rename to code/studio/src/plugins/translation_manager/translation_manager_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_settings_page.cpp b/code/studio/src/plugins/translation_manager/translation_manager_settings_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_settings_page.cpp
rename to code/studio/src/plugins/translation_manager/translation_manager_settings_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_settings_page.h b/code/studio/src/plugins/translation_manager/translation_manager_settings_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_settings_page.h
rename to code/studio/src/plugins/translation_manager/translation_manager_settings_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_settings_page.ui b/code/studio/src/plugins/translation_manager/translation_manager_settings_page.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_settings_page.ui
rename to code/studio/src/plugins/translation_manager/translation_manager_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/CMakeLists.txt b/code/studio/src/plugins/world_editor/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/CMakeLists.txt
rename to code/studio/src/plugins/world_editor/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_move.png b/code/studio/src/plugins/world_editor/icons/ic_nel_move.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_move.png
rename to code/studio/src/plugins/world_editor/icons/ic_nel_move.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_rotate.png b/code/studio/src/plugins/world_editor/icons/ic_nel_rotate.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_rotate.png
rename to code/studio/src/plugins/world_editor/icons/ic_nel_rotate.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_scale.png b/code/studio/src/plugins/world_editor/icons/ic_nel_scale.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_scale.png
rename to code/studio/src/plugins/world_editor/icons/ic_nel_scale.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_select.png b/code/studio/src/plugins/world_editor/icons/ic_nel_select.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_select.png
rename to code/studio/src/plugins/world_editor/icons/ic_nel_select.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_turn.png b/code/studio/src/plugins/world_editor/icons/ic_nel_turn.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_turn.png
rename to code/studio/src/plugins/world_editor/icons/ic_nel_turn.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_world_editor.png b/code/studio/src/plugins/world_editor/icons/ic_nel_world_editor.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/icons/ic_nel_world_editor.png
rename to code/studio/src/plugins/world_editor/icons/ic_nel_world_editor.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/ovqt_plugin_world_editor.xml b/code/studio/src/plugins/world_editor/ovqt_plugin_world_editor.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/ovqt_plugin_world_editor.xml
rename to code/studio/src/plugins/world_editor/ovqt_plugin_world_editor.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitive_item.cpp b/code/studio/src/plugins/world_editor/primitive_item.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitive_item.cpp
rename to code/studio/src/plugins/world_editor/primitive_item.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitive_item.h b/code/studio/src/plugins/world_editor/primitive_item.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitive_item.h
rename to code/studio/src/plugins/world_editor/primitive_item.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitives_model.cpp b/code/studio/src/plugins/world_editor/primitives_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitives_model.cpp
rename to code/studio/src/plugins/world_editor/primitives_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitives_model.h b/code/studio/src/plugins/world_editor/primitives_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitives_model.h
rename to code/studio/src/plugins/world_editor/primitives_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitives_view.cpp b/code/studio/src/plugins/world_editor/primitives_view.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitives_view.cpp
rename to code/studio/src/plugins/world_editor/primitives_view.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitives_view.h b/code/studio/src/plugins/world_editor/primitives_view.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/primitives_view.h
rename to code/studio/src/plugins/world_editor/primitives_view.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/project_settings_dialog.cpp b/code/studio/src/plugins/world_editor/project_settings_dialog.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/project_settings_dialog.cpp
rename to code/studio/src/plugins/world_editor/project_settings_dialog.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/project_settings_dialog.h b/code/studio/src/plugins/world_editor/project_settings_dialog.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/project_settings_dialog.h
rename to code/studio/src/plugins/world_editor/project_settings_dialog.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/project_settings_dialog.ui b/code/studio/src/plugins/world_editor/project_settings_dialog.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/project_settings_dialog.ui
rename to code/studio/src/plugins/world_editor/project_settings_dialog.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/property_editor_widget.cpp b/code/studio/src/plugins/world_editor/property_editor_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/property_editor_widget.cpp
rename to code/studio/src/plugins/world_editor/property_editor_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/property_editor_widget.h b/code/studio/src/plugins/world_editor/property_editor_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/property_editor_widget.h
rename to code/studio/src/plugins/world_editor/property_editor_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/property_editor_widget.ui b/code/studio/src/plugins/world_editor/property_editor_widget.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/property_editor_widget.ui
rename to code/studio/src/plugins/world_editor/property_editor_widget.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor.qrc b/code/studio/src/plugins/world_editor/world_editor.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor.qrc
rename to code/studio/src/plugins/world_editor/world_editor.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_actions.cpp b/code/studio/src/plugins/world_editor/world_editor_actions.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_actions.cpp
rename to code/studio/src/plugins/world_editor/world_editor_actions.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_actions.h b/code/studio/src/plugins/world_editor/world_editor_actions.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_actions.h
rename to code/studio/src/plugins/world_editor/world_editor_actions.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_constants.h b/code/studio/src/plugins/world_editor/world_editor_constants.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_constants.h
rename to code/studio/src/plugins/world_editor/world_editor_constants.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_global.h b/code/studio/src/plugins/world_editor/world_editor_global.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_global.h
rename to code/studio/src/plugins/world_editor/world_editor_global.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_misc.cpp b/code/studio/src/plugins/world_editor/world_editor_misc.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_misc.cpp
rename to code/studio/src/plugins/world_editor/world_editor_misc.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_misc.h b/code/studio/src/plugins/world_editor/world_editor_misc.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_misc.h
rename to code/studio/src/plugins/world_editor/world_editor_misc.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_plugin.cpp b/code/studio/src/plugins/world_editor/world_editor_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_plugin.cpp
rename to code/studio/src/plugins/world_editor/world_editor_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_plugin.h b/code/studio/src/plugins/world_editor/world_editor_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_plugin.h
rename to code/studio/src/plugins/world_editor/world_editor_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene.cpp b/code/studio/src/plugins/world_editor/world_editor_scene.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene.cpp
rename to code/studio/src/plugins/world_editor/world_editor_scene.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene.h b/code/studio/src/plugins/world_editor/world_editor_scene.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene.h
rename to code/studio/src/plugins/world_editor/world_editor_scene.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene_item.cpp b/code/studio/src/plugins/world_editor/world_editor_scene_item.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene_item.cpp
rename to code/studio/src/plugins/world_editor/world_editor_scene_item.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene_item.h b/code/studio/src/plugins/world_editor/world_editor_scene_item.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene_item.h
rename to code/studio/src/plugins/world_editor/world_editor_scene_item.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_settings_page.cpp b/code/studio/src/plugins/world_editor/world_editor_settings_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_settings_page.cpp
rename to code/studio/src/plugins/world_editor/world_editor_settings_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_settings_page.h b/code/studio/src/plugins/world_editor/world_editor_settings_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_settings_page.h
rename to code/studio/src/plugins/world_editor/world_editor_settings_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_settings_page.ui b/code/studio/src/plugins/world_editor/world_editor_settings_page.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_settings_page.ui
rename to code/studio/src/plugins/world_editor/world_editor_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.cpp b/code/studio/src/plugins/world_editor/world_editor_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.cpp
rename to code/studio/src/plugins/world_editor/world_editor_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.h b/code/studio/src/plugins/world_editor/world_editor_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.h
rename to code/studio/src/plugins/world_editor/world_editor_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.ui b/code/studio/src/plugins/world_editor/world_editor_window.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.ui
rename to code/studio/src/plugins/world_editor/world_editor_window.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/CMakeLists.txt b/code/studio/src/plugins/zone_painter/CMakeLists.txt
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/CMakeLists.txt
rename to code/studio/src/plugins/zone_painter/CMakeLists.txt
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/color-fill.png b/code/studio/src/plugins/zone_painter/images/color-fill.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/color-fill.png
rename to code/studio/src/plugins/zone_painter/images/color-fill.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/color-picker-black.png b/code/studio/src/plugins/zone_painter/images/color-picker-black.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/color-picker-black.png
rename to code/studio/src/plugins/zone_painter/images/color-picker-black.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/colorize.png b/code/studio/src/plugins/zone_painter/images/colorize.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/colorize.png
rename to code/studio/src/plugins/zone_painter/images/colorize.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/draw-brush.png b/code/studio/src/plugins/zone_painter/images/draw-brush.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/draw-brush.png
rename to code/studio/src/plugins/zone_painter/images/draw-brush.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/go-down-7.png b/code/studio/src/plugins/zone_painter/images/go-down-7.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/go-down-7.png
rename to code/studio/src/plugins/zone_painter/images/go-down-7.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/go-jump-4.png b/code/studio/src/plugins/zone_painter/images/go-jump-4.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/go-jump-4.png
rename to code/studio/src/plugins/zone_painter/images/go-jump-4.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/lock-6.png b/code/studio/src/plugins/zone_painter/images/lock-6.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/lock-6.png
rename to code/studio/src/plugins/zone_painter/images/lock-6.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/lock-silver.png b/code/studio/src/plugins/zone_painter/images/lock-silver.png
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/images/lock-silver.png
rename to code/studio/src/plugins/zone_painter/images/lock-silver.png
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/ovqt_plugin_zone_painter.xml b/code/studio/src/plugins/zone_painter/ovqt_plugin_zone_painter.xml
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/ovqt_plugin_zone_painter.xml
rename to code/studio/src/plugins/zone_painter/ovqt_plugin_zone_painter.xml
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/painter_dock_widget.cpp b/code/studio/src/plugins/zone_painter/painter_dock_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/painter_dock_widget.cpp
rename to code/studio/src/plugins/zone_painter/painter_dock_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/painter_dock_widget.h b/code/studio/src/plugins/zone_painter/painter_dock_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/painter_dock_widget.h
rename to code/studio/src/plugins/zone_painter/painter_dock_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/painter_dock_widget.ui b/code/studio/src/plugins/zone_painter/painter_dock_widget.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/painter_dock_widget.ui
rename to code/studio/src/plugins/zone_painter/painter_dock_widget.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/qnel_widget.cpp b/code/studio/src/plugins/zone_painter/qnel_widget.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/qnel_widget.cpp
rename to code/studio/src/plugins/zone_painter/qnel_widget.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/qnel_widget.h b/code/studio/src/plugins/zone_painter/qnel_widget.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/qnel_widget.h
rename to code/studio/src/plugins/zone_painter/qnel_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter.qrc b/code/studio/src/plugins/zone_painter/zone_painter.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter.qrc
rename to code/studio/src/plugins/zone_painter/zone_painter.qrc
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_main_window.cpp b/code/studio/src/plugins/zone_painter/zone_painter_main_window.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_main_window.cpp
rename to code/studio/src/plugins/zone_painter/zone_painter_main_window.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_main_window.h b/code/studio/src/plugins/zone_painter/zone_painter_main_window.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_main_window.h
rename to code/studio/src/plugins/zone_painter/zone_painter_main_window.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_main_window.ui b/code/studio/src/plugins/zone_painter/zone_painter_main_window.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_main_window.ui
rename to code/studio/src/plugins/zone_painter/zone_painter_main_window.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_model.cpp b/code/studio/src/plugins/zone_painter/zone_painter_model.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_model.cpp
rename to code/studio/src/plugins/zone_painter/zone_painter_model.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_model.h b/code/studio/src/plugins/zone_painter/zone_painter_model.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_model.h
rename to code/studio/src/plugins/zone_painter/zone_painter_model.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_plugin.cpp b/code/studio/src/plugins/zone_painter/zone_painter_plugin.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_plugin.cpp
rename to code/studio/src/plugins/zone_painter/zone_painter_plugin.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_plugin.h b/code/studio/src/plugins/zone_painter/zone_painter_plugin.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_plugin.h
rename to code/studio/src/plugins/zone_painter/zone_painter_plugin.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_settings_page.cpp b/code/studio/src/plugins/zone_painter/zone_painter_settings_page.cpp
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_settings_page.cpp
rename to code/studio/src/plugins/zone_painter/zone_painter_settings_page.cpp
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_settings_page.h b/code/studio/src/plugins/zone_painter/zone_painter_settings_page.h
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_settings_page.h
rename to code/studio/src/plugins/zone_painter/zone_painter_settings_page.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_settings_page.ui b/code/studio/src/plugins/zone_painter/zone_painter_settings_page.ui
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/plugins/zone_painter/zone_painter_settings_page.ui
rename to code/studio/src/plugins/zone_painter/zone_painter_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts b/code/studio/src/translations/object_viewer_qt_de.ts
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts
rename to code/studio/src/translations/object_viewer_qt_de.ts
diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts b/code/studio/src/translations/object_viewer_qt_en.ts
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts
rename to code/studio/src/translations/object_viewer_qt_en.ts
diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts b/code/studio/src/translations/object_viewer_qt_fr.ts
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts
rename to code/studio/src/translations/object_viewer_qt_fr.ts
diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts b/code/studio/src/translations/object_viewer_qt_ru.ts
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts
rename to code/studio/src/translations/object_viewer_qt_ru.ts
diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/translations.qrc b/code/studio/src/translations/translations.qrc
similarity index 100%
rename from code/nel/tools/3d/object_viewer_qt/src/translations/translations.qrc
rename to code/studio/src/translations/translations.qrc