diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp
index da44097..dacf81f 100644
--- a/app/src/MainWindow.cpp
+++ b/app/src/MainWindow.cpp
@@ -23,7 +23,7 @@
 #include "ui_MainWindow.h"
 
 #include <Catalogue/CatalogueController.h>
-#include <Catalogue/CatalogueExplorer.h>
+//#include <Catalogue/CatalogueExplorer.h>
 #include <DataSource/DataSourceController.h>
 #include <DataSource/DataSourceWidget.h>
 #include <Settings/SqpSettingsDialog.h>
diff --git a/core b/core
index 0093c73..24f31ec 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 0093c733b640e07ebeaf204c1ed1279db095aa9f
+Subproject commit 24f31ec545d2e177fc2212ecdb457e01533b6fbb
diff --git a/gui/include/Catalogue/CatalogueActionManager.h b/gui/include/Catalogue/CatalogueActionManager.h
deleted file mode 100644
index 75afa31..0000000
--- a/gui/include/Catalogue/CatalogueActionManager.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef SCIQLOP_CATALOGUEACTIONMANAGER_H
-#define SCIQLOP_CATALOGUEACTIONMANAGER_H
-
-#include <Common/spimpl.h>
-
-class CatalogueExplorer;
-
-class CatalogueActionManager {
-public:
-    CatalogueActionManager(CatalogueExplorer *catalogueExplorer);
-
-    void installSelectionZoneActions();
-    void refreshCreateInCatalogueAction();
-
-private:
-    class CatalogueActionManagerPrivate;
-    spimpl::unique_impl_ptr<CatalogueActionManagerPrivate> impl;
-};
-
-#endif // SCIQLOP_CATALOGUEACTIONMANAGER_H
diff --git a/gui/include/Catalogue/CatalogueEventsModel.h b/gui/include/Catalogue/CatalogueEventsModel.h
deleted file mode 100644
index a92eb45..0000000
--- a/gui/include/Catalogue/CatalogueEventsModel.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef SCIQLOP_CATALOGUEEVENTSMODEL_H
-#define SCIQLOP_CATALOGUEEVENTSMODEL_H
-
-#include <Common/spimpl.h>
-#include <QAbstractItemModel>
-#include <QLoggingCategory>
-#include <unordered_set>
-#include <vector>
-
-#include <Catalogue/CatalogueController.h>
-
-Q_DECLARE_LOGGING_CATEGORY(LOG_CatalogueEventsModel)
-
-class CatalogueEventsModel : public QAbstractItemModel
-{
-    Q_OBJECT
-
-signals:
-    void modelSorted();
-
-public:
-    CatalogueEventsModel(QObject* parent = nullptr);
-
-    enum class Column
-    {
-        Name,
-        TStart,
-        TEnd,
-        Tags,
-        Product,
-        Validation,
-        NbColumn
-    };
-
-    void setSourceCatalogues(const QVector<std::shared_ptr<DBCatalogue>>& catalogues);
-    void setEvents(const std::vector<CatalogueController::Event_ptr>& events);
-    void addEvent(const std::shared_ptr<DBEvent>& event);
-    void removeEvent(const std::shared_ptr<DBEvent>& event);
-    std::vector<CatalogueController::Event_ptr> events() const;
-
-    enum class ItemType
-    {
-        Root,
-        Event,
-        EventProduct
-    };
-    ItemType itemTypeOf(const QModelIndex& index) const;
-    CatalogueController::Event_ptr getEvent(const QModelIndex& index) const;
-    CatalogueController::Event_ptr getParentEvent(const QModelIndex& index) const;
-    std::optional<CatalogueController::Product_t> getEventProduct(const QModelIndex& index) const;
-
-    /// Refresh the data for the specified event
-    void refreshEvent(
-        const CatalogueController::Event_ptr& event, bool refreshEventProducts = false);
-
-    /// Returns a QModelIndex which represent the specified event
-    QModelIndex indexOf(const CatalogueController::Event_ptr& event) const;
-
-    /// Marks a change flag on the specified event to allow sorting on the validation column
-    void setEventHasChanges(const std::shared_ptr<DBEvent>& event, bool hasChanges);
-
-    /// Returns true if the specified event has unsaved changes
-    bool eventsHasChanges(const std::shared_ptr<DBEvent>& event) const;
-
-    // Model
-    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const;
-    QModelIndex parent(const QModelIndex& index) const;
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex& parent = QModelIndex()) const override;
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    QVariant headerData(
-        int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
-
-    Qt::DropActions supportedDragActions() const override;
-    QStringList mimeTypes() const override;
-    QMimeData* mimeData(const QModelIndexList& indexes) const override;
-
-private:
-    class CatalogueEventsModelPrivate;
-    spimpl::unique_impl_ptr<CatalogueEventsModelPrivate> impl;
-};
-
-#endif // SCIQLOP_CATALOGUEEVENTSMODEL_H
diff --git a/gui/include/Catalogue/CatalogueEventsWidget.h b/gui/include/Catalogue/CatalogueEventsWidget.h
deleted file mode 100644
index d9b6307..0000000
--- a/gui/include/Catalogue/CatalogueEventsWidget.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef SCIQLOP_CATALOGUEEVENTSWIDGET_H
-#define SCIQLOP_CATALOGUEEVENTSWIDGET_H
-
-#include <Common/spimpl.h>
-#include <QLoggingCategory>
-#include <QWidget>
-
-class DBCatalogue;
-class DBEvent;
-class DBEventProduct;
-class VisualizationWidget;
-class VisualizationSelectionZoneItem;
-
-namespace Ui {
-class CatalogueEventsWidget;
-}
-
-Q_DECLARE_LOGGING_CATEGORY(LOG_CatalogueEventsWidget)
-
-class CatalogueEventsWidget : public QWidget {
-    Q_OBJECT
-
-signals:
-    void eventsSelected(const QVector<std::shared_ptr<DBEvent> > &event);
-    void eventsRemoved(const QVector<std::shared_ptr<DBEvent> > &event);
-    void eventProductsSelected(
-        const QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > >
-            &eventproducts);
-    void selectionCleared();
-    void selectionZoneAdded(const std::shared_ptr<DBEvent> &event, const QString &productId,
-                            VisualizationSelectionZoneItem *selectionZone);
-
-    void eventCataloguesModified(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
-
-public:
-    explicit CatalogueEventsWidget(QWidget *parent = 0);
-    virtual ~CatalogueEventsWidget();
-
-    void setVisualizationWidget(VisualizationWidget *visualization);
-
-    void addEvent(const std::shared_ptr<DBEvent> &event);
-    void setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
-    void setEventsChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
-
-    QVector<std::shared_ptr<DBCatalogue> > displayedCatalogues() const;
-    bool isAllEventsDisplayed() const;
-    bool isEventDisplayed(const std::shared_ptr<DBEvent> &event) const;
-
-    void refreshEvent(const std::shared_ptr<DBEvent> &event);
-
-public slots:
-    void populateWithCatalogues(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
-    void populateWithAllEvents();
-    void clear();
-    void refresh();
-
-    // QWidget interface
-protected:
-    void keyPressEvent(QKeyEvent *event);
-
-
-private:
-    Ui::CatalogueEventsWidget *ui;
-
-    class CatalogueEventsWidgetPrivate;
-    spimpl::unique_impl_ptr<CatalogueEventsWidgetPrivate> impl;
-
-private slots:
-    void emitSelection();
-};
-
-#endif // SCIQLOP_CATALOGUEEVENTSWIDGET_H
diff --git a/gui/include/Catalogue/CatalogueExplorer.h b/gui/include/Catalogue/CatalogueExplorer.h
deleted file mode 100644
index 079fd15..0000000
--- a/gui/include/Catalogue/CatalogueExplorer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef SCIQLOP_CATALOGUEEXPLORER_H
-#define SCIQLOP_CATALOGUEEXPLORER_H
-
-#include <Common/spimpl.h>
-#include <QDialog>
-
-namespace Ui {
-class CatalogueExplorer;
-}
-
-class CatalogueEventsWidget;
-class CatalogueSideBarWidget;
-
-class VisualizationWidget;
-class VisualizationSelectionZoneItem;
-
-class DBEvent;
-
-
-class CatalogueExplorer : public QDialog {
-    Q_OBJECT
-
-public:
-    explicit CatalogueExplorer(QWidget *parent = 0);
-    virtual ~CatalogueExplorer();
-
-    void setVisualizationWidget(VisualizationWidget *visualization);
-
-    CatalogueEventsWidget &eventsWidget() const;
-    CatalogueSideBarWidget &sideBarWidget() const;
-
-    void clearSelectionZones();
-    void addSelectionZoneItem(const std::shared_ptr<DBEvent> &event, const QString &productId,
-                              VisualizationSelectionZoneItem *selectionZone);
-
-private:
-    Ui::CatalogueExplorer *ui;
-
-    class CatalogueExplorerPrivate;
-    spimpl::unique_impl_ptr<CatalogueExplorerPrivate> impl;
-};
-
-#endif // SCIQLOP_CATALOGUEEXPLORER_H
diff --git a/gui/include/Catalogue/CatalogueExplorerHelper.h b/gui/include/Catalogue/CatalogueExplorerHelper.h
deleted file mode 100644
index 037901c..0000000
--- a/gui/include/Catalogue/CatalogueExplorerHelper.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef SCIQLOP_CATALOGUEEXPLORERHELPER_H
-#define SCIQLOP_CATALOGUEEXPLORERHELPER_H
-
-#include <QWidget>
-
-#include <functional>
-
-struct CatalogueExplorerHelper {
-    static QWidget *buildValidationWidget(QWidget *parent, std::function<void()> save,
-                                          std::function<void()> discard);
-};
-
-#endif // SCIQLOP_CATALOGUEEXPLORERHELPER_H
diff --git a/gui/include/Catalogue/CatalogueInspectorWidget.h b/gui/include/Catalogue/CatalogueInspectorWidget.h
deleted file mode 100644
index 1bef099..0000000
--- a/gui/include/Catalogue/CatalogueInspectorWidget.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef SCIQLOP_CATALOGUEINSPECTORWIDGET_H
-#define SCIQLOP_CATALOGUEINSPECTORWIDGET_H
-
-#include <Common/spimpl.h>
-#include <QWidget>
-#include <memory>
-
-namespace Ui {
-class CatalogueInspectorWidget;
-}
-
-class DBCatalogue;
-class DBEvent;
-class DBEventProduct;
-
-class CatalogueInspectorWidget : public QWidget {
-    Q_OBJECT
-
-signals:
-    void catalogueUpdated(const std::shared_ptr<DBCatalogue> &catalogue);
-    void eventUpdated(const std::shared_ptr<DBEvent> &event);
-    void eventProductUpdated(const std::shared_ptr<DBEvent> &event,
-                             const std::shared_ptr<DBEventProduct> &eventProduct);
-
-public:
-    explicit CatalogueInspectorWidget(QWidget *parent = 0);
-    virtual ~CatalogueInspectorWidget();
-
-    /// Enum matching the pages inside the stacked widget
-    enum class Page { Empty, CatalogueProperties, EventProperties };
-
-    Page currentPage() const;
-
-    void setEvent(const std::shared_ptr<DBEvent> &event);
-    void setEventProduct(const std::shared_ptr<DBEvent> &event,
-                         const std::shared_ptr<DBEventProduct> &eventProduct);
-    void setCatalogue(const std::shared_ptr<DBCatalogue> &catalogue);
-
-    void refresh();
-
-public slots:
-    void showPage(Page page);
-
-private:
-    Ui::CatalogueInspectorWidget *ui;
-
-    class CatalogueInspectorWidgetPrivate;
-    spimpl::unique_impl_ptr<CatalogueInspectorWidgetPrivate> impl;
-};
-
-#endif // SCIQLOP_CATALOGUEINSPECTORWIDGET_H
diff --git a/gui/include/Catalogue/CatalogueSideBarWidget.h b/gui/include/Catalogue/CatalogueSideBarWidget.h
deleted file mode 100644
index 73acaf5..0000000
--- a/gui/include/Catalogue/CatalogueSideBarWidget.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef SCIQLOP_CATALOGUESIDEBARWIDGET_H
-#define SCIQLOP_CATALOGUESIDEBARWIDGET_H
-
-#include <Common/spimpl.h>
-#include <QLoggingCategory>
-#include <QTreeWidgetItem>
-#include <QWidget>
-
-class CatalogueAbstractTreeItem;
-class DBCatalogue;
-
-namespace Ui {
-class CatalogueSideBarWidget;
-}
-
-Q_DECLARE_LOGGING_CATEGORY(LOG_CatalogueSideBarWidget)
-
-class CatalogueSideBarWidget : public QWidget {
-    Q_OBJECT
-
-signals:
-    void catalogueSelected(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
-    void databaseSelected(const QStringList &databases);
-    void allEventsSelected();
-    void trashSelected();
-    void selectionCleared();
-    void catalogueSaved(const std::shared_ptr<DBCatalogue> &catalogue);
-    void catalogueListChanged();
-
-public:
-    explicit CatalogueSideBarWidget(QWidget *parent = 0);
-    virtual ~CatalogueSideBarWidget();
-
-    CatalogueAbstractTreeItem *addCatalogue(const std::shared_ptr<DBCatalogue> &catalogue,
-                                            const QString &repository);
-    void setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue, bool hasChanges);
-
-    QVector<std::shared_ptr<DBCatalogue> > getCatalogues(const QString &repository) const;
-
-    // QWidget interface
-protected:
-    void keyPressEvent(QKeyEvent *event);
-
-private slots:
-    void emitSelection();
-
-private:
-    Ui::CatalogueSideBarWidget *ui;
-
-    class CatalogueSideBarWidgetPrivate;
-    spimpl::unique_impl_ptr<CatalogueSideBarWidgetPrivate> impl;
-
-private slots:
-    void onContextMenuRequested(const QPoint &pos);
-};
-
-#endif // SCIQLOP_CATALOGUESIDEBARWIDGET_H
diff --git a/gui/include/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h b/gui/include/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h
deleted file mode 100644
index 0135a5b..0000000
--- a/gui/include/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef SCIQLOP_CATALOGUEABSTRACTTREEITEM_H
-#define SCIQLOP_CATALOGUEABSTRACTTREEITEM_H
-
-#include <Common/spimpl.h>
-#include <QVariant>
-#include <QVector>
-
-class QMimeData;
-
-class CatalogueAbstractTreeItem {
-public:
-    constexpr static const int DEFAULT_TYPE = -1;
-
-    CatalogueAbstractTreeItem(int type = DEFAULT_TYPE);
-    virtual ~CatalogueAbstractTreeItem();
-
-    void addChild(CatalogueAbstractTreeItem *child);
-    void removeChild(CatalogueAbstractTreeItem *child);
-    QVector<CatalogueAbstractTreeItem *> children() const;
-    CatalogueAbstractTreeItem *parent() const;
-
-    int type() const;
-    QString text(int column = 0) const;
-
-    virtual QVariant data(int column, int role) const;
-    virtual Qt::ItemFlags flags(int column) const;
-    virtual bool setData(int column, int role, const QVariant &value);
-    virtual bool canDropMimeData(const QMimeData *data, Qt::DropAction action);
-    virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action);
-
-private:
-    class CatalogueAbstractTreeItemPrivate;
-    spimpl::unique_impl_ptr<CatalogueAbstractTreeItemPrivate> impl;
-};
-
-#endif // SCIQLOP_CATALOGUEABSTRACTTREEITEM_H
diff --git a/gui/include/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.h b/gui/include/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.h
deleted file mode 100644
index fc345c8..0000000
--- a/gui/include/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef SCIQLOP_CATALOGUETEXTTREEITEM_H
-#define SCIQLOP_CATALOGUETEXTTREEITEM_H
-
-#include <Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h>
-#include <Common/spimpl.h>
-
-class CatalogueTextTreeItem : public CatalogueAbstractTreeItem {
-public:
-    CatalogueTextTreeItem(const QIcon &icon, const QString &text, int type);
-
-    QVariant data(int column, int role) const override;
-    Qt::ItemFlags flags(int column) const override;
-
-    QString text() const;
-
-    void setEnabled(bool value);
-
-private:
-    class CatalogueTextTreeItemPrivate;
-    spimpl::unique_impl_ptr<CatalogueTextTreeItemPrivate> impl;
-};
-
-#endif // SCIQLOP_CATALOGUETEXTTREEITEM_H
diff --git a/gui/include/Catalogue/CatalogueTreeItems/CatalogueTreeItem.h b/gui/include/Catalogue/CatalogueTreeItems/CatalogueTreeItem.h
deleted file mode 100644
index d072aea..0000000
--- a/gui/include/Catalogue/CatalogueTreeItems/CatalogueTreeItem.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef SCIQLOP_CATALOGUETREEITEM_H
-#define SCIQLOP_CATALOGUETREEITEM_H
-
-#include <Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h>
-#include <Common/spimpl.h>
-
-class DBCatalogue;
-
-
-class CatalogueTreeItem : public CatalogueAbstractTreeItem {
-public:
-    CatalogueTreeItem(std::shared_ptr<DBCatalogue> catalogue, const QIcon &icon, int type);
-
-    QVariant data(int column, int role) const override;
-    bool setData(int column, int role, const QVariant &value) override;
-    Qt::ItemFlags flags(int column) const override;
-    bool canDropMimeData(const QMimeData *data, Qt::DropAction action) override;
-    bool dropMimeData(const QMimeData *data, Qt::DropAction action) override;
-
-    /// Returns the catalogue represented by the item
-    std::shared_ptr<DBCatalogue> catalogue() const;
-    void replaceCatalogue(const std::shared_ptr<DBCatalogue> &catalogue);
-
-private:
-    class CatalogueTreeItemPrivate;
-    spimpl::unique_impl_ptr<CatalogueTreeItemPrivate> impl;
-};
-
-#endif // SCIQLOP_CATALOGUETREEITEM_H
diff --git a/gui/include/Catalogue/CatalogueTreeModel.h b/gui/include/Catalogue/CatalogueTreeModel.h
deleted file mode 100644
index c526657..0000000
--- a/gui/include/Catalogue/CatalogueTreeModel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef SCIQLOP_CATALOGUETREEMODEL_H
-#define SCIQLOP_CATALOGUETREEMODEL_H
-
-#include <Common/spimpl.h>
-#include <QAbstractItemModel>
-
-class CatalogueAbstractTreeItem;
-
-/**
- * @brief Model to display catalogue items based on QTreeWidgetItem
- * @warning Do not use the method QTreeWidgetItem::treeWidget for an item added to this model or the
- * application will crash
- */
-class CatalogueTreeModel : public QAbstractItemModel {
-    Q_OBJECT
-
-signals:
-    void itemRenamed(const QModelIndex &index);
-    void itemDropped(const QModelIndex &parentIndex, const QMimeData *data, Qt::DropAction action);
-
-public:
-    CatalogueTreeModel(QObject *parent = nullptr);
-
-    enum class Column { Name, Validation, Count };
-
-    QModelIndex addTopLevelItem(CatalogueAbstractTreeItem *item);
-    QVector<CatalogueAbstractTreeItem *> topLevelItems() const;
-
-    void addChildItem(CatalogueAbstractTreeItem *child, const QModelIndex &parentIndex);
-    void removeChildItem(CatalogueAbstractTreeItem *child, const QModelIndex &parentIndex);
-    /// Refresh the data for the specified index
-    void refresh(const QModelIndex &index);
-
-    CatalogueAbstractTreeItem *item(const QModelIndex &index) const;
-    QModelIndex indexOf(CatalogueAbstractTreeItem *item, int column = 0) const;
-
-    // model
-    QModelIndex index(int row, int column,
-                      const QModelIndex &parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex &index) const override;
-    int rowCount(const QModelIndex &parent) const override;
-    int columnCount(const QModelIndex &parent) const override;
-    Qt::ItemFlags flags(const QModelIndex &index) const override;
-    QVariant data(const QModelIndex &index, int role) const override;
-    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
-
-    bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
-                         const QModelIndex &parent) const override;
-    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
-                      const QModelIndex &parent) override;
-    Qt::DropActions supportedDropActions() const;
-    QStringList mimeTypes() const;
-
-private:
-    class CatalogueTreeModelPrivate;
-    spimpl::unique_impl_ptr<CatalogueTreeModelPrivate> impl;
-};
-
-#endif // CATALOGUETREEMODEL_H
diff --git a/gui/meson.build b/gui/meson.build
index 8d996dc..21fdd77 100644
--- a/gui/meson.build
+++ b/gui/meson.build
@@ -1,54 +1,82 @@
 
 gui_moc_headers = [
-  'include/DataSource/DataSourceWidget.h',
-  'include/Settings/SqpSettingsDialog.h',
-  'include/Settings/SqpSettingsGeneralWidget.h',
-  'include/SidePane/SqpSidePane.h',
-  'include/SqpApplication.h',
-  'include/DragAndDrop/DragDropScroller.h',
-  'include/DragAndDrop/DragDropTabSwitcher.h',
-  'include/TimeWidget/TimeWidget.h',
-  'include/Variable/VariableInspectorWidget.h',
-  'include/Variable/RenameVariableDialog.h',
-  'include/Visualization/qcustomplot.h',
-  'include/Visualization/VisualizationGraphWidget.h',
-  'include/Visualization/VisualizationTabWidget.h',
-  'include/Visualization/VisualizationWidget.h',
-  'include/Visualization/VisualizationZoneWidget.h',
-  'include/Visualization/VisualizationDragDropContainer.h',
-  'include/Visualization/VisualizationDragWidget.h',
-  'include/Visualization/ColorScaleEditor.h',
-  'include/Visualization/VisualizationSelectionZoneItem.h',
-  'include/Actions/SelectionZoneAction.h',
-  'include/Visualization/VisualizationMultiZoneSelectionDialog.h',
-  'include/Catalogue/CatalogueExplorer.h',
-  'include/Catalogue/CatalogueEventsWidget.h',
-  'include/Catalogue/CatalogueSideBarWidget.h',
-  'include/Catalogue/CatalogueInspectorWidget.h',
-  'include/Catalogue/CatalogueEventsModel.h',
-  'include/Catalogue/CatalogueTreeModel.h',
-  'include/Actions/FilteringAction.h'
+ './include/Common/VisualizationDef.h',
+ './include/Common/ColorUtils.h',
+ './include/DragAndDrop/DragDropGuiController.h',
+ './include/DragAndDrop/DragDropTabSwitcher.h',
+ './include/DragAndDrop/DragDropScroller.h',
+ './include/Settings/SqpSettingsDialog.h',
+ './include/Settings/SqpSettingsGeneralWidget.h',
+ './include/DataSource/DataSourceTreeWidgetHelper.h',
+ './include/DataSource/DataSourceTreeWidget.h',
+ './include/DataSource/DataSourceTreeWidgetItem.h',
+ './include/DataSource/DataSourceWidget.h',
+ './include/Catalogue2/repositoriestreeview.h',
+ './include/Catalogue2/browser.h',
+ './include/Catalogue2/eventeditor.h',
+ './include/Catalogue2/eventsmodel.h',
+ './include/Catalogue2/eventstreeview.h',
+ './include/Catalogue2/repositoriesmodel.h',
+ './include/TimeWidget/TimeWidget.h',
+ './include/SqpApplication.h',
+ './include/SidePane/SqpSidePane.h',
+ './include/Variable/RenameVariableDialog.h',
+ './include/Variable/VariableInspectorWidget.h',
+ './include/Variable/VariableInspectorTableView.h',
+ './include/Variable/VariableMenuHeaderWidget.h',
+ './include/Visualization/VisualizationDragWidget.h',
+ './include/Visualization/VisualizationZoneWidget.h',
+ './include/Visualization/operations/GenerateVariableMenuOperation.h',
+ './include/Visualization/operations/RescaleAxeOperation.h',
+ './include/Visualization/operations/RemoveVariableOperation.h',
+ './include/Visualization/operations/MenuBuilder.h',
+ './include/Visualization/operations/FindVariableOperation.h',
+ './include/Visualization/VisualizationDefs.h',
+ './include/Visualization/IVisualizationWidgetVisitor.h',
+ './include/Visualization/SqpColorScale.h',
+ './include/Visualization/VisualizationGraphRenderingDelegate.h',
+ './include/Visualization/VisualizationGraphWidget.h',
+ './include/Visualization/MacScrollBarStyle.h',
+ './include/Visualization/IVisualizationWidget.h',
+ './include/Visualization/qcustomplot.h',
+ './include/Visualization/IGraphSynchronizer.h',
+ './include/Visualization/QCPColorMapIterator.h',
+ './include/Visualization/VisualizationActionManager.h',
+ './include/Visualization/VisualizationTabWidget.h',
+ './include/Visualization/IVariableContainer.h',
+ './include/Visualization/AxisRenderingUtils.h',
+ './include/Visualization/VisualizationMultiZoneSelectionDialog.h',
+ './include/Visualization/VisualizationCursorItem.h',
+ './include/Visualization/VisualizationWidget.h',
+ './include/Visualization/PlottablesRenderingUtils.h',
+ './include/Visualization/VisualizationSelectionZoneManager.h',
+ './include/Visualization/QCustomPlotSynchronizer.h',
+ './include/Visualization/VisualizationSelectionZoneItem.h',
+ './include/Visualization/VisualizationDragDropContainer.h',
+ './include/Visualization/ColorScaleEditor.h',
+ './include/Visualization/VisualizationGraphHelper.h',
+ './include/Actions/ActionsGuiController.h',
+ './include/Actions/FilteringAction.h',
+ './include/Actions/SelectionZoneAction.h'
 ]
 
 gui_ui_files = [
-  'ui/DataSource/DataSourceWidget.ui',
-  'ui/Settings/SqpSettingsDialog.ui',
-  'ui/Settings/SqpSettingsGeneralWidget.ui',
-  'ui/SidePane/SqpSidePane.ui',
-  'ui/TimeWidget/TimeWidget.ui',
-  'ui/Variable/VariableInspectorWidget.ui',
-  'ui/Variable/RenameVariableDialog.ui',
-  'ui/Variable/VariableMenuHeaderWidget.ui',
-  'ui/Visualization/VisualizationGraphWidget.ui',
-  'ui/Visualization/VisualizationTabWidget.ui',
-  'ui/Visualization/VisualizationWidget.ui',
-  'ui/Visualization/VisualizationZoneWidget.ui',
-  'ui/Visualization/ColorScaleEditor.ui',
-  'ui/Visualization/VisualizationMultiZoneSelectionDialog.ui',
-  'ui/Catalogue/CatalogueExplorer.ui',
-  'ui/Catalogue/CatalogueEventsWidget.ui',
-  'ui/Catalogue/CatalogueSideBarWidget.ui',
-  'ui/Catalogue/CatalogueInspectorWidget.ui'
+ './ui/Settings/SqpSettingsGeneralWidget.ui',
+ './ui/Settings/SqpSettingsDialog.ui',
+ './ui/DataSource/DataSourceWidget.ui',
+ './ui/Catalogue2/browser.ui',
+ './ui/Catalogue2/eventeditor.ui',
+ './ui/TimeWidget/TimeWidget.ui',
+ './ui/SidePane/SqpSidePane.ui',
+ './ui/Variable/RenameVariableDialog.ui',
+ './ui/Variable/VariableInspectorWidget.ui',
+ './ui/Variable/VariableMenuHeaderWidget.ui',
+ './ui/Visualization/ColorScaleEditor.ui',
+ './ui/Visualization/VisualizationZoneWidget.ui',
+ './ui/Visualization/VisualizationMultiZoneSelectionDialog.ui',
+ './ui/Visualization/VisualizationGraphWidget.ui',
+ './ui/Visualization/VisualizationWidget.ui',
+ './ui/Visualization/VisualizationTabWidget.ui'
 ]
 
 gui_qresources = ['resources/sqpguiresources.qrc']
@@ -67,64 +95,59 @@ gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
                                ui_files : gui_ui_files)
 
 gui_sources = [
-  'src/SqpApplication.cpp',
-  'src/DragAndDrop/DragDropGuiController.cpp',
-  'src/DragAndDrop/DragDropScroller.cpp',
-  'src/DragAndDrop/DragDropTabSwitcher.cpp',
-  'src/Common/ColorUtils.cpp',
-  'src/Common/VisualizationDef.cpp',
-  'src/DataSource/DataSourceTreeWidgetItem.cpp',
-  'src/DataSource/DataSourceTreeWidgetHelper.cpp',
-  'src/DataSource/DataSourceWidget.cpp',
-  'src/DataSource/DataSourceTreeWidget.cpp',
-  'src/Settings/SqpSettingsDialog.cpp',
-  'src/Settings/SqpSettingsGeneralWidget.cpp',
-  'src/SidePane/SqpSidePane.cpp',
-  'src/TimeWidget/TimeWidget.cpp',
-  'src/Variable/VariableInspectorWidget.cpp',
-  'src/Variable/VariableInspectorTableView.cpp',
-  'src/Variable/VariableMenuHeaderWidget.cpp',
-  'src/Variable/RenameVariableDialog.cpp',
-  'src/Visualization/VisualizationGraphHelper.cpp',
-  'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
-  'src/Visualization/VisualizationGraphWidget.cpp',
-  'src/Visualization/VisualizationTabWidget.cpp',
-  'src/Visualization/VisualizationWidget.cpp',
-  'src/Visualization/VisualizationZoneWidget.cpp',
-  'src/Visualization/qcustomplot.cpp',
-  'src/Visualization/QCustomPlotSynchronizer.cpp',
-  'src/Visualization/operations/FindVariableOperation.cpp',
-  'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
-  'src/Visualization/operations/MenuBuilder.cpp',
-  'src/Visualization/operations/RemoveVariableOperation.cpp',
-  'src/Visualization/operations/RescaleAxeOperation.cpp',
-  'src/Visualization/VisualizationDragDropContainer.cpp',
-  'src/Visualization/VisualizationDragWidget.cpp',
-  'src/Visualization/AxisRenderingUtils.cpp',
-  'src/Visualization/PlottablesRenderingUtils.cpp',
-  'src/Visualization/MacScrollBarStyle.cpp',
-  'src/Visualization/VisualizationCursorItem.cpp',
-  'src/Visualization/ColorScaleEditor.cpp',
-  'src/Visualization/SqpColorScale.cpp',
-  'src/Visualization/QCPColorMapIterator.cpp',
-  'src/Visualization/VisualizationSelectionZoneItem.cpp',
-  'src/Visualization/VisualizationSelectionZoneManager.cpp',
-  'src/Actions/SelectionZoneAction.cpp',
-  'src/Actions/ActionsGuiController.cpp',
-  'src/Actions/FilteringAction.cpp',
-  'src/Visualization/VisualizationActionManager.cpp',
-  'src/Visualization/VisualizationMultiZoneSelectionDialog.cpp',
-  'src/Catalogue/CatalogueExplorer.cpp',
-  'src/Catalogue/CatalogueEventsWidget.cpp',
-  'src/Catalogue/CatalogueSideBarWidget.cpp',
-  'src/Catalogue/CatalogueInspectorWidget.cpp',
-  'src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp',
-  'src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp',
-  'src/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.cpp',
-  'src/Catalogue/CatalogueEventsModel.cpp',
-  'src/Catalogue/CatalogueExplorerHelper.cpp',
-  'src/Catalogue/CatalogueActionManager.cpp',
-  'src/Catalogue/CatalogueTreeModel.cpp'
+  './src/Common/ColorUtils.cpp',
+ './src/Common/VisualizationDef.cpp',
+ './src/SqpApplication.cpp',
+ './src/DragAndDrop/DragDropTabSwitcher.cpp',
+ './src/DragAndDrop/DragDropScroller.cpp',
+ './src/DragAndDrop/DragDropGuiController.cpp',
+ './src/Settings/SqpSettingsGeneralWidget.cpp',
+ './src/Settings/SqpSettingsDialog.cpp',
+ './src/DataSource/DataSourceTreeWidgetItem.cpp',
+ './src/DataSource/DataSourceTreeWidgetHelper.cpp',
+ './src/DataSource/DataSourceWidget.cpp',
+ './src/DataSource/DataSourceTreeWidget.cpp',
+ './src/Catalogue2/eventstreeview.cpp',
+ './src/Catalogue2/eventeditor.cpp',
+ './src/Catalogue2/repositoriestreeview.cpp',
+ './src/Catalogue2/browser.cpp',
+ './src/Catalogue2/eventsmodel.cpp',
+ './src/Catalogue2/repositoriesmodel.cpp',
+ './src/TimeWidget/TimeWidget.cpp',
+ './src/SidePane/SqpSidePane.cpp',
+ './src/Variable/VariableInspectorTableView.cpp',
+ './src/Variable/VariableInspectorWidget.cpp',
+ './src/Variable/RenameVariableDialog.cpp',
+ './src/Variable/VariableMenuHeaderWidget.cpp',
+ './src/Visualization/VisualizationGraphWidget.cpp',
+ './src/Visualization/PlottablesRenderingUtils.cpp',
+ './src/Visualization/AxisRenderingUtils.cpp',
+ './src/Visualization/VisualizationWidget.cpp',
+ './src/Visualization/qcustomplot.cpp',
+ './src/Visualization/VisualizationDragWidget.cpp',
+ './src/Visualization/VisualizationActionManager.cpp',
+ './src/Visualization/MacScrollBarStyle.cpp',
+ './src/Visualization/VisualizationSelectionZoneManager.cpp',
+ './src/Visualization/operations/FindVariableOperation.cpp',
+ './src/Visualization/operations/RescaleAxeOperation.cpp',
+ './src/Visualization/operations/MenuBuilder.cpp',
+ './src/Visualization/operations/GenerateVariableMenuOperation.cpp',
+ './src/Visualization/operations/RemoveVariableOperation.cpp',
+ './src/Visualization/VisualizationSelectionZoneItem.cpp',
+ './src/Visualization/VisualizationCursorItem.cpp',
+ './src/Visualization/QCPColorMapIterator.cpp',
+ './src/Visualization/QCustomPlotSynchronizer.cpp',
+ './src/Visualization/ColorScaleEditor.cpp',
+ './src/Visualization/VisualizationMultiZoneSelectionDialog.cpp',
+ './src/Visualization/VisualizationTabWidget.cpp',
+ './src/Visualization/VisualizationGraphHelper.cpp',
+ './src/Visualization/VisualizationGraphRenderingDelegate.cpp',
+ './src/Visualization/VisualizationDragDropContainer.cpp',
+ './src/Visualization/VisualizationZoneWidget.cpp',
+ './src/Visualization/SqpColorScale.cpp',
+ './src/Actions/FilteringAction.cpp',
+ './src/Actions/SelectionZoneAction.cpp',
+ './src/Actions/ActionsGuiController.cpp',
 ]
 
 gui_inc = include_directories(['include', 'include/Visualization'])
diff --git a/gui/src/Catalogue/CatalogueActionManager.cpp b/gui/src/Catalogue/CatalogueActionManager.cpp
deleted file mode 100644
index 6d99052..0000000
--- a/gui/src/Catalogue/CatalogueActionManager.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-#include "Catalogue/CatalogueActionManager.h"
-
-#include <Actions/ActionsGuiController.h>
-#include <Catalogue/CatalogueController.h>
-#include <DataSource/DataSourceItem.h>
-#include <SqpApplication.h>
-#include <Variable/Variable.h>
-#include <Visualization/VisualizationGraphWidget.h>
-#include <Visualization/VisualizationSelectionZoneItem.h>
-
-#include <Catalogue/CatalogueEventsWidget.h>
-#include <Catalogue/CatalogueExplorer.h>
-#include <Catalogue/CatalogueSideBarWidget.h>
-
-//#include <CatalogueDao.h>
-//#include <DBCatalogue.h>
-//#include <DBEvent.h>
-//#include <DBEventProduct.h>
-
-#include <Catalogue/CatalogueController.h>
-#include <Event.hpp>
-
-#include <QBoxLayout>
-#include <QComboBox>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QLineEdit>
-#include <memory>
-
-const auto CATALOGUE_MENU_NAME = QObject::tr("Catalogues");
-const auto CATALOGUE_CREATE_EVENT_MENU_NAME = QObject::tr("New Event...");
-
-const auto DEFAULT_EVENT_NAME = QObject::tr("Event");
-const auto DEFAULT_CATALOGUE_NAME = QObject::tr("Catalogue");
-
-struct CatalogueActionManager::CatalogueActionManagerPrivate
-{
-
-    CatalogueExplorer* m_CatalogueExplorer = nullptr;
-    QVector<std::shared_ptr<SelectionZoneAction>> m_CreateInCatalogueActions;
-
-    CatalogueActionManagerPrivate(CatalogueExplorer* catalogueExplorer)
-            : m_CatalogueExplorer(catalogueExplorer)
-    {
-    }
-
-    void createEventFromZones(const QString& eventName,
-        const QVector<VisualizationSelectionZoneItem*>& zones,
-        const CatalogueController::Catalogue_ptr& catalogue = nullptr)
-    {
-        auto event = CatalogueController::make_event_ptr();
-        event->name = eventName.toStdString();
-
-        // std::list<DBEventProduct> productList;
-        for (auto zone : zones)
-        {
-            auto graph = zone->parentGraphWidget();
-            for (auto var : graph->variables())
-            {
-
-                auto eventProduct = CatalogueController::Product_t();
-                auto productId
-                    = var->metadata().value(DataSourceItem::ID_DATA_KEY, "UnknownID").toString();
-
-                auto zoneRange = zone->range();
-                eventProduct.startTime = zoneRange.m_TStart;
-                eventProduct.stopTime = zoneRange.m_TEnd;
-
-                eventProduct.name = productId.toStdString();
-                event->products.push_back(std::move(eventProduct));
-            }
-        }
-
-        sqpApp->catalogueController().add(event);
-
-
-        if (catalogue)
-        {
-            catalogue->add(event);
-            // TODO use notifications
-            // this shouldn't know GUI stuff and care about which widget to update
-            // sqpApp->catalogueController().updateCatalogue(catalogue);
-            //            m_CatalogueExplorer->sideBarWidget().setCatalogueChanges(catalogue, true);
-            //            if
-            //            (m_CatalogueExplorer->eventsWidget().displayedCatalogues().contains(catalogue))
-            //            {
-            //                m_CatalogueExplorer->eventsWidget().addEvent(event);
-            //                m_CatalogueExplorer->eventsWidget().setEventChanges(event, true);
-            //            }
-        }
-        else if (m_CatalogueExplorer->eventsWidget().isAllEventsDisplayed())
-        {
-            // m_CatalogueExplorer->eventsWidget().addEvent(event);
-            // m_CatalogueExplorer->eventsWidget().setEventChanges(event, true);
-        }
-    }
-
-    SelectionZoneAction::EnableFunction createEventEnableFuntion() const
-    {
-        return [](auto zones) {
-            // Checks that all variables in the zones doesn't refer to the same product
-            QSet<QString> usedDatasource;
-            for (auto zone : zones)
-            {
-                auto graph = zone->parentGraphWidget();
-                auto variables = graph->variables();
-
-                for (auto var : variables)
-                {
-                    auto datasourceId
-                        = var->metadata().value(DataSourceItem::ID_DATA_KEY).toString();
-                    if (!usedDatasource.contains(datasourceId))
-                    {
-                        usedDatasource.insert(datasourceId);
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        };
-    }
-};
-
-CatalogueActionManager::CatalogueActionManager(CatalogueExplorer* catalogueExplorer)
-        : impl { spimpl::make_unique_impl<CatalogueActionManagerPrivate>(catalogueExplorer) }
-{
-}
-
-void CatalogueActionManager::installSelectionZoneActions()
-{
-    //    auto &actionController = sqpApp->actionsGuiController();
-
-    //    auto createEventAction = actionController.addSectionZoneAction(
-    //        {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("Without
-    //        Catalogue"), [this](auto zones) { impl->createEventFromZones(DEFAULT_EVENT_NAME,
-    //        zones); });
-    //    createEventAction->setEnableFunction(impl->createEventEnableFuntion());
-    //    createEventAction->setAllowedFiltering(false);
-
-    //    auto createEventInNewCatalogueAction = actionController.addSectionZoneAction(
-    //        {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("In New
-    //        Catalogue"), [this](auto zones) {
-
-    //            auto newCatalogue = std::make_shared<DBCatalogue>();
-    //            newCatalogue->setName(DEFAULT_CATALOGUE_NAME);
-    //            sqpApp->catalogueController().addCatalogue(newCatalogue);
-    //            impl->m_CatalogueExplorer->sideBarWidget().addCatalogue(newCatalogue,
-    //                                                                    REPOSITORY_DEFAULT);
-
-    //            impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, newCatalogue);
-    //        });
-    //    createEventInNewCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());
-    //    createEventInNewCatalogueAction->setAllowedFiltering(false);
-
-    //    refreshCreateInCatalogueAction();
-
-    //    actionController.addFilterForMenu({CATALOGUE_MENU_NAME,
-    //    CATALOGUE_CREATE_EVENT_MENU_NAME});
-}
-
-void CatalogueActionManager::refreshCreateInCatalogueAction()
-{
-    //    auto& actionController = sqpApp->actionsGuiController();
-
-    //    for (auto action : impl->m_CreateInCatalogueActions)
-    //    {
-    //        actionController.removeAction(action);
-    //    }
-    //    impl->m_CreateInCatalogueActions.clear();
-
-    //    auto allCatalogues
-    //        = impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT);
-
-    //    for (auto catalogue : allCatalogues)
-    //    {
-    //        auto catalogueName = catalogue->getName();
-    //        auto createEventInCatalogueAction = actionController.addSectionZoneAction(
-    //            { CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME },
-    //            QObject::tr("In \"").append(catalogueName).append("\""), [this, catalogue](auto
-    //            zones) {
-    //                impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, catalogue);
-    //            });
-    //        createEventInCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());
-    //        impl->m_CreateInCatalogueActions << createEventInCatalogueAction;
-    //    }
-}
diff --git a/gui/src/Catalogue/CatalogueEventsModel.cpp b/gui/src/Catalogue/CatalogueEventsModel.cpp
deleted file mode 100644
index db27a73..0000000
--- a/gui/src/Catalogue/CatalogueEventsModel.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-#include "Catalogue/CatalogueEventsModel.h"
-
-#include <Catalogue/CatalogueController.h>
-#include <Common/DateUtils.h>
-#include <Common/MimeTypesDef.h>
-#include <Data/DateTimeRange.h>
-#include <Repository.hpp>
-#include <SqpApplication.h>
-#include <Time/TimeController.h>
-
-#include <list>
-#include <unordered_map>
-
-#include <QHash>
-#include <QMimeData>
-
-Q_LOGGING_CATEGORY(LOG_CatalogueEventsModel, "CatalogueEventsModel")
-
-const auto EVENT_ITEM_TYPE = 1;
-const auto EVENT_PRODUCT_ITEM_TYPE = 2;
-
-struct CatalogueEventsModel::CatalogueEventsModelPrivate
-{
-    std::vector<CatalogueController::Event_ptr> m_Events;
-    // std::unordered_map<DBEvent*, QVector<std::shared_ptr<DBEventProduct>>> m_EventProducts;
-    // QVector<std::shared_ptr<DBCatalogue>> m_SourceCatalogue;
-
-    QStringList columnNames()
-    {
-        return QStringList { tr("Event"), tr("TStart"), tr("TEnd"), tr("Tags"), tr("Product"),
-            tr("") };
-    }
-
-    QVariant sortData(int col, const CatalogueController::Event_ptr& event) const
-    {
-        if (col == (int)CatalogueEventsModel::Column::Validation)
-        {
-            auto hasChanges = sqpApp->catalogueController().hasUnsavedChanges(event);
-            return hasChanges ? true : QVariant();
-        }
-
-        return eventData(col, event);
-    }
-
-    QVariant eventData(int col, const CatalogueController::Event_ptr& event) const
-    {
-        switch (static_cast<Column>(col))
-        {
-            case CatalogueEventsModel::Column::Name:
-                return QString::fromStdString(event->name);
-            case CatalogueEventsModel::Column::TStart:
-                if (auto start = event->startTime())
-                    return DateUtils::dateTime(*start).toString(DATETIME_FORMAT_ONE_LINE);
-                else
-                    return QVariant {};
-            case CatalogueEventsModel::Column::TEnd:
-                if (auto stop = event->stopTime())
-                    return DateUtils::dateTime(*stop).toString(DATETIME_FORMAT_ONE_LINE);
-                else
-                    return QVariant {};
-            case CatalogueEventsModel::Column::Product:
-            {
-                QStringList eventProductList;
-                for (const auto& evtProduct : event->products)
-                {
-                    eventProductList << QString::fromStdString(evtProduct.name);
-                }
-                return eventProductList.join(";");
-            }
-            case CatalogueEventsModel::Column::Tags:
-            {
-                QString tagList;
-                for (const auto& tag : event->tags)
-                {
-                    tagList += QString::fromStdString(tag);
-                    tagList += ' ';
-                }
-                return tagList;
-            }
-            case CatalogueEventsModel::Column::Validation:
-                return QVariant();
-            default:
-                break;
-        }
-
-        Q_ASSERT(false);
-        return QStringLiteral("Unknown Data");
-    }
-
-    void parseEventProduct(const CatalogueController::Event_ptr& event)
-    {
-        //        for (auto& product : event->products)
-        //        {
-        //            m_EventProducts[event.get()].append(std::make_shared<DBEventProduct>(product));
-        //        }
-    }
-
-    std::size_t nbEventProducts(const CatalogueController::Event_ptr& event) const
-    {
-        if (event)
-        {
-            return event->products.size();
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    QVariant eventProductData(int col, const CatalogueController::Product_t& eventProduct) const
-    {
-        switch (static_cast<Column>(col))
-        {
-            case CatalogueEventsModel::Column::Name:
-                return QString::fromStdString(eventProduct.name);
-            case CatalogueEventsModel::Column::TStart:
-                return DateUtils::dateTime(eventProduct.startTime)
-                    .toString(DATETIME_FORMAT_ONE_LINE);
-            case CatalogueEventsModel::Column::TEnd:
-                return DateUtils::dateTime(eventProduct.stopTime)
-                    .toString(DATETIME_FORMAT_ONE_LINE);
-            case CatalogueEventsModel::Column::Product:
-                return QString::fromStdString(eventProduct.name);
-            case CatalogueEventsModel::Column::Tags:
-                return QString();
-            case CatalogueEventsModel::Column::Validation:
-                return QVariant();
-            default:
-                break;
-        }
-
-        Q_ASSERT(false);
-        return QStringLiteral("Unknown Data");
-    }
-
-    void refreshChildrenOfIndex(CatalogueEventsModel* model, const QModelIndex& index) const
-    {
-        auto childCount = model->rowCount(index);
-        auto colCount = model->columnCount();
-        emit model->dataChanged(
-            model->index(0, 0, index), model->index(childCount, colCount, index));
-    }
-};
-
-CatalogueEventsModel::CatalogueEventsModel(QObject* parent)
-        : QAbstractItemModel(parent)
-        , impl { spimpl::make_unique_impl<CatalogueEventsModelPrivate>() }
-{
-}
-
-void CatalogueEventsModel::setSourceCatalogues(
-    const QVector<std::shared_ptr<DBCatalogue>>& catalogues)
-{
-    // impl->m_SourceCatalogue = catalogues;
-}
-
-void CatalogueEventsModel::setEvents(const std::vector<CatalogueController::Event_ptr>& events)
-{
-    beginResetModel();
-
-    impl->m_Events = events;
-
-    endResetModel();
-}
-
-CatalogueController::Event_ptr CatalogueEventsModel::getEvent(const QModelIndex& index) const
-{
-    if (itemTypeOf(index) == CatalogueEventsModel::ItemType::Event)
-    {
-        return impl->m_Events[index.row()];
-    }
-    else
-    {
-        return nullptr;
-    }
-}
-
-CatalogueController::Event_ptr CatalogueEventsModel::getParentEvent(const QModelIndex& index) const
-{
-    if (itemTypeOf(index) == CatalogueEventsModel::ItemType::EventProduct)
-    {
-        return getEvent(index.parent());
-    }
-    else
-    {
-        return nullptr;
-    }
-}
-
-std::optional<CatalogueController::Product_t> CatalogueEventsModel::getEventProduct(
-    const QModelIndex& index) const
-{
-    if (itemTypeOf(index) == CatalogueEventsModel::ItemType::EventProduct)
-    {
-        auto event = *static_cast<CatalogueController::Event_ptr*>(index.internalPointer());
-        return event->products[index.row()];
-    }
-    else
-    {
-        return std::nullopt;
-    }
-}
-
-void CatalogueEventsModel::addEvent(const std::shared_ptr<DBEvent>& event)
-{
-    //    beginInsertRows(QModelIndex(), impl->m_Events.count(), impl->m_Events.count());
-    //    impl->m_Events.append(event);
-    //    impl->parseEventProduct(event);
-    //    endInsertRows();
-
-    //    // Also refreshes its children event products
-    //    auto eventIndex = index(impl->m_Events.count(), 0);
-    //    impl->refreshChildrenOfIndex(this, eventIndex);
-}
-
-void CatalogueEventsModel::removeEvent(const std::shared_ptr<DBEvent>& event)
-{
-    //    auto index = impl->m_Events.indexOf(event);
-    //    if (index >= 0)
-    //    {
-    //        beginRemoveRows(QModelIndex(), index, index);
-    //        impl->m_Events.removeAt(index);
-    //        impl->m_EventProducts.erase(event.get());
-    //        endRemoveRows();
-    //    }
-}
-
-std::vector<CatalogueController::Event_ptr> CatalogueEventsModel::events() const
-{
-    return impl->m_Events;
-}
-
-void CatalogueEventsModel::refreshEvent(
-    const CatalogueController::Event_ptr& event, bool refreshEventProducts)
-{
-    auto eventIndex = indexOf(event);
-    if (eventIndex.isValid())
-    {
-        // Refreshes the event line
-        auto colCount = columnCount();
-        emit dataChanged(eventIndex, index(eventIndex.row(), colCount));
-        // Also refreshes its children event products
-        impl->refreshChildrenOfIndex(this, eventIndex);
-    }
-    else
-    {
-        qCWarning(LOG_CatalogueEventsModel()) << "refreshEvent: event not found.";
-    }
-}
-
-QModelIndex CatalogueEventsModel::indexOf(const CatalogueController::Event_ptr& event) const
-{
-    auto pos = std::distance(std::begin(impl->m_Events),
-        find(std::begin(impl->m_Events), std::end(impl->m_Events), event));
-    if (pos >= 0 && pos < impl->m_Events.size())
-    {
-        return index(pos, 0);
-    }
-
-    return QModelIndex();
-}
-
-QModelIndex CatalogueEventsModel::index(int row, int column, const QModelIndex& parent) const
-{
-    if (!hasIndex(row, column, parent))
-    {
-        return QModelIndex();
-    }
-
-    switch (itemTypeOf(parent))
-    {
-        case CatalogueEventsModel::ItemType::Root:
-            return createIndex(row, column);
-        case CatalogueEventsModel::ItemType::Event:
-        {
-            auto event = getEvent(parent);
-            return createIndex(row, column, event.get());
-        }
-        case CatalogueEventsModel::ItemType::EventProduct:
-            break;
-        default:
-            break;
-    }
-
-    return QModelIndex();
-}
-
-QModelIndex CatalogueEventsModel::parent(const QModelIndex& index) const
-{
-    switch (itemTypeOf(index))
-    {
-        case CatalogueEventsModel::ItemType::EventProduct:
-        {
-            auto parentEvent
-                = *static_cast<CatalogueController::Event_ptr*>(index.internalPointer());
-            auto it = std::find_if(impl->m_Events.cbegin(), impl->m_Events.cend(),
-                [parentEvent](auto event) { return event.get() == parentEvent.get(); });
-
-            if (it != impl->m_Events.cend())
-            {
-                return createIndex(it - impl->m_Events.cbegin(), 0);
-            }
-            else
-            {
-                return QModelIndex();
-            }
-        }
-        case CatalogueEventsModel::ItemType::Root:
-            break;
-        case CatalogueEventsModel::ItemType::Event:
-            break;
-        default:
-            break;
-    }
-
-    return QModelIndex();
-}
-
-int CatalogueEventsModel::rowCount(const QModelIndex& parent) const
-{
-    if (parent.column() > 0)
-    {
-        return 0;
-    }
-
-    switch (itemTypeOf(parent))
-    {
-        case CatalogueEventsModel::ItemType::Root:
-            return impl->m_Events.size();
-        case CatalogueEventsModel::ItemType::Event:
-        {
-            auto event = getEvent(parent);
-            return event->products.size();
-        }
-        case CatalogueEventsModel::ItemType::EventProduct:
-            break;
-        default:
-            break;
-    }
-
-    return 0;
-}
-
-int CatalogueEventsModel::columnCount(const QModelIndex& parent) const
-{
-    return static_cast<int>(CatalogueEventsModel::Column::NbColumn);
-}
-
-Qt::ItemFlags CatalogueEventsModel::flags(const QModelIndex& index) const
-{
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
-}
-
-QVariant CatalogueEventsModel::data(const QModelIndex& index, int role) const
-{
-    if (index.isValid())
-    {
-
-        auto type = itemTypeOf(index);
-        if (type == CatalogueEventsModel::ItemType::Event)
-        {
-            auto event = getEvent(index);
-            switch (role)
-            {
-                case Qt::DisplayRole:
-                    return impl->eventData(index.column(), event);
-                    break;
-            }
-        }
-        else if (type == CatalogueEventsModel::ItemType::EventProduct)
-        {
-            auto product = getEventProduct(index);
-            if (product)
-            {
-                switch (role)
-                {
-                    case Qt::DisplayRole:
-                        return impl->eventProductData(index.column(), *product);
-                        break;
-                }
-            }
-        }
-    }
-
-    return QVariant {};
-}
-
-QVariant CatalogueEventsModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
-    {
-        return impl->columnNames().value(section);
-    }
-
-    return QVariant();
-}
-
-void CatalogueEventsModel::sort(int column, Qt::SortOrder order)
-{
-    beginResetModel();
-    std::sort(
-        impl->m_Events.begin(), impl->m_Events.end(), [this, column, order](auto e1, auto e2) {
-            auto data1 = impl->sortData(column, e1);
-            auto data2 = impl->sortData(column, e2);
-
-            auto result = data1.toString() < data2.toString();
-
-            return order == Qt::AscendingOrder ? result : !result;
-        });
-
-    endResetModel();
-    emit modelSorted();
-}
-
-Qt::DropActions CatalogueEventsModel::supportedDragActions() const
-{
-    return Qt::CopyAction | Qt::MoveAction;
-}
-
-QStringList CatalogueEventsModel::mimeTypes() const
-{
-    return { MIME_TYPE_EVENT_LIST, MIME_TYPE_SOURCE_CATALOGUE_LIST, MIME_TYPE_TIME_RANGE };
-}
-
-QMimeData* CatalogueEventsModel::mimeData(const QModelIndexList& indexes) const
-{
-    auto mimeData = new QMimeData;
-
-    //    bool isFirst = true;
-
-    //    QVector<std::shared_ptr<DBEvent>> eventList;
-    //    QVector<std::shared_ptr<DBEventProduct>> eventProductList;
-
-    //    DateTimeRange firstTimeRange;
-    //    for (const auto& index : indexes)
-    //    {
-    //        if (index.column() == 0)
-    //        { // only the first column
-
-    //            auto type = itemTypeOf(index);
-    //            if (type == ItemType::Event)
-    //            {
-    //                auto event = getEvent(index);
-    //                eventList << event;
-
-    //                if (isFirst)
-    //                {
-    //                    isFirst = false;
-    //                    firstTimeRange.m_TStart = event->;
-    //                    firstTimeRange.m_TEnd = event->getTEnd();
-    //                }
-    //            }
-    //            else if (type == ItemType::EventProduct)
-    //            {
-    //                auto product = getEventProduct(index);
-    //                eventProductList << product;
-
-    //                if (isFirst)
-    //                {
-    //                    isFirst = false;
-    //                    firstTimeRange.m_TStart = product->getTStart();
-    //                    firstTimeRange.m_TEnd = product->getTEnd();
-    //                }
-    //            }
-    //        }
-    //    }
-
-    //    if (!eventList.isEmpty() && eventProductList.isEmpty())
-    //    {
-    //        auto eventsEncodedData = sqpApp->catalogueController().mimeDataForEvents(eventList);
-    //        mimeData->setData(MIME_TYPE_EVENT_LIST, eventsEncodedData);
-
-    //        auto sourceCataloguesEncodedData
-    //            = sqpApp->catalogueController().mimeDataForCatalogues(impl->m_SourceCatalogue);
-    //        mimeData->setData(MIME_TYPE_SOURCE_CATALOGUE_LIST, sourceCataloguesEncodedData);
-    //    }
-
-    //    if (eventList.count() + eventProductList.count() == 1)
-    //    {
-    //        // No time range MIME data if multiple events are dragged
-    //        auto timeEncodedData = TimeController::mimeDataForTimeRange(firstTimeRange);
-    //        mimeData->setData(MIME_TYPE_TIME_RANGE, timeEncodedData);
-    //    }
-
-    return mimeData;
-}
-
-CatalogueEventsModel::ItemType CatalogueEventsModel::itemTypeOf(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return ItemType::Root;
-    }
-    else if (index.internalPointer() == nullptr)
-    {
-        return ItemType::Event;
-    }
-    else
-    {
-        return ItemType::EventProduct;
-    }
-}
diff --git a/gui/src/Catalogue/CatalogueEventsWidget.cpp b/gui/src/Catalogue/CatalogueEventsWidget.cpp
deleted file mode 100644
index f51e8e9..0000000
--- a/gui/src/Catalogue/CatalogueEventsWidget.cpp
+++ /dev/null
@@ -1,615 +0,0 @@
-#include "Catalogue/CatalogueEventsWidget.h"
-#include "ui_CatalogueEventsWidget.h"
-
-#include <Catalogue/CatalogueController.h>
-#include <Catalogue/CatalogueEventsModel.h>
-#include <Catalogue/CatalogueExplorerHelper.h>
-#include <CatalogueDao.h>
-#include <DBCatalogue.h>
-#include <DBEventProduct.h>
-#include <DataSource/DataSourceController.h>
-#include <DataSource/DataSourceItem.h>
-#include <SqpApplication.h>
-#include <Variable/Variable.h>
-#include <Variable/VariableController2.h>
-#include <Visualization/VisualizationGraphWidget.h>
-#include <Visualization/VisualizationTabWidget.h>
-#include <Visualization/VisualizationWidget.h>
-#include <Visualization/VisualizationZoneWidget.h>
-
-#include <QActionGroup>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QKeyEvent>
-#include <QListWidget>
-#include <QMenu>
-#include <QMessageBox>
-
-Q_LOGGING_CATEGORY(LOG_CatalogueEventsWidget, "CatalogueEventsWidget")
-
-/// Percentage added to the range of a event when it is displayed
-const auto EVENT_RANGE_MARGE = 30; // in %
-
-const QString NEW_ZONE_TEXT = QStringLiteral("New Zone");
-
-struct CatalogueEventsWidget::CatalogueEventsWidgetPrivate {
-
-    CatalogueEventsModel *m_Model = nullptr;
-    QStringList m_ZonesForTimeMode;
-    QString m_ZoneForGraphMode;
-    QVector<std::shared_ptr<DBCatalogue> > m_DisplayedCatalogues;
-    bool m_AllEventDisplayed = false;
-    QVector<VisualizationGraphWidget *> m_CustomGraphs;
-
-    VisualizationWidget *m_VisualizationWidget = nullptr;
-
-    void setEvents(const QVector<std::shared_ptr<DBEvent> > &events, CatalogueEventsWidget *widget)
-    {
-        widget->ui->treeView->setSortingEnabled(false);
-        m_Model->setSourceCatalogues(m_DisplayedCatalogues);
-        m_Model->setEvents(events);
-        widget->ui->treeView->setSortingEnabled(true);
-
-        for (auto event : events) {
-            if (sqpApp->catalogueController().eventHasChanges(event)) {
-                auto index = m_Model->indexOf(event);
-                widget->setEventChanges(event, true);
-            }
-        }
-    }
-
-    void addEvent(const std::shared_ptr<DBEvent> &event, QTreeView *treeView)
-    {
-        treeView->setSortingEnabled(false);
-        m_Model->addEvent(event);
-        treeView->setSortingEnabled(true);
-    }
-
-    void removeEvent(const std::shared_ptr<DBEvent> &event, QTreeView *treeView)
-    {
-        treeView->setSortingEnabled(false);
-        m_Model->removeEvent(event);
-        treeView->setSortingEnabled(true);
-    }
-
-    QStringList getAvailableVisualizationZoneList() const
-    {
-        if (m_VisualizationWidget) {
-            if (auto tab = m_VisualizationWidget->currentTabWidget()) {
-                return tab->availableZoneWidgets();
-            }
-        }
-
-        return QStringList{};
-    }
-
-    QStringList selectZone(QWidget *parent, const QStringList &selectedZones,
-                           bool allowMultiSelection, bool addNewZoneOption, const QPoint &location)
-    {
-        auto availableZones = getAvailableVisualizationZoneList();
-        if (!addNewZoneOption && availableZones.isEmpty()) {
-            return QStringList{};
-        }
-
-        QActionGroup actionGroup{parent};
-        actionGroup.setExclusive(!allowMultiSelection);
-
-        QVector<QAction *> zoneActions;
-
-        QMenu selectionMenu{parent};
-
-        if (addNewZoneOption) {
-            availableZones.prepend(NEW_ZONE_TEXT);
-        }
-
-        selectionMenu.addSeparator();
-        for (auto zone : availableZones) {
-            auto zoneAction = selectionMenu.addAction(zone);
-            zoneAction->setCheckable(true);
-            zoneAction->setChecked(selectedZones.contains(zone));
-            actionGroup.addAction(zoneAction);
-            zoneActions << zoneAction;
-        }
-
-        auto resultAction = selectionMenu.exec(QCursor::pos());
-
-        QStringList result;
-
-        if (resultAction == nullptr) {
-            result = selectedZones;
-        }
-        else {
-            for (auto zoneAction : zoneActions) {
-                if (zoneAction->isChecked()) {
-                    result << zoneAction->text();
-                }
-            }
-        }
-
-        return result;
-    }
-
-    void updateForTimeMode(QTreeView *treeView)
-    {
-        auto selectedRows = treeView->selectionModel()->selectedRows();
-
-        if (selectedRows.count() == 1) {
-            auto event = m_Model->getEvent(selectedRows.first());
-            if (event) {
-                if (m_VisualizationWidget) {
-                    if (auto tab = m_VisualizationWidget->currentTabWidget()) {
-
-                        for (auto zoneName : m_ZonesForTimeMode) {
-                            if (auto zone = tab->getZoneWithName(zoneName)) {
-                                DateTimeRange eventRange;
-                                eventRange.m_TStart = event->getTStart();
-                                eventRange.m_TEnd = event->getTEnd();
-                                zone->setZoneRange(eventRange);
-                            }
-                        }
-                    }
-                    else {
-                        qCWarning(LOG_CatalogueEventsWidget())
-                            << "updateTimeZone: no tab found in the visualization";
-                    }
-                }
-                else {
-                    qCWarning(LOG_CatalogueEventsWidget())
-                        << "updateTimeZone: visualization widget not found";
-                }
-            }
-        }
-        else {
-            qCWarning(LOG_CatalogueEventsWidget())
-                << "updateTimeZone: not compatible with multiple events selected";
-        }
-    }
-
-    QVector<DateTimeRange> getGraphRanges(const std::shared_ptr<DBEvent> &event)
-    {
-        // Retrieves the range of each product and the maximum size
-        QVector<DateTimeRange> graphRanges;
-        double maxDt = 0;
-        for (auto eventProduct : event->getEventProducts()) {
-            DateTimeRange eventRange;
-            eventRange.m_TStart = eventProduct.getTStart();
-            eventRange.m_TEnd = eventProduct.getTEnd();
-            graphRanges << eventRange;
-
-            auto dt = eventRange.m_TEnd - eventRange.m_TStart;
-            if (dt > maxDt) {
-                maxDt = dt;
-            }
-        }
-
-        // Adds the marge
-        maxDt *= (100.0 + EVENT_RANGE_MARGE) / 100.0;
-
-        // Corrects the graph ranges so that they all have the same size
-        QVector<DateTimeRange> correctedGraphRanges;
-        for (auto range : graphRanges) {
-            auto dt = range.m_TEnd - range.m_TStart;
-            auto diff = qAbs((maxDt - dt) / 2.0);
-
-            DateTimeRange correctedRange;
-            correctedRange.m_TStart = range.m_TStart - diff;
-            correctedRange.m_TEnd = range.m_TEnd + diff;
-
-            correctedGraphRanges << correctedRange;
-        }
-
-        return correctedGraphRanges;
-    }
-
-    void updateForGraphMode(CatalogueEventsWidget *catalogueEventWidget)
-    {
-        auto selectedRows = catalogueEventWidget->ui->treeView->selectionModel()->selectedRows();
-        if (selectedRows.count() != 1) {
-            qCWarning(LOG_CatalogueEventsWidget())
-                << "updateGraphMode: not compatible with multiple events selected";
-            return;
-        }
-
-        if (!m_VisualizationWidget) {
-            qCWarning(LOG_CatalogueEventsWidget())
-                << "updateGraphMode: visualization widget not found";
-            return;
-        }
-
-        auto event = m_Model->getEvent(selectedRows.first());
-        if (!event) {
-            // A event product is probably selected
-            qCInfo(LOG_CatalogueEventsWidget()) << "updateGraphMode: no events are selected";
-            return;
-        }
-
-        auto tab = m_VisualizationWidget->currentTabWidget();
-        if (!tab) {
-            qCWarning(LOG_CatalogueEventsWidget())
-                << "updateGraphMode: no tab found in the visualization";
-            return;
-        }
-
-        auto isNewZone = m_ZoneForGraphMode == NEW_ZONE_TEXT;
-        auto zone = tab->getZoneWithName(m_ZoneForGraphMode);
-        if (!isNewZone && !zone) {
-            qCWarning(LOG_CatalogueEventsWidget()) << "updateGraphMode: zone not found";
-            return;
-        }
-
-        // Closes the previous graph and delete the asociated variables
-        for (auto graph : m_CustomGraphs) {
-            graph->close();
-            auto variables = graph->variables();
-            for(const auto& variable:variables)
-                sqpApp->variableController().deleteVariable(variable);
-        }
-        m_CustomGraphs.clear();
-
-        // Closes the remaining graphs inside the zone
-        if (zone) {
-            zone->closeAllGraphs();
-        }
-
-        // Creates the zone if needed
-        if (isNewZone) {
-            zone = tab->createEmptyZone(0);
-            m_ZoneForGraphMode = zone->name();
-        }
-
-        // Calculates the range of each graph which will be created
-        auto graphRange = getGraphRanges(event);
-
-        // Loops through the event products and create the graph
-        auto itRange = graphRange.cbegin();
-        for (auto eventProduct : event->getEventProducts()) {
-            auto productId = eventProduct.getProductId();
-
-            auto range = *itRange;
-            ++itRange;
-
-            DateTimeRange productRange;
-            productRange.m_TStart = eventProduct.getTStart();
-            productRange.m_TEnd = eventProduct.getTEnd();
-
-            auto context = new QObject{catalogueEventWidget};
-            QObject::connect(
-                &sqpApp->variableController(), &VariableController2::variableAdded, context,
-                [this, catalogueEventWidget, zone, context, event, range, productRange,
-                 productId](auto variable) {
-
-                    if (variable->metadata().value(DataSourceItem::ID_DATA_KEY).toString()
-                        == productId) {
-                        auto graph = zone->createGraph(variable);
-                        graph->setAutoRangeOnVariableInitialization(false);
-
-                        auto selectionZone
-                            = graph->addSelectionZone(event->getName(), productRange);
-                        emit catalogueEventWidget->selectionZoneAdded(event, productId,
-                                                                      selectionZone);
-                        m_CustomGraphs << graph;
-
-                        graph->setGraphRange(range, true, true);
-
-                        // Removes the graph from the graph list if it is closed manually
-                        QObject::connect(graph, &VisualizationGraphWidget::destroyed,
-                                         [this, graph]() { m_CustomGraphs.removeAll(graph); });
-
-                        delete context; // removes the connection
-                    }
-                },
-                Qt::QueuedConnection);
-
-            QMetaObject::invokeMethod(&sqpApp->dataSourceController(),
-                                      "requestVariableFromProductIdKey", Qt::QueuedConnection,
-                                      Q_ARG(QString, productId));
-        }
-    }
-
-    void getSelectedItems(
-        QTreeView *treeView, QVector<std::shared_ptr<DBEvent> > &events,
-        QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > > &eventProducts)
-    {
-        for (auto rowIndex : treeView->selectionModel()->selectedRows()) {
-            auto itemType = m_Model->itemTypeOf(rowIndex);
-            if (itemType == CatalogueEventsModel::ItemType::Event) {
-                events << m_Model->getEvent(rowIndex);
-            }
-            else if (itemType == CatalogueEventsModel::ItemType::EventProduct) {
-                eventProducts << qMakePair(m_Model->getParentEvent(rowIndex),
-                                           m_Model->getEventProduct(rowIndex));
-            }
-        }
-    }
-};
-
-CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent)
-        : QWidget(parent),
-          ui(new Ui::CatalogueEventsWidget),
-          impl{spimpl::make_unique_impl<CatalogueEventsWidgetPrivate>()}
-{
-    ui->setupUi(this);
-
-    impl->m_Model = new CatalogueEventsModel{this};
-    ui->treeView->setModel(impl->m_Model);
-
-    ui->treeView->setSortingEnabled(true);
-    ui->treeView->setDragDropMode(QAbstractItemView::DragDrop);
-    ui->treeView->setDragEnabled(true);
-
-
-    connect(ui->btnTime, &QToolButton::clicked, [this](auto checked) {
-        if (checked) {
-            ui->btnChart->setChecked(false);
-            impl->m_ZonesForTimeMode
-                = impl->selectZone(this, impl->m_ZonesForTimeMode, true, false,
-                                   this->mapToGlobal(ui->btnTime->frameGeometry().center()));
-
-            impl->updateForTimeMode(ui->treeView);
-        }
-    });
-
-    connect(ui->btnChart, &QToolButton::clicked, [this](auto checked) {
-        if (checked) {
-            ui->btnTime->setChecked(false);
-
-            impl->m_ZoneForGraphMode
-                = impl->selectZone(this, {impl->m_ZoneForGraphMode}, false, true,
-                                   this->mapToGlobal(ui->btnChart->frameGeometry().center()))
-                      .value(0);
-
-            impl->updateForGraphMode(this);
-        }
-    });
-
-    connect(ui->btnRemove, &QToolButton::clicked, [this]() {
-        QVector<std::shared_ptr<DBEvent> > events;
-        QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > > eventProducts;
-        impl->getSelectedItems(ui->treeView, events, eventProducts);
-
-        if (!events.isEmpty() && eventProducts.isEmpty()) {
-
-            auto canRemoveEvent
-                = !this->isAllEventsDisplayed()
-                  || (QMessageBox::warning(
-                          this, tr("Remove Event(s)"),
-                          tr("The selected event(s) will be permanently removed "
-                             "from the repository!\nAre you sure you want to continue?"),
-                          QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
-                      == QMessageBox::Yes);
-
-            if (canRemoveEvent) {
-                for (auto event : events) {
-                    if (this->isAllEventsDisplayed()) {
-                        sqpApp->catalogueController().removeEvent(event);
-                        impl->removeEvent(event, ui->treeView);
-                    }
-                    else {
-                        QVector<std::shared_ptr<DBCatalogue> > modifiedCatalogues;
-                        for (auto catalogue : this->displayedCatalogues()) {
-                            if (catalogue->removeEvent(event->getUniqId())) {
-                                sqpApp->catalogueController().updateCatalogue(catalogue);
-                                modifiedCatalogues << catalogue;
-                            }
-                        }
-                        if (!modifiedCatalogues.empty()) {
-                            emit eventCataloguesModified(modifiedCatalogues);
-                        }
-                    }
-                    impl->m_Model->removeEvent(event);
-                }
-
-
-                emit this->eventsRemoved(events);
-            }
-        }
-    });
-
-    connect(ui->treeView, &QTreeView::clicked, this, &CatalogueEventsWidget::emitSelection);
-    connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
-            &CatalogueEventsWidget::emitSelection);
-
-    ui->btnRemove->setEnabled(false); // Disabled by default when nothing is selected
-    connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, [this]() {
-        auto isNotMultiSelection = ui->treeView->selectionModel()->selectedRows().count() <= 1;
-        ui->btnChart->setEnabled(isNotMultiSelection);
-        ui->btnTime->setEnabled(isNotMultiSelection);
-
-        if (isNotMultiSelection && ui->btnTime->isChecked()) {
-            impl->updateForTimeMode(ui->treeView);
-        }
-        else if (isNotMultiSelection && ui->btnChart->isChecked()) {
-            impl->updateForGraphMode(this);
-        }
-
-        QVector<std::shared_ptr<DBEvent> > events;
-        QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > > eventProducts;
-        impl->getSelectedItems(ui->treeView, events, eventProducts);
-        ui->btnRemove->setEnabled(!events.isEmpty() && eventProducts.isEmpty());
-    });
-
-    ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-    ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Tags,
-                                                 QHeaderView::Stretch);
-    ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Validation,
-                                                 QHeaderView::ResizeToContents);
-    ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Name,
-                                                 QHeaderView::Interactive);
-    ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::TStart,
-                                                 QHeaderView::ResizeToContents);
-    ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::TEnd,
-                                                 QHeaderView::ResizeToContents);
-    ui->treeView->header()->setSortIndicatorShown(true);
-
-    connect(impl->m_Model, &CatalogueEventsModel::modelSorted, [this]() {
-        auto allEvents = impl->m_Model->events();
-        for (auto event : allEvents) {
-            setEventChanges(event, sqpApp->catalogueController().eventHasChanges(event));
-        }
-    });
-
-    populateWithAllEvents();
-}
-
-CatalogueEventsWidget::~CatalogueEventsWidget()
-{
-    delete ui;
-}
-
-void CatalogueEventsWidget::setVisualizationWidget(VisualizationWidget *visualization)
-{
-    impl->m_VisualizationWidget = visualization;
-}
-
-void CatalogueEventsWidget::addEvent(const std::shared_ptr<DBEvent> &event)
-{
-    impl->addEvent(event, ui->treeView);
-}
-
-void CatalogueEventsWidget::setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges)
-{
-    impl->m_Model->refreshEvent(event);
-
-    auto eventIndex = impl->m_Model->indexOf(event);
-    auto validationIndex
-        = eventIndex.sibling(eventIndex.row(), (int)CatalogueEventsModel::Column::Validation);
-
-    if (validationIndex.isValid()) {
-        if (hasChanges) {
-            if (ui->treeView->indexWidget(validationIndex) == nullptr) {
-                auto widget = CatalogueExplorerHelper::buildValidationWidget(
-                    ui->treeView,
-                    [this, event]() {
-                        sqpApp->catalogueController().saveEvent(event);
-                        setEventChanges(event, false);
-                    },
-                    [this, event]() {
-                        bool removed = false;
-                        sqpApp->catalogueController().discardEvent(event, removed);
-                        if (removed) {
-                            impl->m_Model->removeEvent(event);
-                        }
-                        else {
-                            setEventChanges(event, false);
-                            impl->m_Model->refreshEvent(event, true);
-                        }
-                        emitSelection();
-                    });
-                ui->treeView->setIndexWidget(validationIndex, widget);
-                ui->treeView->header()->resizeSection((int)CatalogueEventsModel::Column::Validation,
-                                                      QHeaderView::ResizeToContents);
-            }
-        }
-        else {
-            // Note: the widget is destroyed
-            ui->treeView->setIndexWidget(validationIndex, nullptr);
-        }
-    }
-    else {
-        qCWarning(LOG_CatalogueEventsWidget())
-            << "setEventChanges: the event is not displayed in the model.";
-    }
-}
-
-QVector<std::shared_ptr<DBCatalogue> > CatalogueEventsWidget::displayedCatalogues() const
-{
-    return impl->m_DisplayedCatalogues;
-}
-
-bool CatalogueEventsWidget::isAllEventsDisplayed() const
-{
-    return impl->m_AllEventDisplayed;
-}
-
-bool CatalogueEventsWidget::isEventDisplayed(const std::shared_ptr<DBEvent> &event) const
-{
-    return impl->m_Model->indexOf(event).isValid();
-}
-
-void CatalogueEventsWidget::refreshEvent(const std::shared_ptr<DBEvent> &event)
-{
-    impl->m_Model->refreshEvent(event, true);
-}
-
-void CatalogueEventsWidget::populateWithCatalogues(
-    const QVector<std::shared_ptr<DBCatalogue> > &catalogues)
-{
-    impl->m_DisplayedCatalogues = catalogues;
-    impl->m_AllEventDisplayed = false;
-
-    QSet<QUuid> eventIds;
-    QVector<std::shared_ptr<DBEvent> > events;
-
-    for (auto catalogue : catalogues) {
-        auto catalogueEvents = sqpApp->catalogueController().retrieveEventsFromCatalogue(catalogue);
-        for (auto event : catalogueEvents) {
-            if (!eventIds.contains(event->getUniqId())) {
-                events << event;
-                eventIds.insert(event->getUniqId());
-            }
-        }
-    }
-
-    impl->setEvents(events, this);
-}
-
-void CatalogueEventsWidget::populateWithAllEvents()
-{
-    impl->m_DisplayedCatalogues.clear();
-    impl->m_AllEventDisplayed = true;
-
-    auto allEvents = sqpApp->catalogueController().retrieveAllEvents();
-
-    QVector<std::shared_ptr<DBEvent> > events;
-    for (auto event : allEvents) {
-        events << event;
-    }
-
-    impl->setEvents(events, this);
-}
-
-void CatalogueEventsWidget::clear()
-{
-    impl->m_DisplayedCatalogues.clear();
-    impl->m_AllEventDisplayed = false;
-    impl->setEvents({}, this);
-}
-
-void CatalogueEventsWidget::refresh()
-{
-    if (isAllEventsDisplayed()) {
-        populateWithAllEvents();
-    }
-    else if (!impl->m_DisplayedCatalogues.isEmpty()) {
-        populateWithCatalogues(impl->m_DisplayedCatalogues);
-    }
-}
-
-void CatalogueEventsWidget::emitSelection()
-{
-    QVector<std::shared_ptr<DBEvent> > events;
-    QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > > eventProducts;
-    impl->getSelectedItems(ui->treeView, events, eventProducts);
-
-    if (!events.isEmpty() && eventProducts.isEmpty()) {
-        emit eventsSelected(events);
-    }
-    else if (events.isEmpty() && !eventProducts.isEmpty()) {
-        emit eventProductsSelected(eventProducts);
-    }
-    else {
-        emit selectionCleared();
-    }
-}
-
-
-void CatalogueEventsWidget::keyPressEvent(QKeyEvent *event)
-{
-    switch (event->key()) {
-        case Qt::Key_Delete: {
-            ui->btnRemove->click();
-        }
-        default:
-            break;
-    }
-}
diff --git a/gui/src/Catalogue/CatalogueExplorer.cpp b/gui/src/Catalogue/CatalogueExplorer.cpp
deleted file mode 100644
index 414e6ca..0000000
--- a/gui/src/Catalogue/CatalogueExplorer.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-#include "Catalogue/CatalogueExplorer.h"
-#include "ui_CatalogueExplorer.h"
-
-#include <Catalogue/CatalogueActionManager.h>
-#include <Catalogue/CatalogueController.h>
-#include <SqpApplication.h>
-#include <Visualization/VisualizationGraphWidget.h>
-#include <Visualization/VisualizationSelectionZoneItem.h>
-#include <Visualization/VisualizationWidget.h>
-
-#include <DBCatalogue.h>
-#include <DBEvent.h>
-#include <DBEventProduct.h>
-
-#include <unordered_map>
-
-struct CatalogueExplorer::CatalogueExplorerPrivate {
-    CatalogueActionManager m_ActionManager;
-    std::unordered_map<std::shared_ptr<DBEvent>, QVector<VisualizationSelectionZoneItem *> >
-        m_SelectionZonesPerEvents;
-
-    QMetaObject::Connection m_Conn;
-
-    CatalogueExplorerPrivate(CatalogueExplorer *catalogueExplorer)
-            : m_ActionManager(catalogueExplorer)
-    {
-    }
-};
-
-CatalogueExplorer::CatalogueExplorer(QWidget *parent)
-        : QDialog(parent, Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),
-          ui(new Ui::CatalogueExplorer),
-          impl{spimpl::make_unique_impl<CatalogueExplorerPrivate>(this)}
-{
-    ui->setupUi(this);
-
-    impl->m_ActionManager.installSelectionZoneActions();
-
-    // Updates events and inspector when something is selected in the catalogue widget
-    connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSelected, [this](auto catalogues) {
-        if (catalogues.count() == 1) {
-            ui->inspector->setCatalogue(catalogues.first());
-        }
-        else {
-            ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
-        }
-
-        ui->events->populateWithCatalogues(catalogues);
-    });
-
-    connect(ui->catalogues, &CatalogueSideBarWidget::databaseSelected, [this](auto databases) {
-        ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
-    });
-
-    connect(ui->catalogues, &CatalogueSideBarWidget::trashSelected, [this]() {
-        ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
-        ui->events->clear();
-    });
-
-    connect(ui->catalogues, &CatalogueSideBarWidget::allEventsSelected, [this]() {
-        ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
-        ui->events->populateWithAllEvents();
-    });
-
-    connect(ui->catalogues, &CatalogueSideBarWidget::databaseSelected, [this](auto databaseList) {
-        QVector<std::shared_ptr<DBCatalogue> > catalogueList;
-        for (auto database : databaseList) {
-            catalogueList.append(ui->catalogues->getCatalogues(database));
-        }
-        ui->events->populateWithCatalogues(catalogueList);
-        ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
-    });
-
-    connect(ui->catalogues, &CatalogueSideBarWidget::selectionCleared, [this]() {
-        ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
-        ui->events->clear();
-    });
-
-    connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSaved, ui->events,
-            &CatalogueEventsWidget::refresh);
-
-    connect(ui->catalogues, &CatalogueSideBarWidget::catalogueListChanged,
-            [this]() { impl->m_ActionManager.refreshCreateInCatalogueAction(); });
-
-    // Updates the inspectot when something is selected in the events
-    connect(ui->events, &CatalogueEventsWidget::eventsSelected, [this](auto events) {
-        if (events.count() == 1) {
-            ui->inspector->setEvent(events.first());
-        }
-        else {
-            ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
-        }
-    });
-
-    connect(ui->events, &CatalogueEventsWidget::eventProductsSelected, [this](auto eventProducts) {
-        if (eventProducts.count() == 1) {
-            ui->inspector->setEventProduct(eventProducts.first().first,
-                                           eventProducts.first().second);
-        }
-        else {
-            ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
-        }
-    });
-
-    connect(ui->events, &CatalogueEventsWidget::selectionCleared,
-            [this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });
-
-    // Manage Selection Zones associated to events
-    connect(ui->events, &CatalogueEventsWidget::selectionZoneAdded,
-            [this](auto event, auto productId, auto zone) {
-                this->addSelectionZoneItem(event, productId, zone);
-            });
-
-    connect(ui->events, &CatalogueEventsWidget::eventsRemoved, [this](auto events) {
-        for (auto event : events) {
-            auto associatedSelectionZonesIt = impl->m_SelectionZonesPerEvents.find(event);
-            if (associatedSelectionZonesIt != impl->m_SelectionZonesPerEvents.cend()) {
-                for (auto selectionZone : associatedSelectionZonesIt->second) {
-                    auto parentGraph = selectionZone->parentGraphWidget();
-                    parentGraph->removeSelectionZone(selectionZone);
-                }
-
-                impl->m_SelectionZonesPerEvents.erase(event);
-            }
-        }
-    });
-
-    // Updates changes from the inspector
-    connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated, [this](auto catalogue) {
-        sqpApp->catalogueController().updateCatalogue(catalogue);
-        ui->catalogues->setCatalogueChanges(catalogue, true);
-        impl->m_ActionManager.refreshCreateInCatalogueAction();
-    });
-
-    connect(ui->inspector, &CatalogueInspectorWidget::eventUpdated, [this](auto event) {
-        sqpApp->catalogueController().updateEvent(event);
-        ui->events->setEventChanges(event, true);
-    });
-
-    connect(ui->inspector, &CatalogueInspectorWidget::eventProductUpdated,
-            [this](auto event, auto eventProduct) {
-                sqpApp->catalogueController().updateEventProduct(eventProduct);
-                ui->events->setEventChanges(event, true);
-            });
-
-    connect(ui->events, &CatalogueEventsWidget::eventCataloguesModified,
-            [this](const QVector<std::shared_ptr<DBCatalogue> > &catalogues) {
-                for (auto catalogue : catalogues) {
-                    ui->catalogues->setCatalogueChanges(catalogue, true);
-                }
-            });
-}
-
-CatalogueExplorer::~CatalogueExplorer()
-{
-    disconnect(impl->m_Conn);
-    delete ui;
-}
-
-void CatalogueExplorer::setVisualizationWidget(VisualizationWidget *visualization)
-{
-    ui->events->setVisualizationWidget(visualization);
-}
-
-CatalogueEventsWidget &CatalogueExplorer::eventsWidget() const
-{
-    return *ui->events;
-}
-
-CatalogueSideBarWidget &CatalogueExplorer::sideBarWidget() const
-{
-    return *ui->catalogues;
-}
-
-void CatalogueExplorer::clearSelectionZones()
-{
-    impl->m_SelectionZonesPerEvents.clear();
-}
-
-void CatalogueExplorer::addSelectionZoneItem(const std::shared_ptr<DBEvent> &event,
-                                             const QString &productId,
-                                             VisualizationSelectionZoneItem *selectionZone)
-{
-    impl->m_SelectionZonesPerEvents[event] << selectionZone;
-    connect(selectionZone, &VisualizationSelectionZoneItem::rangeEdited,
-            [event, productId, this](auto range) {
-                auto productList = event->getEventProducts();
-                for (auto &product : productList) {
-                    if (product.getProductId() == productId) {
-                        product.setTStart(range.m_TStart);
-                        product.setTEnd(range.m_TEnd);
-                    }
-                }
-                event->setEventProducts(productList);
-                sqpApp->catalogueController().updateEvent(event);
-                ui->events->refreshEvent(event);
-                ui->events->setEventChanges(event, true);
-                ui->inspector->refresh();
-            });
-
-    impl->m_Conn = connect(selectionZone, &VisualizationSelectionZoneItem::destroyed,
-                           [event, selectionZone, this]() {
-                               if (!impl->m_SelectionZonesPerEvents.empty()) {
-                                   impl->m_SelectionZonesPerEvents[event].removeAll(selectionZone);
-                               }
-                           });
-}
diff --git a/gui/src/Catalogue/CatalogueExplorerHelper.cpp b/gui/src/Catalogue/CatalogueExplorerHelper.cpp
deleted file mode 100644
index c08c38d..0000000
--- a/gui/src/Catalogue/CatalogueExplorerHelper.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "Catalogue/CatalogueExplorerHelper.h"
-
-#include <QBoxLayout>
-#include <QToolButton>
-
-
-QWidget *CatalogueExplorerHelper::buildValidationWidget(QWidget *parent, std::function<void()> save,
-                                                        std::function<void()> discard)
-{
-    auto widget = new QWidget{parent};
-
-    auto layout = new QHBoxLayout{widget};
-
-    auto btnValid = new QToolButton{widget};
-    btnValid->setIcon(QIcon{":/icones/save"});
-    btnValid->setAutoRaise(true);
-    QObject::connect(btnValid, &QToolButton::clicked, save);
-    layout->addWidget(btnValid);
-
-    auto btnDiscard = new QToolButton{widget};
-    btnDiscard->setIcon(QIcon{":/icones/discard"});
-    btnDiscard->setAutoRaise(true);
-    QObject::connect(btnDiscard, &QToolButton::clicked, discard);
-    layout->addWidget(btnDiscard);
-
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setSpacing(0);
-
-    return widget;
-}
diff --git a/gui/src/Catalogue/CatalogueInspectorWidget.cpp b/gui/src/Catalogue/CatalogueInspectorWidget.cpp
deleted file mode 100644
index c24cbcc..0000000
--- a/gui/src/Catalogue/CatalogueInspectorWidget.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-#include "Catalogue/CatalogueInspectorWidget.h"
-#include "ui_CatalogueInspectorWidget.h"
-
-#include <Common/DateUtils.h>
-#include <DBCatalogue.h>
-#include <DBEvent.h>
-#include <DBEventProduct.h>
-#include <DBTag.h>
-
-struct CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate {
-    std::shared_ptr<DBCatalogue> m_DisplayedCatalogue = nullptr;
-    std::shared_ptr<DBEvent> m_DisplayedEvent = nullptr;
-    std::shared_ptr<DBEventProduct> m_DisplayedEventProduct = nullptr;
-
-    void connectCatalogueUpdateSignals(CatalogueInspectorWidget *inspector,
-                                       Ui::CatalogueInspectorWidget *ui);
-    void connectEventUpdateSignals(CatalogueInspectorWidget *inspector,
-                                   Ui::CatalogueInspectorWidget *ui);
-};
-
-CatalogueInspectorWidget::CatalogueInspectorWidget(QWidget *parent)
-        : QWidget(parent),
-          ui(new Ui::CatalogueInspectorWidget),
-          impl{spimpl::make_unique_impl<CatalogueInspectorWidgetPrivate>()}
-{
-    ui->setupUi(this);
-    showPage(Page::Empty);
-
-    impl->connectCatalogueUpdateSignals(this, ui);
-    impl->connectEventUpdateSignals(this, ui);
-
-    ui->dateTimeEventTStart->setDisplayFormat(DATETIME_FORMAT);
-    ui->dateTimeEventTEnd->setDisplayFormat(DATETIME_FORMAT);
-}
-
-CatalogueInspectorWidget::~CatalogueInspectorWidget()
-{
-    delete ui;
-}
-
-void CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate::connectCatalogueUpdateSignals(
-    CatalogueInspectorWidget *inspector, Ui::CatalogueInspectorWidget *ui)
-{
-    connect(ui->leCatalogueName, &QLineEdit::editingFinished, [ui, inspector, this]() {
-        if (ui->leCatalogueName->text() != m_DisplayedCatalogue->getName()) {
-            m_DisplayedCatalogue->setName(ui->leCatalogueName->text());
-            emit inspector->catalogueUpdated(m_DisplayedCatalogue);
-        }
-    });
-
-    connect(ui->leCatalogueAuthor, &QLineEdit::editingFinished, [ui, inspector, this]() {
-        if (ui->leCatalogueAuthor->text() != m_DisplayedCatalogue->getAuthor()) {
-            m_DisplayedCatalogue->setAuthor(ui->leCatalogueAuthor->text());
-            emit inspector->catalogueUpdated(m_DisplayedCatalogue);
-        }
-    });
-}
-
-void CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate::connectEventUpdateSignals(
-    CatalogueInspectorWidget *inspector, Ui::CatalogueInspectorWidget *ui)
-{
-    connect(ui->leEventName, &QLineEdit::editingFinished, [ui, inspector, this]() {
-        if (ui->leEventName->text() != m_DisplayedEvent->getName()) {
-            m_DisplayedEvent->setName(ui->leEventName->text());
-            emit inspector->eventUpdated(m_DisplayedEvent);
-        }
-    });
-
-    connect(ui->leEventTags, &QLineEdit::editingFinished, [ui, inspector, this]() {
-        auto tags = ui->leEventTags->text().split(QRegExp("\\s+"), QString::SkipEmptyParts);
-        std::list<QString> tagNames;
-        for (auto tag : tags) {
-            tagNames.push_back(tag);
-        }
-
-        if (m_DisplayedEvent->getTagsNames() != tagNames) {
-            m_DisplayedEvent->setTagsNames(tagNames);
-            emit inspector->eventUpdated(m_DisplayedEvent);
-        }
-    });
-
-    connect(ui->leEventProduct, &QLineEdit::editingFinished, [ui, inspector, this]() {
-        if (ui->leEventProduct->text() != m_DisplayedEventProduct->getProductId()) {
-            auto oldProductId = m_DisplayedEventProduct->getProductId();
-            m_DisplayedEventProduct->setProductId(ui->leEventProduct->text());
-
-            auto eventProducts = m_DisplayedEvent->getEventProducts();
-            for (auto &eventProduct : eventProducts) {
-                if (eventProduct.getProductId() == oldProductId) {
-                    eventProduct.setProductId(m_DisplayedEventProduct->getProductId());
-                }
-            }
-            m_DisplayedEvent->setEventProducts(eventProducts);
-
-            emit inspector->eventUpdated(m_DisplayedEvent);
-        }
-    });
-
-    connect(ui->dateTimeEventTStart, &QDateTimeEdit::editingFinished, [ui, inspector, this]() {
-        auto time = DateUtils::secondsSinceEpoch(ui->dateTimeEventTStart->dateTime());
-        if (time != m_DisplayedEventProduct->getTStart()) {
-            m_DisplayedEventProduct->setTStart(time);
-
-            auto eventProducts = m_DisplayedEvent->getEventProducts();
-            for (auto &eventProduct : eventProducts) {
-                if (eventProduct.getProductId() == m_DisplayedEventProduct->getProductId()) {
-                    eventProduct.setTStart(m_DisplayedEventProduct->getTStart());
-                }
-            }
-            m_DisplayedEvent->setEventProducts(eventProducts);
-
-            emit inspector->eventUpdated(m_DisplayedEvent);
-        }
-    });
-
-    connect(ui->dateTimeEventTEnd, &QDateTimeEdit::editingFinished, [ui, inspector, this]() {
-        auto time = DateUtils::secondsSinceEpoch(ui->dateTimeEventTEnd->dateTime());
-        if (time != m_DisplayedEventProduct->getTEnd()) {
-            m_DisplayedEventProduct->setTEnd(time);
-
-            auto eventProducts = m_DisplayedEvent->getEventProducts();
-            for (auto &eventProduct : eventProducts) {
-                if (eventProduct.getProductId() == m_DisplayedEventProduct->getProductId()) {
-                    eventProduct.setTEnd(m_DisplayedEventProduct->getTEnd());
-                }
-            }
-            m_DisplayedEvent->setEventProducts(eventProducts);
-
-            emit inspector->eventUpdated(m_DisplayedEvent);
-        }
-    });
-}
-
-void CatalogueInspectorWidget::showPage(CatalogueInspectorWidget::Page page)
-{
-    ui->stackedWidget->setCurrentIndex(static_cast<int>(page));
-}
-
-CatalogueInspectorWidget::Page CatalogueInspectorWidget::currentPage() const
-{
-    return static_cast<Page>(ui->stackedWidget->currentIndex());
-}
-
-void CatalogueInspectorWidget::setEvent(const std::shared_ptr<DBEvent> &event)
-{
-    impl->m_DisplayedEvent = event;
-
-    blockSignals(true);
-
-    showPage(Page::EventProperties);
-    ui->leEventName->setEnabled(true);
-    ui->leEventName->setText(event->getName());
-    ui->leEventProduct->setEnabled(false);
-
-    auto eventProducts = event->getEventProducts();
-    QStringList eventProductList;
-    for (auto evtProduct : eventProducts) {
-        eventProductList << evtProduct.getProductId();
-    }
-
-    ui->leEventProduct->setText(eventProductList.join(";"));
-
-    QString tagList;
-    auto tags = event->getTagsNames();
-    for (auto tag : tags) {
-        tagList += tag;
-        tagList += ' ';
-    }
-
-    ui->leEventTags->setEnabled(true);
-    ui->leEventTags->setText(tagList);
-
-    ui->dateTimeEventTStart->setEnabled(false);
-    ui->dateTimeEventTEnd->setEnabled(false);
-
-    ui->dateTimeEventTStart->setDateTime(DateUtils::dateTime(event->getTStart()));
-    ui->dateTimeEventTEnd->setDateTime(DateUtils::dateTime(event->getTEnd()));
-
-    blockSignals(false);
-}
-
-void CatalogueInspectorWidget::setEventProduct(const std::shared_ptr<DBEvent> &event,
-                                               const std::shared_ptr<DBEventProduct> &eventProduct)
-{
-
-    impl->m_DisplayedEvent = event;
-    impl->m_DisplayedEventProduct = eventProduct;
-
-    blockSignals(true);
-
-    showPage(Page::EventProperties);
-    ui->leEventName->setEnabled(false);
-    ui->leEventName->setText(event->getName());
-    ui->leEventProduct->setEnabled(false);
-    ui->leEventProduct->setText(eventProduct->getProductId());
-
-    ui->leEventTags->setEnabled(false);
-    ui->leEventTags->clear();
-
-    ui->dateTimeEventTStart->setEnabled(true);
-    ui->dateTimeEventTEnd->setEnabled(true);
-
-    ui->dateTimeEventTStart->setDateTime(DateUtils::dateTime(eventProduct->getTStart()));
-    ui->dateTimeEventTEnd->setDateTime(DateUtils::dateTime(eventProduct->getTEnd()));
-
-    blockSignals(false);
-}
-
-void CatalogueInspectorWidget::setCatalogue(const std::shared_ptr<DBCatalogue> &catalogue)
-{
-    impl->m_DisplayedCatalogue = catalogue;
-
-    blockSignals(true);
-
-    showPage(Page::CatalogueProperties);
-    ui->leCatalogueName->setText(catalogue->getName());
-    ui->leCatalogueAuthor->setText(catalogue->getAuthor());
-
-    blockSignals(false);
-}
-
-void CatalogueInspectorWidget::refresh()
-{
-    switch (static_cast<Page>(ui->stackedWidget->currentIndex())) {
-        case Page::CatalogueProperties:
-            setCatalogue(impl->m_DisplayedCatalogue);
-            break;
-        case Page::EventProperties: {
-            auto isEventShowed = ui->leEventName->isEnabled();
-            setEvent(impl->m_DisplayedEvent);
-            if (!isEventShowed && impl->m_DisplayedEvent) {
-                setEventProduct(impl->m_DisplayedEvent, impl->m_DisplayedEventProduct);
-            }
-        }
-    }
-}
diff --git a/gui/src/Catalogue/CatalogueSideBarWidget.cpp b/gui/src/Catalogue/CatalogueSideBarWidget.cpp
deleted file mode 100644
index 8a2312d..0000000
--- a/gui/src/Catalogue/CatalogueSideBarWidget.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-#include "Catalogue/CatalogueSideBarWidget.h"
-#include "ui_CatalogueSideBarWidget.h"
-#include <SqpApplication.h>
-
-#include <Catalogue/CatalogueController.h>
-#include <Catalogue/CatalogueExplorerHelper.h>
-#include <Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.h>
-#include <Catalogue/CatalogueTreeItems/CatalogueTreeItem.h>
-#include <Catalogue/CatalogueTreeModel.h>
-#include <CatalogueDao.h>
-#include <Common/MimeTypesDef.h>
-#include <ComparaisonPredicate.h>
-#include <DBCatalogue.h>
-
-#include <QKeyEvent>
-#include <QMenu>
-#include <QMessageBox>
-#include <QMimeData>
-
-Q_LOGGING_CATEGORY(LOG_CatalogueSideBarWidget, "CatalogueSideBarWidget")
-
-
-constexpr auto ALL_EVENT_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 1;
-constexpr auto TRASH_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 2;
-constexpr auto CATALOGUE_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 3;
-constexpr auto DATABASE_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 4;
-
-const auto DEFAULT_CATALOGUE_NAME = QObject::tr("Catalogue");
-
-
-struct CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate {
-
-    CatalogueTreeModel *m_TreeModel = nullptr;
-
-    void configureTreeWidget(QTreeView *treeView);
-    QModelIndex addDatabaseItem(const QString &name);
-    CatalogueAbstractTreeItem *getDatabaseItem(const QString &name);
-    CatalogueAbstractTreeItem *addCatalogueItem(const std::shared_ptr<DBCatalogue> &catalogue,
-                                                const QModelIndex &databaseIndex);
-
-    CatalogueTreeItem *getCatalogueItem(const std::shared_ptr<DBCatalogue> &catalogue) const;
-    void setHasChanges(bool value, const QModelIndex &index, CatalogueSideBarWidget *sideBarWidget);
-    bool hasChanges(const QModelIndex &index, QTreeView *treeView);
-
-    int selectionType(QTreeView *treeView) const
-    {
-        auto selectedItems = treeView->selectionModel()->selectedRows();
-        if (selectedItems.isEmpty()) {
-            return CatalogueAbstractTreeItem::DEFAULT_TYPE;
-        }
-        else {
-            auto firstIndex = selectedItems.first();
-            auto firstItem = m_TreeModel->item(firstIndex);
-            if (!firstItem) {
-                Q_ASSERT(false);
-                return CatalogueAbstractTreeItem::DEFAULT_TYPE;
-            }
-            auto selectionType = firstItem->type();
-
-            for (auto itemIndex : selectedItems) {
-                auto item = m_TreeModel->item(itemIndex);
-                if (!item || item->type() != selectionType) {
-                    // Incoherent multi selection
-                    selectionType = CatalogueAbstractTreeItem::DEFAULT_TYPE;
-                    break;
-                }
-            }
-
-            return selectionType;
-        }
-    }
-
-    QVector<std::shared_ptr<DBCatalogue> > selectedCatalogues(QTreeView *treeView) const
-    {
-        QVector<std::shared_ptr<DBCatalogue> > catalogues;
-        auto selectedItems = treeView->selectionModel()->selectedRows();
-        for (auto itemIndex : selectedItems) {
-            auto item = m_TreeModel->item(itemIndex);
-            if (item && item->type() == CATALOGUE_ITEM_TYPE) {
-                catalogues.append(static_cast<CatalogueTreeItem *>(item)->catalogue());
-            }
-        }
-
-        return catalogues;
-    }
-
-    QStringList selectedRepositories(QTreeView *treeView) const
-    {
-        QStringList repositories;
-        auto selectedItems = treeView->selectionModel()->selectedRows();
-        for (auto itemIndex : selectedItems) {
-            auto item = m_TreeModel->item(itemIndex);
-            if (item && item->type() == DATABASE_ITEM_TYPE) {
-                repositories.append(item->text());
-            }
-        }
-
-        return repositories;
-    }
-};
-
-CatalogueSideBarWidget::CatalogueSideBarWidget(QWidget *parent)
-        : QWidget(parent),
-          ui(new Ui::CatalogueSideBarWidget),
-          impl{spimpl::make_unique_impl<CatalogueSideBarWidgetPrivate>()}
-{
-    ui->setupUi(this);
-
-    impl->m_TreeModel = new CatalogueTreeModel(this);
-    ui->treeView->setModel(impl->m_TreeModel);
-
-    impl->configureTreeWidget(ui->treeView);
-    emit catalogueListChanged();
-
-    ui->treeView->header()->setStretchLastSection(false);
-    ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-    ui->treeView->header()->setSectionResizeMode((int)CatalogueTreeModel::Column::Name,
-                                                 QHeaderView::Stretch);
-
-    connect(ui->treeView, &QTreeView::clicked, this, &CatalogueSideBarWidget::emitSelection);
-    connect(ui->treeView->selectionModel(), &QItemSelectionModel::currentChanged, this,
-            &CatalogueSideBarWidget::emitSelection);
-
-
-    connect(ui->btnAdd, &QToolButton::clicked, [this]() {
-        auto catalogue = std::make_shared<DBCatalogue>();
-        catalogue->setName(DEFAULT_CATALOGUE_NAME);
-        sqpApp->catalogueController().addCatalogue(catalogue);
-        auto item = this->addCatalogue(catalogue, REPOSITORY_DEFAULT);
-        this->setCatalogueChanges(catalogue, true);
-        ui->treeView->edit(impl->m_TreeModel->indexOf(item));
-
-    });
-
-
-    connect(impl->m_TreeModel, &CatalogueTreeModel::itemDropped,
-            [this](auto index, auto mimeData, auto action) {
-                auto item = impl->m_TreeModel->item(index);
-
-                if (item && item->type() == CATALOGUE_ITEM_TYPE) {
-                    auto catalogue = static_cast<CatalogueTreeItem *>(item)->catalogue();
-                    this->setCatalogueChanges(catalogue, true);
-                }
-
-                if (action == Qt::MoveAction) {
-                    /// Display a save button on source catalogues
-                    auto sourceCatalogues = sqpApp->catalogueController().cataloguesForMimeData(
-                        mimeData->data(MIME_TYPE_SOURCE_CATALOGUE_LIST));
-                    for (auto catalogue : sourceCatalogues) {
-                        if (auto catalogueItem = impl->getCatalogueItem(catalogue)) {
-                            catalogueItem->replaceCatalogue(catalogue);
-                            this->setCatalogueChanges(catalogue, true);
-                        }
-                    }
-
-                    this->emitSelection();
-                }
-            });
-
-    connect(ui->btnRemove, &QToolButton::clicked, [this]() {
-        QVector<QPair<std::shared_ptr<DBCatalogue>, CatalogueAbstractTreeItem *> >
-            cataloguesToItems;
-        auto selectedIndexes = ui->treeView->selectionModel()->selectedRows();
-
-        for (auto index : selectedIndexes) {
-            auto item = impl->m_TreeModel->item(index);
-            if (item && item->type() == CATALOGUE_ITEM_TYPE) {
-                auto catalogue = static_cast<CatalogueTreeItem *>(item)->catalogue();
-                cataloguesToItems << qMakePair(catalogue, item);
-            }
-        }
-
-        if (!cataloguesToItems.isEmpty()) {
-
-            if (QMessageBox::warning(this, tr("Remove Catalogue(s)"),
-                                     tr("The selected catalogues(s) will be completly removed "
-                                        "from the repository!\nAre you sure you want to continue?"),
-                                     QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
-                == QMessageBox::Yes) {
-
-                for (auto catalogueToItem : cataloguesToItems) {
-                    sqpApp->catalogueController().removeCatalogue(catalogueToItem.first);
-                    impl->m_TreeModel->removeChildItem(
-                        catalogueToItem.second,
-                        impl->m_TreeModel->indexOf(catalogueToItem.second->parent()));
-                }
-                emitSelection();
-                emit catalogueListChanged();
-            }
-        }
-    });
-
-    connect(impl->m_TreeModel, &CatalogueTreeModel::itemRenamed, [this](auto index) {
-        auto selectedIndexes = ui->treeView->selectionModel()->selectedRows();
-        if (selectedIndexes.contains(index)) {
-            this->emitSelection();
-        }
-        impl->setHasChanges(true, index, this);
-        emit this->catalogueListChanged();
-    });
-
-    ui->treeView->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(ui->treeView, &QTreeView::customContextMenuRequested, this,
-            &CatalogueSideBarWidget::onContextMenuRequested);
-}
-
-CatalogueSideBarWidget::~CatalogueSideBarWidget()
-{
-    delete ui;
-}
-
-CatalogueAbstractTreeItem *
-CatalogueSideBarWidget::addCatalogue(const std::shared_ptr<DBCatalogue> &catalogue,
-                                     const QString &repository)
-{
-    auto repositoryItem = impl->getDatabaseItem(repository);
-    auto catalogueItem
-        = impl->addCatalogueItem(catalogue, impl->m_TreeModel->indexOf(repositoryItem));
-
-    emit catalogueListChanged();
-
-    return catalogueItem;
-}
-
-void CatalogueSideBarWidget::setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue,
-                                                 bool hasChanges)
-{
-    if (auto catalogueItem = impl->getCatalogueItem(catalogue)) {
-        auto index = impl->m_TreeModel->indexOf(catalogueItem);
-        impl->setHasChanges(hasChanges, index, this);
-        // catalogueItem->refresh();
-    }
-}
-
-QVector<std::shared_ptr<DBCatalogue> >
-CatalogueSideBarWidget::getCatalogues(const QString &repository) const
-{
-    QVector<std::shared_ptr<DBCatalogue> > result;
-    auto repositoryItem = impl->getDatabaseItem(repository);
-    for (auto child : repositoryItem->children()) {
-        if (child->type() == CATALOGUE_ITEM_TYPE) {
-            auto catalogueItem = static_cast<CatalogueTreeItem *>(child);
-            result << catalogueItem->catalogue();
-        }
-        else {
-            qCWarning(LOG_CatalogueSideBarWidget()) << "getCatalogues: invalid structure";
-        }
-    }
-
-    return result;
-}
-
-void CatalogueSideBarWidget::emitSelection()
-{
-    auto selectionType = impl->selectionType(ui->treeView);
-
-    switch (selectionType) {
-        case CATALOGUE_ITEM_TYPE:
-            emit this->catalogueSelected(impl->selectedCatalogues(ui->treeView));
-            break;
-        case DATABASE_ITEM_TYPE:
-            emit this->databaseSelected(impl->selectedRepositories(ui->treeView));
-            break;
-        case ALL_EVENT_ITEM_TYPE:
-            emit this->allEventsSelected();
-            break;
-        case TRASH_ITEM_TYPE:
-            emit this->trashSelected();
-            break;
-        default:
-            emit this->selectionCleared();
-            break;
-    }
-}
-
-void CatalogueSideBarWidget::onContextMenuRequested(const QPoint &pos)
-{
-    QMenu menu{this};
-
-    auto currentIndex = ui->treeView->currentIndex();
-    auto currentItem = impl->m_TreeModel->item(currentIndex);
-    if (!currentItem) {
-        return;
-    }
-
-    switch (currentItem->type()) {
-        case CATALOGUE_ITEM_TYPE:
-            menu.addAction("Rename", [this, currentIndex]() { ui->treeView->edit(currentIndex); });
-            break;
-        case DATABASE_ITEM_TYPE:
-            break;
-        case ALL_EVENT_ITEM_TYPE:
-            break;
-        case TRASH_ITEM_TYPE:
-            menu.addAction("Empty Trash", []() {
-                // TODO
-            });
-            break;
-        default:
-            break;
-    }
-
-    if (!menu.isEmpty()) {
-        menu.exec(ui->treeView->mapToGlobal(pos));
-    }
-}
-
-void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::configureTreeWidget(QTreeView *treeView)
-{
-    auto allEventsItem = new CatalogueTextTreeItem{QIcon{":/icones/allEvents.png"}, "All Events",
-                                                   ALL_EVENT_ITEM_TYPE};
-    auto allEventIndex = m_TreeModel->addTopLevelItem(allEventsItem);
-    treeView->setCurrentIndex(allEventIndex);
-
-    auto trashItem
-        = new CatalogueTextTreeItem{QIcon{":/icones/trash.png"}, "Trash", TRASH_ITEM_TYPE};
-    m_TreeModel->addTopLevelItem(trashItem);
-
-    auto separator = new QFrame{treeView};
-    separator->setFrameShape(QFrame::HLine);
-    auto separatorItem
-        = new CatalogueTextTreeItem{QIcon{}, QString{}, CatalogueAbstractTreeItem::DEFAULT_TYPE};
-    separatorItem->setEnabled(false);
-    auto separatorIndex = m_TreeModel->addTopLevelItem(separatorItem);
-    treeView->setIndexWidget(separatorIndex, separator);
-
-    auto repositories = sqpApp->catalogueController().getRepositories();
-    for (auto dbname : repositories) {
-        auto dbIndex = addDatabaseItem(dbname);
-        auto catalogues = sqpApp->catalogueController().retrieveCatalogues(dbname);
-        for (auto catalogue : catalogues) {
-            addCatalogueItem(catalogue, dbIndex);
-        }
-    }
-
-    treeView->expandAll();
-}
-
-QModelIndex
-CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::addDatabaseItem(const QString &name)
-{
-    auto databaseItem
-        = new CatalogueTextTreeItem{QIcon{":/icones/database.png"}, {name}, DATABASE_ITEM_TYPE};
-    auto databaseIndex = m_TreeModel->addTopLevelItem(databaseItem);
-
-    return databaseIndex;
-}
-
-CatalogueAbstractTreeItem *
-CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::getDatabaseItem(const QString &name)
-{
-    for (auto item : m_TreeModel->topLevelItems()) {
-        if (item->type() == DATABASE_ITEM_TYPE && item->text() == name) {
-            return item;
-        }
-    }
-
-    return nullptr;
-}
-
-CatalogueAbstractTreeItem *CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::addCatalogueItem(
-    const std::shared_ptr<DBCatalogue> &catalogue, const QModelIndex &databaseIndex)
-{
-    auto catalogueItem
-        = new CatalogueTreeItem{catalogue, QIcon{":/icones/catalogue.png"}, CATALOGUE_ITEM_TYPE};
-    m_TreeModel->addChildItem(catalogueItem, databaseIndex);
-
-    return catalogueItem;
-}
-
-CatalogueTreeItem *CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::getCatalogueItem(
-    const std::shared_ptr<DBCatalogue> &catalogue) const
-{
-    for (auto item : m_TreeModel->topLevelItems()) {
-        if (item->type() == DATABASE_ITEM_TYPE) {
-            for (auto childItem : item->children()) {
-                if (childItem->type() == CATALOGUE_ITEM_TYPE) {
-                    auto catalogueItem = static_cast<CatalogueTreeItem *>(childItem);
-                    if (catalogueItem->catalogue()->getUniqId() == catalogue->getUniqId()) {
-                        return catalogueItem;
-                    }
-                }
-                else {
-                    qCWarning(LOG_CatalogueSideBarWidget()) << "getCatalogueItem: Invalid tree "
-                                                               "structure. A database item should "
-                                                               "only contain catalogues.";
-                    Q_ASSERT(false);
-                }
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::setHasChanges(
-    bool value, const QModelIndex &index, CatalogueSideBarWidget *sideBarWidget)
-{
-    std::shared_ptr<DBCatalogue> catalogue = nullptr;
-    auto item = m_TreeModel->item(index);
-    if (item && item->type() == CATALOGUE_ITEM_TYPE) {
-        catalogue = static_cast<CatalogueTreeItem *>(item)->catalogue();
-    }
-
-    auto validationIndex = index.sibling(index.row(), (int)CatalogueTreeModel::Column::Validation);
-    if (value) {
-        if (!hasChanges(validationIndex, sideBarWidget->ui->treeView)) {
-            auto widget = CatalogueExplorerHelper::buildValidationWidget(
-                sideBarWidget->ui->treeView,
-                [this, validationIndex, sideBarWidget, catalogue]() {
-                    if (catalogue) {
-                        sqpApp->catalogueController().saveCatalogue(catalogue);
-                        emit sideBarWidget->catalogueSaved(catalogue);
-                    }
-                    setHasChanges(false, validationIndex, sideBarWidget);
-                },
-                [this, validationIndex, sideBarWidget, catalogue, item]() {
-                    if (catalogue) {
-                        bool removed;
-                        sqpApp->catalogueController().discardCatalogue(catalogue, removed);
-
-                        if (removed) {
-                            m_TreeModel->removeChildItem(item,
-                                                         m_TreeModel->indexOf(item->parent()));
-                        }
-                        else {
-                            m_TreeModel->refresh(m_TreeModel->indexOf(item));
-                            setHasChanges(false, validationIndex, sideBarWidget);
-                        }
-                        sideBarWidget->emitSelection();
-                    }
-                });
-            sideBarWidget->ui->treeView->setIndexWidget(validationIndex, widget);
-            sideBarWidget->ui->treeView->header()->resizeSection(
-                (int)CatalogueTreeModel::Column::Validation, QHeaderView::ResizeToContents);
-        }
-    }
-    else {
-        // Note: the widget is destroyed
-        sideBarWidget->ui->treeView->setIndexWidget(validationIndex, nullptr);
-    }
-}
-
-bool CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::hasChanges(const QModelIndex &index,
-                                                                       QTreeView *treeView)
-{
-    auto validationIndex = index.sibling(index.row(), (int)CatalogueTreeModel::Column::Validation);
-    return treeView->indexWidget(validationIndex) != nullptr;
-}
-
-
-void CatalogueSideBarWidget::keyPressEvent(QKeyEvent *event)
-{
-    switch (event->key()) {
-        case Qt::Key_Delete: {
-            ui->btnRemove->click();
-        }
-        default:
-            break;
-    }
-}
diff --git a/gui/src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp b/gui/src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp
deleted file mode 100644
index 60cd390..0000000
--- a/gui/src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h"
-
-struct CatalogueAbstractTreeItem::CatalogueAbstractTreeItemPrivate {
-    int m_Type;
-    QVector<CatalogueAbstractTreeItem *> m_Children;
-    CatalogueAbstractTreeItem *m_Parent = nullptr;
-
-    CatalogueAbstractTreeItemPrivate(int type) : m_Type(type) {}
-};
-
-CatalogueAbstractTreeItem::CatalogueAbstractTreeItem(int type)
-        : impl{spimpl::make_unique_impl<CatalogueAbstractTreeItemPrivate>(type)}
-{
-}
-
-CatalogueAbstractTreeItem::~CatalogueAbstractTreeItem()
-{
-    qDeleteAll(impl->m_Children);
-}
-
-void CatalogueAbstractTreeItem::addChild(CatalogueAbstractTreeItem *child)
-{
-    impl->m_Children << child;
-    child->impl->m_Parent = this;
-}
-
-void CatalogueAbstractTreeItem::removeChild(CatalogueAbstractTreeItem *child)
-{
-    impl->m_Children.removeAll(child);
-    delete child;
-}
-
-QVector<CatalogueAbstractTreeItem *> CatalogueAbstractTreeItem::children() const
-{
-    return impl->m_Children;
-}
-
-CatalogueAbstractTreeItem *CatalogueAbstractTreeItem::parent() const
-{
-    return impl->m_Parent;
-}
-
-int CatalogueAbstractTreeItem::type() const
-{
-    return impl->m_Type;
-}
-
-QString CatalogueAbstractTreeItem::text(int column) const
-{
-    return data(0, Qt::DisplayRole).toString();
-}
-
-QVariant CatalogueAbstractTreeItem::data(int column, int role) const
-{
-    Q_UNUSED(column);
-    Q_UNUSED(role);
-    return QVariant();
-}
-
-Qt::ItemFlags CatalogueAbstractTreeItem::flags(int column) const
-{
-    Q_UNUSED(column);
-    return Qt::NoItemFlags;
-}
-
-bool CatalogueAbstractTreeItem::setData(int column, int role, const QVariant &value)
-{
-    Q_UNUSED(column);
-    Q_UNUSED(role);
-    Q_UNUSED(value);
-
-    return false;
-}
-
-bool CatalogueAbstractTreeItem::canDropMimeData(const QMimeData *data, Qt::DropAction action)
-{
-    Q_UNUSED(data);
-    Q_UNUSED(action);
-    return false;
-}
-
-bool CatalogueAbstractTreeItem::dropMimeData(const QMimeData *data, Qt::DropAction action)
-{
-    Q_UNUSED(data);
-    Q_UNUSED(action);
-    return false;
-}
diff --git a/gui/src/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.cpp b/gui/src/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.cpp
deleted file mode 100644
index 9360c8c..0000000
--- a/gui/src/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.h"
-
-#include <QIcon>
-
-struct CatalogueTextTreeItem::CatalogueTextTreeItemPrivate {
-
-    QString m_Text;
-    QIcon m_Icon;
-    bool m_IsEnabled = true;
-
-    CatalogueTextTreeItemPrivate(const QIcon &icon, const QString &text)
-            : m_Text(text), m_Icon(icon)
-    {
-    }
-};
-
-
-CatalogueTextTreeItem::CatalogueTextTreeItem(const QIcon &icon, const QString &text, int type)
-        : CatalogueAbstractTreeItem(type),
-          impl{spimpl::make_unique_impl<CatalogueTextTreeItemPrivate>(icon, text)}
-{
-}
-
-QVariant CatalogueTextTreeItem::data(int column, int role) const
-{
-    if (column > 0) {
-        return QVariant();
-    }
-
-    switch (role) {
-        case Qt::DisplayRole:
-            return impl->m_Text;
-        case Qt::DecorationRole:
-            return impl->m_Icon;
-    }
-
-    return QVariant();
-}
-
-Qt::ItemFlags CatalogueTextTreeItem::flags(int column) const
-{
-    Q_UNUSED(column);
-
-    if (!impl->m_IsEnabled) {
-        return Qt::NoItemFlags;
-    }
-
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-}
-
-QString CatalogueTextTreeItem::text() const
-{
-    return impl->m_Text;
-}
-
-void CatalogueTextTreeItem::setEnabled(bool value)
-{
-    impl->m_IsEnabled = value;
-}
diff --git a/gui/src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp b/gui/src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp
deleted file mode 100644
index 16a8060..0000000
--- a/gui/src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-#include "Catalogue/CatalogueTreeItems/CatalogueTreeItem.h"
-#include <Catalogue/CatalogueExplorerHelper.h>
-
-#include <Catalogue/CatalogueController.h>
-#include <Common/MimeTypesDef.h>
-#include <QIcon>
-#include <QMimeData>
-#include <SqpApplication.h>
-
-#include <memory>
-
-#include <DBCatalogue.h>
-
-struct CatalogueTreeItem::CatalogueTreeItemPrivate {
-
-    std::shared_ptr<DBCatalogue> m_Catalogue;
-    QIcon m_Icon;
-
-    CatalogueTreeItemPrivate(std::shared_ptr<DBCatalogue> catalogue, const QIcon &icon)
-            : m_Catalogue(catalogue), m_Icon(icon)
-    {
-    }
-};
-
-
-CatalogueTreeItem::CatalogueTreeItem(std::shared_ptr<DBCatalogue> catalogue, const QIcon &icon,
-                                     int type)
-        : CatalogueAbstractTreeItem(type),
-          impl{spimpl::make_unique_impl<CatalogueTreeItemPrivate>(catalogue, icon)}
-{
-}
-
-QVariant CatalogueTreeItem::data(int column, int role) const
-{
-    if (column == 0) {
-        switch (role) {
-            case Qt::EditRole: // fallthrough
-            case Qt::DisplayRole:
-                return impl->m_Catalogue->getName();
-            case Qt::DecorationRole:
-                return impl->m_Icon;
-            default:
-                break;
-        }
-    }
-
-    return QVariant();
-}
-
-bool CatalogueTreeItem::setData(int column, int role, const QVariant &value)
-{
-    bool result = false;
-
-    if (role == Qt::EditRole && column == 0) {
-        auto newName = value.toString();
-        if (newName != impl->m_Catalogue->getName()) {
-            impl->m_Catalogue->setName(newName);
-            sqpApp->catalogueController().updateCatalogue(impl->m_Catalogue);
-            result = true;
-        }
-    }
-
-    return result;
-}
-
-Qt::ItemFlags CatalogueTreeItem::flags(int column) const
-{
-    if (column == 0) {
-        return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable
-               | Qt::ItemIsDropEnabled;
-    }
-    else {
-        return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-    }
-}
-
-bool CatalogueTreeItem::canDropMimeData(const QMimeData *data, Qt::DropAction action)
-{
-    // Check that the event is not dropped on the same catalogue
-    auto sourceCatalogues = sqpApp->catalogueController().cataloguesForMimeData(
-        data->data(MIME_TYPE_SOURCE_CATALOGUE_LIST));
-    for (auto catalogue : sourceCatalogues) {
-        if (catalogue->getUniqId() == impl->m_Catalogue->getUniqId()) {
-            return false;
-        }
-    }
-
-    auto events = sqpApp->catalogueController().eventsForMimeData(data->data(MIME_TYPE_EVENT_LIST));
-    auto canDrop = data->hasFormat(MIME_TYPE_EVENT_LIST);
-
-    for (auto event : events) {
-        canDrop &= (event->getRepository() == impl->m_Catalogue->getRepository());
-    }
-
-    return canDrop;
-}
-
-bool CatalogueTreeItem::dropMimeData(const QMimeData *data, Qt::DropAction action)
-{
-    Q_ASSERT(canDropMimeData(data, action));
-    // Warning: Check that the events aren't already in the catalogue
-    // No need to check check for the repository: inter-repository drop is forbidden in
-    // canDropMimeData
-
-    auto events = sqpApp->catalogueController().eventsForMimeData(data->data(MIME_TYPE_EVENT_LIST));
-    auto sourceCatalogues = sqpApp->catalogueController().cataloguesForMimeData(
-        data->data(MIME_TYPE_SOURCE_CATALOGUE_LIST));
-
-    for (auto event : events) {
-
-        if (action == Qt::MoveAction) {
-            for (auto catalogue : sourceCatalogues) {
-                catalogue->removeEvent(event->getUniqId());
-                sqpApp->catalogueController().updateCatalogue(catalogue);
-            }
-        }
-
-        impl->m_Catalogue->addEvent(event->getUniqId());
-        sqpApp->catalogueController().updateCatalogue(impl->m_Catalogue);
-    }
-    return true;
-}
-
-std::shared_ptr<DBCatalogue> CatalogueTreeItem::catalogue() const
-{
-    return impl->m_Catalogue;
-}
-
-void CatalogueTreeItem::replaceCatalogue(const std::shared_ptr<DBCatalogue> &catalogue)
-{
-    impl->m_Catalogue = catalogue;
-}
diff --git a/gui/src/Catalogue/CatalogueTreeModel.cpp b/gui/src/Catalogue/CatalogueTreeModel.cpp
deleted file mode 100644
index bf72ba1..0000000
--- a/gui/src/Catalogue/CatalogueTreeModel.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-#include "Catalogue/CatalogueTreeModel.h"
-#include <Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h>
-
-#include <QMimeData>
-#include <memory>
-
-#include <Common/MimeTypesDef.h>
-
-struct CatalogueTreeModel::CatalogueTreeModelPrivate {
-    std::unique_ptr<CatalogueAbstractTreeItem> m_RootItem = nullptr;
-
-    CatalogueTreeModelPrivate() : m_RootItem{std::make_unique<CatalogueAbstractTreeItem>()} {}
-};
-
-CatalogueTreeModel::CatalogueTreeModel(QObject *parent)
-        : QAbstractItemModel(parent), impl{spimpl::make_unique_impl<CatalogueTreeModelPrivate>()}
-{
-}
-
-QModelIndex CatalogueTreeModel::addTopLevelItem(CatalogueAbstractTreeItem *item)
-{
-    auto nbTopLevelItems = impl->m_RootItem->children().count();
-    beginInsertRows(QModelIndex(), nbTopLevelItems, nbTopLevelItems);
-    impl->m_RootItem->addChild(item);
-    endInsertRows();
-
-    emit dataChanged(QModelIndex(), QModelIndex());
-
-    return index(nbTopLevelItems, 0);
-}
-
-QVector<CatalogueAbstractTreeItem *> CatalogueTreeModel::topLevelItems() const
-{
-    return impl->m_RootItem->children();
-}
-
-void CatalogueTreeModel::addChildItem(CatalogueAbstractTreeItem *child,
-                                      const QModelIndex &parentIndex)
-{
-    auto parentItem = item(parentIndex);
-    int c = parentItem->children().count();
-    beginInsertRows(parentIndex, c, c);
-    parentItem->addChild(child);
-    endInsertRows();
-
-    emit dataChanged(parentIndex, parentIndex);
-}
-
-void CatalogueTreeModel::removeChildItem(CatalogueAbstractTreeItem *child,
-                                         const QModelIndex &parentIndex)
-{
-    auto parentItem = item(parentIndex);
-    int i = parentItem->children().indexOf(child);
-    beginRemoveRows(parentIndex, i, i);
-    parentItem->removeChild(child);
-    endRemoveRows();
-
-    emit dataChanged(parentIndex, parentIndex);
-}
-
-void CatalogueTreeModel::refresh(const QModelIndex &index)
-{
-    emit dataChanged(index, index);
-}
-
-CatalogueAbstractTreeItem *CatalogueTreeModel::item(const QModelIndex &index) const
-{
-    return static_cast<CatalogueAbstractTreeItem *>(index.internalPointer());
-}
-
-QModelIndex CatalogueTreeModel::indexOf(CatalogueAbstractTreeItem *item, int column) const
-{
-    auto parentItem = item->parent();
-    if (!parentItem) {
-        return QModelIndex();
-    }
-
-    auto row = parentItem->children().indexOf(item);
-    return createIndex(row, column, item);
-}
-
-QModelIndex CatalogueTreeModel::index(int row, int column, const QModelIndex &parent) const
-{
-    if (column > 0) {
-        int a = 0;
-    }
-
-    if (!hasIndex(row, column, parent)) {
-        return QModelIndex();
-    }
-
-    CatalogueAbstractTreeItem *parentItem = nullptr;
-
-    if (!parent.isValid()) {
-        parentItem = impl->m_RootItem.get();
-    }
-    else {
-        parentItem = item(parent);
-    }
-
-    auto childItem = parentItem->children().value(row);
-    if (childItem) {
-        return createIndex(row, column, childItem);
-    }
-
-    return QModelIndex();
-}
-
-
-QModelIndex CatalogueTreeModel::parent(const QModelIndex &index) const
-{
-    if (!index.isValid()) {
-        return QModelIndex();
-    }
-
-    auto childItem = item(index);
-    auto parentItem = childItem->parent();
-
-    if (parentItem == nullptr || parentItem->parent() == nullptr) {
-        return QModelIndex();
-    }
-
-    auto row = parentItem->parent()->children().indexOf(parentItem);
-    return createIndex(row, 0, parentItem);
-}
-
-int CatalogueTreeModel::rowCount(const QModelIndex &parent) const
-{
-    CatalogueAbstractTreeItem *parentItem = nullptr;
-
-    if (!parent.isValid()) {
-        parentItem = impl->m_RootItem.get();
-    }
-    else {
-        parentItem = item(parent);
-    }
-
-    return parentItem->children().count();
-}
-
-int CatalogueTreeModel::columnCount(const QModelIndex &parent) const
-{
-    return (int)Column::Count;
-}
-
-Qt::ItemFlags CatalogueTreeModel::flags(const QModelIndex &index) const
-{
-    auto treeItem = item(index);
-    if (treeItem) {
-        return treeItem->flags(index.column());
-    }
-
-    return Qt::NoItemFlags;
-}
-
-QVariant CatalogueTreeModel::data(const QModelIndex &index, int role) const
-{
-    auto treeItem = item(index);
-    if (treeItem) {
-        return treeItem->data(index.column(), role);
-    }
-
-    return QModelIndex();
-}
-
-bool CatalogueTreeModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-    auto treeItem = item(index);
-    if (treeItem) {
-        auto result = treeItem->setData(index.column(), role, value);
-
-        if (result && index.column() == (int)Column::Name) {
-            emit itemRenamed(index);
-        }
-
-        return result;
-    }
-
-    return false;
-}
-
-bool CatalogueTreeModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, int row,
-                                         int column, const QModelIndex &parent) const
-{
-    auto draggedIndex = parent;
-    auto draggedItem = item(draggedIndex);
-    if (draggedItem) {
-        return draggedItem->canDropMimeData(data, action);
-    }
-
-    return false;
-}
-
-bool CatalogueTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row,
-                                      int column, const QModelIndex &parent)
-{
-    bool result = false;
-
-    auto draggedIndex = parent;
-    auto draggedItem = item(draggedIndex);
-    if (draggedItem) {
-        result = draggedItem->dropMimeData(data, action);
-        if (result) {
-            emit itemDropped(draggedIndex, data, action);
-        }
-    }
-
-    return result;
-}
-
-Qt::DropActions CatalogueTreeModel::supportedDropActions() const
-{
-    return Qt::CopyAction | Qt::MoveAction;
-}
-
-QStringList CatalogueTreeModel::mimeTypes() const
-{
-    return {MIME_TYPE_EVENT_LIST, MIME_TYPE_SOURCE_CATALOGUE_LIST};
-}
diff --git a/gui/ui/Catalogue/CatalogueEventsWidget.ui b/gui/ui/Catalogue/CatalogueEventsWidget.ui
deleted file mode 100644
index 8d23d9e..0000000
--- a/gui/ui/Catalogue/CatalogueEventsWidget.ui
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CatalogueEventsWidget</class>
- <widget class="QWidget" name="CatalogueEventsWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>566</width>
-    <height>258</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QToolButton" name="btnAdd">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>+</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../resources/sqpguiresources.qrc">
-         <normaloff>:/icones/add.png</normaloff>:/icones/add.png</iconset>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="btnRemove">
-       <property name="text">
-        <string> - </string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../resources/sqpguiresources.qrc">
-         <normaloff>:/icones/remove.png</normaloff>:/icones/remove.png</iconset>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="Line" name="line">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="btnTime">
-       <property name="text">
-        <string>T</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../resources/sqpguiresources.qrc">
-         <normaloff>:/icones/time.png</normaloff>:/icones/time.png</iconset>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="btnChart">
-       <property name="text">
-        <string>G</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../resources/sqpguiresources.qrc">
-         <normaloff>:/icones/chart.png</normaloff>:/icones/chart.png</iconset>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="Line" name="line_2">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="lineEdit">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QTreeView" name="treeView">
-     <property name="dragEnabled">
-      <bool>true</bool>
-     </property>
-     <property name="dragDropMode">
-      <enum>QAbstractItemView::DragDrop</enum>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <property name="selectionBehavior">
-      <enum>QAbstractItemView::SelectRows</enum>
-     </property>
-     <attribute name="headerStretchLastSection">
-      <bool>false</bool>
-     </attribute>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../../resources/sqpguiresources.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/gui/ui/Catalogue/CatalogueExplorer.ui b/gui/ui/Catalogue/CatalogueExplorer.ui
deleted file mode 100644
index bb906a5..0000000
--- a/gui/ui/Catalogue/CatalogueExplorer.ui
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CatalogueExplorer</class>
- <widget class="QDialog" name="CatalogueExplorer">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>755</width>
-    <height>481</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Catalogue Explorer</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QSplitter" name="horizontalSplitter">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="CatalogueSideBarWidget" name="catalogues" native="true">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>1</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-     </widget>
-     <widget class="QSplitter" name="verticalSplitter">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-        <horstretch>3</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <widget class="CatalogueEventsWidget" name="events" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>5</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-      <widget class="CatalogueInspectorWidget" name="inspector" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>2</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>CatalogueSideBarWidget</class>
-   <extends>QWidget</extends>
-   <header>Catalogue/CatalogueSideBarWidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>CatalogueEventsWidget</class>
-   <extends>QWidget</extends>
-   <header>Catalogue/CatalogueEventsWidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>CatalogueInspectorWidget</class>
-   <extends>QWidget</extends>
-   <header>Catalogue/CatalogueInspectorWidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/ui/Catalogue/CatalogueInspectorWidget.ui b/gui/ui/Catalogue/CatalogueInspectorWidget.ui
deleted file mode 100644
index 67c792d..0000000
--- a/gui/ui/Catalogue/CatalogueInspectorWidget.ui
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CatalogueInspectorWidget</class>
- <widget class="QWidget" name="CatalogueInspectorWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QFrame" name="frame">
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
-     </property>
-     <property name="lineWidth">
-      <number>1</number>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QStackedWidget" name="stackedWidget">
-        <property name="currentIndex">
-         <number>2</number>
-        </property>
-        <widget class="QWidget" name="emptyPage"/>
-        <widget class="QWidget" name="catalogueInspectorPage">
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_7">
-            <property name="text">
-             <string>Name</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="leCatalogueName"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_8">
-            <property name="text">
-             <string>Author</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="leCatalogueAuthor">
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <spacer name="verticalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="0" column="0" colspan="2">
-           <widget class="QLabel" name="label_9">
-            <property name="font">
-             <font>
-              <pointsize>10</pointsize>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Catalogue Properties</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="eventInspectorPage">
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="4" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>Product</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>TStart</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Name</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" colspan="2">
-           <widget class="QLabel" name="label_10">
-            <property name="font">
-             <font>
-              <pointsize>10</pointsize>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Event Properties</string>
-            </property>
-           </widget>
-          </item>
-          <item row="8" column="1">
-           <spacer name="verticalSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="leEventName"/>
-          </item>
-          <item row="5" column="1">
-           <widget class="QDateTimeEdit" name="dateTimeEventTStart">
-            <property name="timeSpec">
-             <enum>Qt::UTC</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QLineEdit" name="leEventProduct"/>
-          </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>Tend</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1">
-           <widget class="QDateTimeEdit" name="dateTimeEventTEnd">
-            <property name="timeSpec">
-             <enum>Qt::UTC</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="leEventTags"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_6">
-            <property name="text">
-             <string>Tags</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0" colspan="2">
-           <widget class="Line" name="line">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/ui/Catalogue/CatalogueSideBarWidget.ui b/gui/ui/Catalogue/CatalogueSideBarWidget.ui
deleted file mode 100644
index b097960..0000000
--- a/gui/ui/Catalogue/CatalogueSideBarWidget.ui
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CatalogueSideBarWidget</class>
- <widget class="QWidget" name="CatalogueSideBarWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>330</width>
-    <height>523</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QToolButton" name="btnAdd">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string>+</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../resources/sqpguiresources.qrc">
-         <normaloff>:/icones/add.png</normaloff>:/icones/add.png</iconset>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="btnRemove">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string> - </string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../resources/sqpguiresources.qrc">
-         <normaloff>:/icones/remove.png</normaloff>:/icones/remove.png</iconset>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QTreeView" name="treeView">
-     <property name="acceptDrops">
-      <bool>true</bool>
-     </property>
-     <property name="dragDropMode">
-      <enum>QAbstractItemView::DragDrop</enum>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <attribute name="headerVisible">
-      <bool>false</bool>
-     </attribute>
-     <attribute name="headerStretchLastSection">
-      <bool>false</bool>
-     </attribute>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../../resources/sqpguiresources.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/subprojects/QxOrm.wrap b/subprojects/QxOrm.wrap
deleted file mode 100644
index b382a86..0000000
--- a/subprojects/QxOrm.wrap
+++ /dev/null
@@ -1,5 +0,0 @@
-[wrap-git]
-directory=QxOrm
-url=https://github.com/jeandet/qxorm.git
-revision=head
-
diff --git a/subprojects/catalogicpp.wrap b/subprojects/catalogicpp.wrap
new file mode 100644
index 0000000..30590b1
--- /dev/null
+++ b/subprojects/catalogicpp.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory = catalogicpp
+url = https://github.com/jeandet/catalogicpp.git
+revision = master
+
diff --git a/subprojects/libcatalogs.wrap b/subprojects/libcatalogs.wrap
deleted file mode 100644
index b0aa06e..0000000
--- a/subprojects/libcatalogs.wrap
+++ /dev/null
@@ -1,4 +0,0 @@
-[wrap-git]
-directory=libcatalogs
-url=https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/SciQLOP_Repos/libcatalogs.git
-revision=master
diff --git a/subprojects/stduuid.wrap b/subprojects/stduuid.wrap
new file mode 100644
index 0000000..fcd4772
--- /dev/null
+++ b/subprojects/stduuid.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory = stduuid
+url = https://github.com/jeandet/stduuid.git
+revision = meson
+