diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 4820e08ef..afc40e126 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -47,7 +47,6 @@ add_subdirectory(dialog)
 add_subdirectory(node)
 add_subdirectory(packaging)
 add_subdirectory(panel)
-add_subdirectory(project)
 add_subdirectory(render)
 add_subdirectory(shaders)
 add_subdirectory(task)
diff --git a/app/codec/decoder.cpp b/app/codec/decoder.cpp
index 67b481700..0823e2f56 100644
--- a/app/codec/decoder.cpp
+++ b/app/codec/decoder.cpp
@@ -30,11 +30,11 @@
 #include "common/ffmpegutils.h"
 #include "common/filefunctions.h"
 #include "common/timecodefunctions.h"
+#include "node/project/project.h"
 #ifdef USE_OTIO
 #include "task/project/loadotio/loadotio.h"
 #endif
 #include "task/taskmanager.h"
-#include "project/project.h"
 
 namespace olive {
 
diff --git a/app/codec/decoder.h b/app/codec/decoder.h
index a3ec48499..c5ef0b68d 100644
--- a/app/codec/decoder.h
+++ b/app/codec/decoder.h
@@ -35,8 +35,8 @@ extern "C" {
 #include "codec/samplebuffer.h"
 #include "codec/waveoutput.h"
 #include "common/rational.h"
-#include "project/item/footage/footage.h"
-#include "project/item/footage/footagedescription.h"
+#include "node/project/footage/footage.h"
+#include "node/project/footage/footagedescription.h"
 
 namespace olive {
 
diff --git a/app/core.cpp b/app/core.cpp
index 960193084..c54283f31 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -45,11 +45,11 @@
 #include "dialog/sequence/sequence.h"
 #include "dialog/task/task.h"
 #include "dialog/preferences/preferences.h"
+#include "node/color/colormanager/colormanager.h"
 #include "node/factory.h"
 #include "panel/panelmanager.h"
 #include "panel/project/project.h"
 #include "panel/viewer/viewer.h"
-#include "render/colormanager.h"
 #include "render/diskmanager.h"
 #include "render/rendermanager.h"
 #ifdef USE_OTIO
diff --git a/app/core.h b/app/core.h
index 7d9526947..4824a275d 100644
--- a/app/core.h
+++ b/app/core.h
@@ -28,10 +28,10 @@
 
 #include "common/rational.h"
 #include "common/timecodefunctions.h"
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
-#include "project/project.h"
-#include "project/projectviewmodel.h"
+#include "node/project/footage/footage.h"
+#include "node/project/project.h"
+#include "node/project/projectviewmodel.h"
+#include "node/project/sequence/sequence.h"
 #include "task/task.h"
 #include "tool/tool.h"
 #include "undo/undostack.h"
diff --git a/app/dialog/color/colordialog.h b/app/dialog/color/colordialog.h
index ccba97c18..e1a284f94 100644
--- a/app/dialog/color/colordialog.h
+++ b/app/dialog/color/colordialog.h
@@ -23,8 +23,8 @@
 
 #include <QDialog>
 
+#include "node/color/colormanager/colormanager.h"
 #include "render/color.h"
-#include "render/colormanager.h"
 #include "render/managedcolor.h"
 #include "widget/colorwheel/colorgradientwidget.h"
 #include "widget/colorwheel/colorspacechooser.h"
diff --git a/app/dialog/export/export.cpp b/app/dialog/export/export.cpp
index d5177afef..d82623646 100644
--- a/app/dialog/export/export.cpp
+++ b/app/dialog/export/export.cpp
@@ -33,8 +33,8 @@
 #include "common/qtutils.h"
 #include "core.h"
 #include "dialog/task/task.h"
-#include "project/item/sequence/sequence.h"
-#include "project/project.h"
+#include "node/project/project.h"
+#include "node/project/sequence/sequence.h"
 #include "ui/icons/icons.h"
 
 namespace olive {
diff --git a/app/dialog/export/exportvideotab.cpp b/app/dialog/export/exportvideotab.cpp
index d37f61389..7c81db2e2 100644
--- a/app/dialog/export/exportvideotab.cpp
+++ b/app/dialog/export/exportvideotab.cpp
@@ -28,7 +28,7 @@
 
 #include "core.h"
 #include "exportadvancedvideodialog.h"
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 #include "task/export/exportparams.h"
 
 namespace olive {
diff --git a/app/dialog/export/exportvideotab.h b/app/dialog/export/exportvideotab.h
index feed9eb78..efb2d3954 100644
--- a/app/dialog/export/exportvideotab.h
+++ b/app/dialog/export/exportvideotab.h
@@ -28,7 +28,7 @@
 #include "common/rational.h"
 #include "dialog/export/codec/h264section.h"
 #include "dialog/export/codec/imagesection.h"
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 #include "widget/colorwheel/colorspacechooser.h"
 #include "widget/slider/integerslider.h"
 #include "widget/standardcombos/standardcombos.h"
diff --git a/app/dialog/footagerelink/footagerelinkdialog.h b/app/dialog/footagerelink/footagerelinkdialog.h
index d1c04cd56..251db09b1 100644
--- a/app/dialog/footagerelink/footagerelinkdialog.h
+++ b/app/dialog/footagerelink/footagerelinkdialog.h
@@ -24,7 +24,7 @@
 #include <QDialog>
 #include <QTreeWidget>
 
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 
 namespace olive {
 
diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp
index e732cca1a..1213fa67f 100644
--- a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp
+++ b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp
@@ -28,7 +28,7 @@
 #include "common/autoscroll.h"
 #include "core.h"
 #include "dialog/sequence/sequence.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 
diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.h b/app/dialog/preferences/tabs/preferencesgeneraltab.h
index 034356bd2..e78b2466a 100644
--- a/app/dialog/preferences/tabs/preferencesgeneraltab.h
+++ b/app/dialog/preferences/tabs/preferencesgeneraltab.h
@@ -26,7 +26,7 @@
 #include <QSpinBox>
 
 #include "dialog/configbase/configdialogbase.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 #include "widget/slider/floatslider.h"
 #include "widget/slider/integerslider.h"
 
diff --git a/app/dialog/sequence/sequence.h b/app/dialog/sequence/sequence.h
index a8bbff7d5..6f1448e53 100644
--- a/app/dialog/sequence/sequence.h
+++ b/app/dialog/sequence/sequence.h
@@ -25,7 +25,7 @@
 #include <QDialog>
 #include <QSpinBox>
 
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 #include "sequencedialogparametertab.h"
 #include "sequencedialogpresettab.h"
 #include "undo/undocommand.h"
diff --git a/app/dialog/sequence/sequencedialogparametertab.h b/app/dialog/sequence/sequencedialogparametertab.h
index 10c38cd7d..a107a12b1 100644
--- a/app/dialog/sequence/sequencedialogparametertab.h
+++ b/app/dialog/sequence/sequencedialogparametertab.h
@@ -5,7 +5,7 @@
 #include <QList>
 #include <QSpinBox>
 
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 #include "sequencepreset.h"
 #include "widget/slider/integerslider.h"
 #include "widget/standardcombos/standardcombos.h"
diff --git a/app/node/CMakeLists.txt b/app/node/CMakeLists.txt
index 6b5b0e5fa..a0588dcbe 100644
--- a/app/node/CMakeLists.txt
+++ b/app/node/CMakeLists.txt
@@ -16,6 +16,7 @@
 
 add_subdirectory(audio)
 add_subdirectory(block)
+add_subdirectory(color)
 add_subdirectory(distort)
 add_subdirectory(filter)
 add_subdirectory(generator)
diff --git a/app/node/audio/pan/pan.h b/app/node/audio/pan/pan.h
index f8262c1e8..65e74d5f0 100644
--- a/app/node/audio/pan/pan.h
+++ b/app/node/audio/pan/pan.h
@@ -31,6 +31,8 @@ class PanNode : public Node
 public:
   PanNode();
 
+  NODE_DEFAULT_DESTRUCTOR(PanNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/audio/volume/volume.h b/app/node/audio/volume/volume.h
index 368a914b0..9665cd218 100644
--- a/app/node/audio/volume/volume.h
+++ b/app/node/audio/volume/volume.h
@@ -31,6 +31,8 @@ class VolumeNode : public MathNodeBase
 public:
   VolumeNode();
 
+  NODE_DEFAULT_DESTRUCTOR(VolumeNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/block/block.h b/app/node/block/block.h
index cb1890156..30b9e73ca 100644
--- a/app/node/block/block.h
+++ b/app/node/block/block.h
@@ -37,6 +37,8 @@ class Block : public Node
 public:
   Block();
 
+  NODE_DEFAULT_DESTRUCTOR(Block)
+
   enum Type {
     kClip,
     kGap,
diff --git a/app/node/block/clip/clip.h b/app/node/block/clip/clip.h
index 9bf6953a1..b5997b944 100644
--- a/app/node/block/clip/clip.h
+++ b/app/node/block/clip/clip.h
@@ -34,6 +34,8 @@ class ClipBlock : public Block
 public:
   ClipBlock();
 
+  NODE_DEFAULT_DESTRUCTOR(ClipBlock)
+
   virtual Node* copy() const override;
 
   virtual Type type() const override;
diff --git a/app/node/block/gap/gap.h b/app/node/block/gap/gap.h
index 0560dcb37..cf5c19f66 100644
--- a/app/node/block/gap/gap.h
+++ b/app/node/block/gap/gap.h
@@ -34,6 +34,8 @@ class GapBlock : public Block
 public:
   GapBlock();
 
+  NODE_DEFAULT_DESTRUCTOR(GapBlock)
+
   virtual Node * copy() const override;
 
   virtual Type type() const override;
diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.h b/app/node/block/transition/crossdissolve/crossdissolvetransition.h
index 6b93042bf..8e3d57329 100644
--- a/app/node/block/transition/crossdissolve/crossdissolvetransition.h
+++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.h
@@ -31,6 +31,8 @@ class CrossDissolveTransition : public TransitionBlock
 public:
   CrossDissolveTransition();
 
+  NODE_DEFAULT_DESTRUCTOR(CrossDissolveTransition)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/block/transition/diptocolor/diptocolortransition.h b/app/node/block/transition/diptocolor/diptocolortransition.h
index cac7a528a..846d969e4 100644
--- a/app/node/block/transition/diptocolor/diptocolortransition.h
+++ b/app/node/block/transition/diptocolor/diptocolortransition.h
@@ -31,6 +31,8 @@ class DipToColorTransition : public TransitionBlock
 public:
   DipToColorTransition();
 
+  NODE_DEFAULT_DESTRUCTOR(DipToColorTransition)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/block/transition/transition.h b/app/node/block/transition/transition.h
index ae41378cc..7d1bad63b 100644
--- a/app/node/block/transition/transition.h
+++ b/app/node/block/transition/transition.h
@@ -31,6 +31,8 @@ class TransitionBlock : public Block
 public:
   TransitionBlock();
 
+  NODE_DEFAULT_DESTRUCTOR(TransitionBlock)
+
   virtual Type type() const override;
 
   virtual void Retranslate() override;
diff --git a/app/project/item/folder/CMakeLists.txt b/app/node/color/CMakeLists.txt
similarity index 92%
rename from app/project/item/folder/CMakeLists.txt
rename to app/node/color/CMakeLists.txt
index 745b4222a..4f36450a9 100644
--- a/app/project/item/folder/CMakeLists.txt
+++ b/app/node/color/CMakeLists.txt
@@ -14,10 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+add_subdirectory(colormanager)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  project/item/folder/folder.h
-  project/item/folder/folder.cpp
   PARENT_SCOPE
 )
diff --git a/app/project/CMakeLists.txt b/app/node/color/colormanager/CMakeLists.txt
similarity index 85%
rename from app/project/CMakeLists.txt
rename to app/node/color/colormanager/CMakeLists.txt
index 42d59552d..7fdf539d5 100644
--- a/app/project/CMakeLists.txt
+++ b/app/node/color/colormanager/CMakeLists.txt
@@ -14,13 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-add_subdirectory(item)
-
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  project/project.h
-  project/project.cpp
-  project/projectviewmodel.h
-  project/projectviewmodel.cpp
+  node/color/colormanager/colormanager.cpp
+  node/color/colormanager/colormanager.h
   PARENT_SCOPE
 )
diff --git a/app/render/colormanager.cpp b/app/node/color/colormanager/colormanager.cpp
similarity index 100%
rename from app/render/colormanager.cpp
rename to app/node/color/colormanager/colormanager.cpp
diff --git a/app/render/colormanager.h b/app/node/color/colormanager/colormanager.h
similarity index 98%
rename from app/render/colormanager.h
rename to app/node/color/colormanager/colormanager.h
index d07f543a7..6baf6806e 100644
--- a/app/render/colormanager.h
+++ b/app/node/color/colormanager/colormanager.h
@@ -25,8 +25,8 @@
 #include <QMutex>
 
 #include "codec/frame.h"
-#include "colorprocessor.h"
 #include "node/node.h"
+#include "render/colorprocessor.h"
 
 #define OCIO_SET_C_LOCALE_FOR_SCOPE ColorManager::SetLocale d("C")
 
diff --git a/app/node/distort/crop/cropdistortnode.h b/app/node/distort/crop/cropdistortnode.h
index 692855981..9afd0a7f1 100644
--- a/app/node/distort/crop/cropdistortnode.h
+++ b/app/node/distort/crop/cropdistortnode.h
@@ -33,6 +33,8 @@ class CropDistortNode : public Node
 public:
   CropDistortNode();
 
+  NODE_DEFAULT_DESTRUCTOR(CropDistortNode)
+
   virtual Node* copy() const override
   {
     return new CropDistortNode();
diff --git a/app/node/distort/transform/transformdistortnode.h b/app/node/distort/transform/transformdistortnode.h
index ca7606a94..4b785de20 100644
--- a/app/node/distort/transform/transformdistortnode.h
+++ b/app/node/distort/transform/transformdistortnode.h
@@ -31,6 +31,8 @@ class TransformDistortNode : public MatrixGenerator
 public:
   TransformDistortNode();
 
+  NODE_DEFAULT_DESTRUCTOR(TransformDistortNode)
+
   virtual Node* copy() const override
   {
     return new TransformDistortNode();
diff --git a/app/node/factory.cpp b/app/node/factory.cpp
index c99e1f209..d0c468893 100644
--- a/app/node/factory.cpp
+++ b/app/node/factory.cpp
@@ -43,9 +43,9 @@
 #include "math/trigonometry/trigonometry.h"
 #include "output/track/track.h"
 #include "output/viewer/viewer.h"
-#include "project/item/folder/folder.h"
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
+#include "project/folder/folder.h"
+#include "project/footage/footage.h"
+#include "project/sequence/sequence.h"
 
 namespace olive {
 QList<Node*> NodeFactory::library_;
diff --git a/app/node/filter/blur/blur.h b/app/node/filter/blur/blur.h
index 6a0ddb366..6eac17632 100644
--- a/app/node/filter/blur/blur.h
+++ b/app/node/filter/blur/blur.h
@@ -31,6 +31,8 @@ class BlurFilterNode : public Node
 public:
   BlurFilterNode();
 
+  NODE_DEFAULT_DESTRUCTOR(BlurFilterNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/filter/mosaic/mosaicfilternode.h b/app/node/filter/mosaic/mosaicfilternode.h
index 2ecff1e29..e5c00da57 100644
--- a/app/node/filter/mosaic/mosaicfilternode.h
+++ b/app/node/filter/mosaic/mosaicfilternode.h
@@ -31,6 +31,8 @@ class MosaicFilterNode : public Node
 public:
   MosaicFilterNode();
 
+  NODE_DEFAULT_DESTRUCTOR(MosaicFilterNode)
+
   virtual Node* copy() const override
   {
     return new MosaicFilterNode();
diff --git a/app/node/filter/stroke/stroke.h b/app/node/filter/stroke/stroke.h
index 338e266ea..5f34513ab 100644
--- a/app/node/filter/stroke/stroke.h
+++ b/app/node/filter/stroke/stroke.h
@@ -31,6 +31,8 @@ class StrokeFilterNode : public Node
 public:
   StrokeFilterNode();
 
+  NODE_DEFAULT_DESTRUCTOR(StrokeFilterNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/generator/matrix/matrix.h b/app/node/generator/matrix/matrix.h
index 5401a02b6..111ff3997 100644
--- a/app/node/generator/matrix/matrix.h
+++ b/app/node/generator/matrix/matrix.h
@@ -34,6 +34,8 @@ class MatrixGenerator : public Node
 public:
   MatrixGenerator();
 
+  NODE_DEFAULT_DESTRUCTOR(MatrixGenerator)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/generator/polygon/polygon.h b/app/node/generator/polygon/polygon.h
index cb0e08d25..d971639d9 100644
--- a/app/node/generator/polygon/polygon.h
+++ b/app/node/generator/polygon/polygon.h
@@ -32,6 +32,8 @@ class PolygonGenerator : public Node
 public:
   PolygonGenerator();
 
+  NODE_DEFAULT_DESTRUCTOR(PolygonGenerator)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/generator/solid/solid.h b/app/node/generator/solid/solid.h
index bf4aa6544..b38bed83d 100644
--- a/app/node/generator/solid/solid.h
+++ b/app/node/generator/solid/solid.h
@@ -31,6 +31,8 @@ class SolidGenerator : public Node
 public:
   SolidGenerator();
 
+  NODE_DEFAULT_DESTRUCTOR(SolidGenerator)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/generator/text/text.h b/app/node/generator/text/text.h
index 1ea6a69cf..19a1f304c 100644
--- a/app/node/generator/text/text.h
+++ b/app/node/generator/text/text.h
@@ -31,6 +31,8 @@ class TextGenerator : public Node
 public:
   TextGenerator();
 
+  NODE_DEFAULT_DESTRUCTOR(TextGenerator)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/input/time/timeinput.h b/app/node/input/time/timeinput.h
index f8303b5ef..51993131c 100644
--- a/app/node/input/time/timeinput.h
+++ b/app/node/input/time/timeinput.h
@@ -31,6 +31,8 @@ class TimeInput : public Node
 public:
   TimeInput();
 
+  NODE_DEFAULT_DESTRUCTOR(TimeInput)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/math/math/math.h b/app/node/math/math/math.h
index b988f3380..79d4251a0 100644
--- a/app/node/math/math/math.h
+++ b/app/node/math/math/math.h
@@ -31,6 +31,8 @@ class MathNode : public MathNodeBase
 public:
   MathNode();
 
+  NODE_DEFAULT_DESTRUCTOR(MathNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/math/math/mathbase.h b/app/node/math/math/mathbase.h
index 857204de5..d274aa2ac 100644
--- a/app/node/math/math/mathbase.h
+++ b/app/node/math/math/mathbase.h
@@ -30,6 +30,8 @@ class MathNodeBase : public Node
 public:
   MathNodeBase() = default;
 
+  NODE_DEFAULT_DESTRUCTOR(MathNodeBase)
+
   enum Operation {
     kOpAdd,
     kOpSubtract,
diff --git a/app/node/math/merge/merge.h b/app/node/math/merge/merge.h
index f5df8d6fc..50d0d5058 100644
--- a/app/node/math/merge/merge.h
+++ b/app/node/math/merge/merge.h
@@ -31,6 +31,8 @@ class MergeNode : public Node
 public:
   MergeNode();
 
+  NODE_DEFAULT_DESTRUCTOR(MergeNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/math/trigonometry/trigonometry.h b/app/node/math/trigonometry/trigonometry.h
index d59f52161..59c02a45e 100644
--- a/app/node/math/trigonometry/trigonometry.h
+++ b/app/node/math/trigonometry/trigonometry.h
@@ -31,6 +31,8 @@ class TrigonometryNode : public Node
 public:
   TrigonometryNode();
 
+  NODE_DEFAULT_DESTRUCTOR(TrigonometryNode)
+
   virtual Node* copy() const override;
 
   virtual QString Name() const override;
diff --git a/app/node/node.cpp b/app/node/node.cpp
index be9f7035b..71d3a49f0 100644
--- a/app/node/node.cpp
+++ b/app/node/node.cpp
@@ -31,8 +31,8 @@
 #include "common/xmlutils.h"
 #include "core.h"
 #include "config/config.h"
+#include "node/project/footage/footage.h"
 #include "project/project.h"
-#include "project/item/footage/footage.h"
 #include "ui/colorcoding.h"
 #include "ui/icons/icons.h"
 #include "widget/nodeview/nodeviewundo.h"
diff --git a/app/node/node.h b/app/node/node.h
index c0e922e32..c8b4de197 100644
--- a/app/node/node.h
+++ b/app/node/node.h
@@ -45,6 +45,8 @@
 
 namespace olive {
 
+#define NODE_DEFAULT_DESTRUCTOR(x) virtual ~x() override {DisconnectAll();}
+
 class NodeGraph;
 class Folder;
 
diff --git a/app/node/nodecopypaste.h b/app/node/nodecopypaste.h
index cd79c4a4b..7e548459f 100644
--- a/app/node/nodecopypaste.h
+++ b/app/node/nodecopypaste.h
@@ -25,7 +25,7 @@
 #include <QUndoCommand>
 
 #include "node/node.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 
diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp
index 091925162..79b093873 100644
--- a/app/node/output/track/track.cpp
+++ b/app/node/output/track/track.cpp
@@ -55,11 +55,6 @@ Track::Track() :
   track_height_ = kTrackHeightDefault;
 }
 
-Track::~Track()
-{
-  DisconnectAll();
-}
-
 void Track::set_type(const Type &track_type)
 {
   track_type_ = track_type;
diff --git a/app/node/output/track/track.h b/app/node/output/track/track.h
index 71c8a8841..91a1c40cf 100644
--- a/app/node/output/track/track.h
+++ b/app/node/output/track/track.h
@@ -44,7 +44,7 @@ public:
 
   Track();
 
-  virtual ~Track() override;
+  NODE_DEFAULT_DESTRUCTOR(Track)
 
   const Track::Type& type() const;
   void set_type(const Track::Type& track_type);
diff --git a/app/node/output/track/tracklist.cpp b/app/node/output/track/tracklist.cpp
index 2867e5833..4986cf583 100644
--- a/app/node/output/track/tracklist.cpp
+++ b/app/node/output/track/tracklist.cpp
@@ -24,7 +24,7 @@
 #include "node/math/math/math.h"
 #include "node/math/merge/merge.h"
 #include "node/output/viewer/viewer.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 
diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp
index 8f0327280..2d1ba3e0d 100644
--- a/app/node/output/viewer/viewer.cpp
+++ b/app/node/output/viewer/viewer.cpp
@@ -57,14 +57,6 @@ ViewerOutput::ViewerOutput(bool create_default_streams) :
   }
 }
 
-ViewerOutput::~ViewerOutput()
-{
-  // Should prevent traversing graph unnecessarily
-  BeginOperation();
-  DisconnectAll();
-  EndOperation();
-}
-
 Node *ViewerOutput::copy() const
 {
   return new ViewerOutput();
diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h
index a20419edf..27902a90d 100644
--- a/app/node/output/viewer/viewer.h
+++ b/app/node/output/viewer/viewer.h
@@ -45,7 +45,8 @@ class ViewerOutput : public Node
   Q_OBJECT
 public:
   ViewerOutput(bool create_default_streams = true);
-  virtual ~ViewerOutput() override;
+
+  NODE_DEFAULT_DESTRUCTOR(ViewerOutput)
 
   virtual Node* copy() const override;
 
diff --git a/app/node/project/CMakeLists.txt b/app/node/project/CMakeLists.txt
index efc953c4e..b32aaca69 100644
--- a/app/node/project/CMakeLists.txt
+++ b/app/node/project/CMakeLists.txt
@@ -14,9 +14,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+add_subdirectory(folder)
+add_subdirectory(footage)
 add_subdirectory(projectsettings)
+add_subdirectory(sequence)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
+  node/project/project.h
+  node/project/project.cpp
+  node/project/projectviewmodel.h
+  node/project/projectviewmodel.cpp
   PARENT_SCOPE
 )
diff --git a/app/project/item/sequence/CMakeLists.txt b/app/node/project/folder/CMakeLists.txt
similarity index 91%
rename from app/project/item/sequence/CMakeLists.txt
rename to app/node/project/folder/CMakeLists.txt
index de063f1e5..0eec7ae1b 100644
--- a/app/project/item/sequence/CMakeLists.txt
+++ b/app/node/project/folder/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  project/item/sequence/sequence.h
-  project/item/sequence/sequence.cpp
+  node/project/folder/folder.h
+  node/project/folder/folder.cpp
   PARENT_SCOPE
 )
diff --git a/app/project/item/folder/folder.cpp b/app/node/project/folder/folder.cpp
similarity index 97%
rename from app/project/item/folder/folder.cpp
rename to app/node/project/folder/folder.cpp
index d94f6fe12..ffa4f8997 100644
--- a/app/project/item/folder/folder.cpp
+++ b/app/node/project/folder/folder.cpp
@@ -21,8 +21,8 @@
 #include "folder.h"
 
 #include "common/xmlutils.h"
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/footage/footage.h"
+#include "node/project/sequence/sequence.h"
 #include "ui/icons/icons.h"
 
 namespace olive {
diff --git a/app/project/item/folder/folder.h b/app/node/project/folder/folder.h
similarity index 99%
rename from app/project/item/folder/folder.h
rename to app/node/project/folder/folder.h
index c362391c4..0cd5ce0b3 100644
--- a/app/project/item/folder/folder.h
+++ b/app/node/project/folder/folder.h
@@ -37,6 +37,8 @@ class Folder : public Node
 public:
   Folder();
 
+  NODE_DEFAULT_DESTRUCTOR(Folder)
+
   virtual Node* copy() const override
   {
     return new Folder();
diff --git a/app/project/item/footage/CMakeLists.txt b/app/node/project/footage/CMakeLists.txt
similarity index 82%
rename from app/project/item/footage/CMakeLists.txt
rename to app/node/project/footage/CMakeLists.txt
index 3e27bfead..39aa3d009 100644
--- a/app/project/item/footage/CMakeLists.txt
+++ b/app/node/project/footage/CMakeLists.txt
@@ -17,9 +17,9 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  project/item/footage/footage.cpp
-  project/item/footage/footage.h
-  project/item/footage/footagedescription.cpp
-  project/item/footage/footagedescription.h
+  node/project/footage/footage.cpp
+  node/project/footage/footage.h
+  node/project/footage/footagedescription.cpp
+  node/project/footage/footagedescription.h
   PARENT_SCOPE
 )
diff --git a/app/project/item/footage/footage.cpp b/app/node/project/footage/footage.cpp
similarity index 100%
rename from app/project/item/footage/footage.cpp
rename to app/node/project/footage/footage.cpp
diff --git a/app/project/item/footage/footage.h b/app/node/project/footage/footage.h
similarity index 99%
rename from app/project/item/footage/footage.h
rename to app/node/project/footage/footage.h
index c7cc9ef70..96336a737 100644
--- a/app/project/item/footage/footage.h
+++ b/app/node/project/footage/footage.h
@@ -49,6 +49,8 @@ public:
    */
   Footage(const QString& filename = QString());
 
+  NODE_DEFAULT_DESTRUCTOR(Footage)
+
   virtual Node* copy() const override
   {
     return new Footage();
diff --git a/app/project/item/footage/footagedescription.cpp b/app/node/project/footage/footagedescription.cpp
similarity index 100%
rename from app/project/item/footage/footagedescription.cpp
rename to app/node/project/footage/footagedescription.cpp
diff --git a/app/project/item/footage/footagedescription.h b/app/node/project/footage/footagedescription.h
similarity index 100%
rename from app/project/item/footage/footagedescription.h
rename to app/node/project/footage/footagedescription.h
diff --git a/app/project/project.cpp b/app/node/project/project.cpp
similarity index 100%
rename from app/project/project.cpp
rename to app/node/project/project.cpp
diff --git a/app/project/project.h b/app/node/project/project.h
similarity index 96%
rename from app/project/project.h
rename to app/node/project/project.h
index 8a432a4e8..415307569 100644
--- a/app/project/project.h
+++ b/app/node/project/project.h
@@ -25,10 +25,10 @@
 #include <QObject>
 #include <QUuid>
 
-#include "node/project/projectsettings/projectsettings.h"
+#include "node/color/colormanager/colormanager.h"
 #include "node/output/viewer/viewer.h"
-#include "render/colormanager.h"
-#include "project/item/folder/folder.h"
+#include "node/project/footage/footage.h"
+#include "node/project/projectsettings/projectsettings.h"
 #include "window/mainwindow/mainwindowlayoutinfo.h"
 
 namespace olive {
diff --git a/app/node/project/projectsettings/projectsettings.h b/app/node/project/projectsettings/projectsettings.h
index 4d83677ba..4a61b65bf 100644
--- a/app/node/project/projectsettings/projectsettings.h
+++ b/app/node/project/projectsettings/projectsettings.h
@@ -31,6 +31,8 @@ class ProjectSettingsNode : public Node
 public:
   ProjectSettingsNode();
 
+  NODE_DEFAULT_DESTRUCTOR(ProjectSettingsNode)
+
   virtual QString Name() const override
   {
     return tr("Project Settings");
diff --git a/app/project/projectviewmodel.cpp b/app/node/project/projectviewmodel.cpp
similarity index 100%
rename from app/project/projectviewmodel.cpp
rename to app/node/project/projectviewmodel.cpp
diff --git a/app/project/projectviewmodel.h b/app/node/project/projectviewmodel.h
similarity index 100%
rename from app/project/projectviewmodel.h
rename to app/node/project/projectviewmodel.h
diff --git a/app/project/item/CMakeLists.txt b/app/node/project/sequence/CMakeLists.txt
similarity index 90%
rename from app/project/item/CMakeLists.txt
rename to app/node/project/sequence/CMakeLists.txt
index 6ac91b1f1..273a3b31e 100644
--- a/app/project/item/CMakeLists.txt
+++ b/app/node/project/sequence/CMakeLists.txt
@@ -14,11 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-add_subdirectory(folder)
-add_subdirectory(footage)
-add_subdirectory(sequence)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
+  node/project/sequence/sequence.h
+  node/project/sequence/sequence.cpp
   PARENT_SCOPE
 )
diff --git a/app/project/item/sequence/sequence.cpp b/app/node/project/sequence/sequence.cpp
similarity index 97%
rename from app/project/item/sequence/sequence.cpp
rename to app/node/project/sequence/sequence.cpp
index 3f4fe07b7..b6c2f1653 100644
--- a/app/project/item/sequence/sequence.cpp
+++ b/app/node/project/sequence/sequence.cpp
@@ -53,14 +53,6 @@ Sequence::Sequence()
   }
 }
 
-Sequence::~Sequence()
-{
-  // Should prevent traversing graph unnecessarily
-  BeginOperation();
-  DisconnectAll();
-  EndOperation();
-}
-
 void Sequence::add_default_nodes(MultiUndoCommand* command)
 {
   // Create tracks and connect them to the viewer
diff --git a/app/project/item/sequence/sequence.h b/app/node/project/sequence/sequence.h
similarity index 98%
rename from app/project/item/sequence/sequence.h
rename to app/node/project/sequence/sequence.h
index 7f7ec9315..c644bdc3f 100644
--- a/app/project/item/sequence/sequence.h
+++ b/app/node/project/sequence/sequence.h
@@ -36,7 +36,7 @@ class Sequence : public ViewerOutput
 public:
   Sequence();
 
-  virtual ~Sequence() override;
+  NODE_DEFAULT_DESTRUCTOR(Sequence)
 
   virtual Node* copy() const override
   {
diff --git a/app/panel/project/footagemanagementpanel.h b/app/panel/project/footagemanagementpanel.h
index 423fdc674..3261e22ae 100644
--- a/app/panel/project/footagemanagementpanel.h
+++ b/app/panel/project/footagemanagementpanel.h
@@ -23,7 +23,7 @@
 
 #include <QList>
 
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 
 namespace olive {
 
diff --git a/app/panel/project/project.cpp b/app/panel/project/project.cpp
index 56b9b44ae..c580d4f14 100644
--- a/app/panel/project/project.cpp
+++ b/app/panel/project/project.cpp
@@ -24,10 +24,10 @@
 #include <QVBoxLayout>
 
 #include "core.h"
+#include "node/project/sequence/sequence.h"
 #include "panel/footageviewer/footageviewer.h"
 #include "panel/timeline/timeline.h"
 #include "panel/panelmanager.h"
-#include "project/item/sequence/sequence.h"
 #include "widget/menu/menushared.h"
 #include "widget/projecttoolbar/projecttoolbar.h"
 #include "window/mainwindow/mainwindow.h"
diff --git a/app/panel/project/project.h b/app/panel/project/project.h
index 18a109e0e..c16c36bd7 100644
--- a/app/panel/project/project.h
+++ b/app/panel/project/project.h
@@ -22,7 +22,7 @@
 #define PROJECT_PANEL_H
 
 #include "footagemanagementpanel.h"
-#include "project/project.h"
+#include "node/project/project.h"
 #include "widget/panel/panel.h"
 #include "widget/projectexplorer/projectexplorer.h"
 
diff --git a/app/render/CMakeLists.txt b/app/render/CMakeLists.txt
index 1f3c13314..da24b98c2 100644
--- a/app/render/CMakeLists.txt
+++ b/app/render/CMakeLists.txt
@@ -26,8 +26,6 @@ set(OLIVE_SOURCES
   render/audioplaybackcache.h
   render/color.cpp
   render/color.h
-  render/colormanager.cpp
-  render/colormanager.h
   render/colorprocessor.cpp
   render/colorprocessor.h
   render/colorprocessorcache.h
diff --git a/app/render/colorprocessor.cpp b/app/render/colorprocessor.cpp
index 90ce7c15f..78363cf66 100644
--- a/app/render/colorprocessor.cpp
+++ b/app/render/colorprocessor.cpp
@@ -22,7 +22,7 @@
 
 #include "common/define.h"
 #include "common/ocioutils.h"
-#include "colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 
 namespace olive {
 
diff --git a/app/render/diskmanager.h b/app/render/diskmanager.h
index 66566f84f..0e755d8df 100644
--- a/app/render/diskmanager.h
+++ b/app/render/diskmanager.h
@@ -27,7 +27,7 @@
 #include <QTimer>
 
 #include "common/define.h"
-#include "project/project.h"
+#include "node/project/project.h"
 
 namespace olive {
 
diff --git a/app/render/job/footagejob.h b/app/render/job/footagejob.h
index 5fede41cf..831e4966e 100644
--- a/app/render/job/footagejob.h
+++ b/app/render/job/footagejob.h
@@ -21,7 +21,7 @@
 #ifndef FOOTAGEJOB_H
 #define FOOTAGEJOB_H
 
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 
 namespace olive {
 
diff --git a/app/render/playbackcache.cpp b/app/render/playbackcache.cpp
index 549b913de..a4a1f9c79 100644
--- a/app/render/playbackcache.cpp
+++ b/app/render/playbackcache.cpp
@@ -21,8 +21,8 @@
 #include "playbackcache.h"
 
 #include "node/output/viewer/viewer.h"
-#include "project/item/sequence/sequence.h"
-#include "project/project.h"
+#include "node/project/project.h"
+#include "node/project/sequence/sequence.h"
 #include "render/diskmanager.h"
 
 namespace olive {
diff --git a/app/render/previewautocacher.cpp b/app/render/previewautocacher.cpp
index 1a255bfc2..6189521fa 100644
--- a/app/render/previewautocacher.cpp
+++ b/app/render/previewautocacher.cpp
@@ -3,7 +3,7 @@
 #include <QApplication>
 #include <QtConcurrent/QtConcurrent>
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "render/rendermanager.h"
 #include "render/renderprocessor.h"
 
diff --git a/app/render/previewautocacher.h b/app/render/previewautocacher.h
index e4e01abdd..f319540d2 100644
--- a/app/render/previewautocacher.h
+++ b/app/render/previewautocacher.h
@@ -5,10 +5,10 @@
 
 #include "config/config.h"
 #include "node/graph.h"
+#include "node/color/colormanager/colormanager.h"
 #include "node/node.h"
 #include "node/output/viewer/viewer.h"
-#include "project/project.h"
-#include "render/colormanager.h"
+#include "node/project/project.h"
 #include "threading/threadticketwatcher.h"
 
 namespace olive {
diff --git a/app/render/renderprocessor.cpp b/app/render/renderprocessor.cpp
index 27318fba4..948e78fe0 100644
--- a/app/render/renderprocessor.cpp
+++ b/app/render/renderprocessor.cpp
@@ -25,7 +25,7 @@
 #include <QVector3D>
 #include <QVector4D>
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "rendermanager.h"
 
 namespace olive {
diff --git a/app/render/stillimagecache.h b/app/render/stillimagecache.h
index 1f8abd5da..e696589cd 100644
--- a/app/render/stillimagecache.h
+++ b/app/render/stillimagecache.h
@@ -6,7 +6,7 @@
 
 #include "codec/decoder.h"
 #include "common/rational.h"
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 #include "render/texture.h"
 
 namespace olive {
diff --git a/app/task/conform/conform.h b/app/task/conform/conform.h
index b38cbd699..8da1ab6d5 100644
--- a/app/task/conform/conform.h
+++ b/app/task/conform/conform.h
@@ -21,7 +21,7 @@
 #ifndef CONFORMTASK_H
 #define CONFORMTASK_H
 
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 #include "render/audioparams.h"
 #include "task/task.h"
 
diff --git a/app/task/export/export.cpp b/app/task/export/export.cpp
index 45ddc32c8..88e3a724d 100644
--- a/app/task/export/export.cpp
+++ b/app/task/export/export.cpp
@@ -21,7 +21,7 @@
 #include "export.h"
 
 #include "common/timecodefunctions.h"
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 
 namespace olive {
 
diff --git a/app/task/precache/precachetask.cpp b/app/task/precache/precachetask.cpp
index e732603fd..536e47d2e 100644
--- a/app/task/precache/precachetask.cpp
+++ b/app/task/precache/precachetask.cpp
@@ -20,7 +20,7 @@
 
 #include "precachetask.h"
 
-#include "project/project.h"
+#include "node/project/project.h"
 
 namespace olive {
 
diff --git a/app/task/precache/precachetask.h b/app/task/precache/precachetask.h
index 88afcb001..bcf1358e9 100644
--- a/app/task/precache/precachetask.h
+++ b/app/task/precache/precachetask.h
@@ -21,8 +21,8 @@
 #ifndef PRECACHETASK_H
 #define PRECACHETASK_H
 
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/footage/footage.h"
+#include "node/project/sequence/sequence.h"
 #include "task/render/render.h"
 
 namespace olive {
diff --git a/app/task/project/import/import.cpp b/app/task/project/import/import.cpp
index 773a9420a..4e10f1eb6 100644
--- a/app/task/project/import/import.cpp
+++ b/app/task/project/import/import.cpp
@@ -25,7 +25,7 @@
 
 #include "config/config.h"
 #include "core.h"
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 #include "widget/nodeview/nodeviewundo.h"
 
 namespace olive {
diff --git a/app/task/project/import/import.h b/app/task/project/import/import.h
index 50875597e..6187d585a 100644
--- a/app/task/project/import/import.h
+++ b/app/task/project/import/import.h
@@ -25,7 +25,7 @@
 #include <QUndoCommand>
 
 #include "codec/decoder.h"
-#include "project/projectviewmodel.h"
+#include "node/project/projectviewmodel.h"
 #include "task/task.h"
 
 namespace olive {
diff --git a/app/task/project/load/loadbasetask.h b/app/task/project/load/loadbasetask.h
index 0f2c6b0a4..ef0a86a0e 100644
--- a/app/task/project/load/loadbasetask.h
+++ b/app/task/project/load/loadbasetask.h
@@ -21,7 +21,7 @@
 #ifndef PROJECTLOADBASETASK_H
 #define PROJECTLOADBASETASK_H
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "task/task.h"
 
 namespace olive {
diff --git a/app/task/project/loadotio/loadotio.cpp b/app/task/project/loadotio/loadotio.cpp
index f791969c7..240b19a69 100644
--- a/app/task/project/loadotio/loadotio.cpp
+++ b/app/task/project/loadotio/loadotio.cpp
@@ -31,9 +31,9 @@
 
 #include "node/block/clip/clip.h"
 #include "node/block/gap/gap.h"
-#include "project/item/folder/folder.h"
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/folder/folder.h"
+#include "node/project/footage/footage.h"
+#include "node/project/sequence/sequence.h"
 #include "widget/timelinewidget/timelineundo.h"
 
 #define OTIO opentimelineio::v1_0
diff --git a/app/task/project/loadotio/loadotio.h b/app/task/project/loadotio/loadotio.h
index fb6d2a2f2..55579fcd7 100644
--- a/app/task/project/loadotio/loadotio.h
+++ b/app/task/project/loadotio/loadotio.h
@@ -23,7 +23,7 @@
 
 #ifdef USE_OTIO
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "task/project/load/loadbasetask.h"
 
 namespace olive {
diff --git a/app/task/project/save/save.h b/app/task/project/save/save.h
index 4f7f8b0c3..b6670c660 100644
--- a/app/task/project/save/save.h
+++ b/app/task/project/save/save.h
@@ -21,7 +21,7 @@
 #ifndef PROJECTSAVEMANAGER_H
 #define PROJECTSAVEMANAGER_H
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "task/task.h"
 
 namespace olive {
diff --git a/app/task/project/saveotio/saveotio.cpp b/app/task/project/saveotio/saveotio.cpp
index 6da4b2f4d..791821772 100644
--- a/app/task/project/saveotio/saveotio.cpp
+++ b/app/task/project/saveotio/saveotio.cpp
@@ -29,7 +29,7 @@
 #include <opentimelineio/transition.h>
 
 #include "node/block/transition/transition.h"
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 
 namespace olive {
 
diff --git a/app/task/project/saveotio/saveotio.h b/app/task/project/saveotio/saveotio.h
index 2b673a120..658849de6 100644
--- a/app/task/project/saveotio/saveotio.h
+++ b/app/task/project/saveotio/saveotio.h
@@ -26,7 +26,7 @@
 #include <opentimelineio/timeline.h>
 #include <opentimelineio/track.h>
 
-#include "project/project.h"
+#include "node/project/project.h"
 #include "task/task.h"
 
 namespace olive {
diff --git a/app/task/render/render.h b/app/task/render/render.h
index 391b65884..799119977 100644
--- a/app/task/render/render.h
+++ b/app/task/render/render.h
@@ -23,8 +23,8 @@
 
 #include <QtConcurrent/QtConcurrent>
 
+#include "node/color/colormanager/colormanager.h"
 #include "node/output/viewer/viewer.h"
-#include "render/colormanager.h"
 #include "task/task.h"
 #include "threading/threadticket.h"
 #include "threading/threadticketwatcher.h"
diff --git a/app/widget/colorbutton/colorbutton.h b/app/widget/colorbutton/colorbutton.h
index 9d3a7e46c..79d90c319 100644
--- a/app/widget/colorbutton/colorbutton.h
+++ b/app/widget/colorbutton/colorbutton.h
@@ -23,7 +23,7 @@
 
 #include <QPushButton>
 
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 #include "render/managedcolor.h"
 
 namespace olive {
diff --git a/app/widget/colorwheel/colorspacechooser.h b/app/widget/colorwheel/colorspacechooser.h
index 221dca934..ea0a9dc0c 100644
--- a/app/widget/colorwheel/colorspacechooser.h
+++ b/app/widget/colorwheel/colorspacechooser.h
@@ -24,7 +24,7 @@
 #include <QComboBox>
 #include <QGroupBox>
 
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 
 namespace olive {
 
diff --git a/app/widget/colorwheel/colorvalueswidget.h b/app/widget/colorwheel/colorvalueswidget.h
index 371cbb392..7a9d05bb4 100644
--- a/app/widget/colorwheel/colorvalueswidget.h
+++ b/app/widget/colorwheel/colorvalueswidget.h
@@ -24,8 +24,8 @@
 #include <QWidget>
 
 #include "colorpreviewbox.h"
+#include "node/color/colormanager/colormanager.h"
 #include "render/color.h"
-#include "render/colormanager.h"
 #include "widget/slider/floatslider.h"
 
 namespace olive {
diff --git a/app/widget/keyframeview/keyframeviewundo.cpp b/app/widget/keyframeview/keyframeviewundo.cpp
index e569e9f60..2f5db0949 100644
--- a/app/widget/keyframeview/keyframeviewundo.cpp
+++ b/app/widget/keyframeview/keyframeviewundo.cpp
@@ -21,7 +21,7 @@
 #include "keyframeviewundo.h"
 
 #include "node/node.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 
diff --git a/app/widget/manageddisplay/manageddisplay.h b/app/widget/manageddisplay/manageddisplay.h
index 6a015cbc4..32b30ad58 100644
--- a/app/widget/manageddisplay/manageddisplay.h
+++ b/app/widget/manageddisplay/manageddisplay.h
@@ -25,7 +25,7 @@
 #include <QOpenGLContext>
 #include <QOpenGLWidget>
 
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 #include "render/renderer.h"
 #include "widget/menu/menu.h"
 
diff --git a/app/widget/nodeparamview/nodeparamviewitem.cpp b/app/widget/nodeparamview/nodeparamviewitem.cpp
index 6c21cbdd1..70b96e1c4 100644
--- a/app/widget/nodeparamview/nodeparamviewitem.cpp
+++ b/app/widget/nodeparamview/nodeparamviewitem.cpp
@@ -27,8 +27,8 @@
 
 #include "common/qtutils.h"
 #include "core.h"
+#include "node/project/sequence/sequence.h"
 #include "nodeparamviewundo.h"
-#include "project/item/sequence/sequence.h"
 
 namespace olive {
 
diff --git a/app/widget/nodeparamview/nodeparamviewundo.cpp b/app/widget/nodeparamview/nodeparamviewundo.cpp
index 105e47fae..643f8d3d6 100644
--- a/app/widget/nodeparamview/nodeparamviewundo.cpp
+++ b/app/widget/nodeparamview/nodeparamviewundo.cpp
@@ -21,7 +21,7 @@
 #include "nodeparamviewundo.h"
 
 #include "node/node.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 
diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
index 8f5ebcd7f..a6b1240b7 100644
--- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
+++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
@@ -28,10 +28,10 @@
 
 #include "core.h"
 #include "node/node.h"
+#include "node/project/sequence/sequence.h"
 #include "nodeparamviewarraywidget.h"
 #include "nodeparamviewrichtext.h"
 #include "nodeparamviewundo.h"
-#include "project/item/sequence/sequence.h"
 #include "undo/undostack.h"
 #include "widget/colorbutton/colorbutton.h"
 #include "widget/filefield/filefield.h"
diff --git a/app/widget/nodeview/nodeviewscene.cpp b/app/widget/nodeview/nodeviewscene.cpp
index c71309c1c..bb8550af0 100644
--- a/app/widget/nodeview/nodeviewscene.cpp
+++ b/app/widget/nodeview/nodeviewscene.cpp
@@ -21,9 +21,9 @@
 #include "nodeviewscene.h"
 
 #include "common/functiontimer.h"
+#include "node/project/sequence/sequence.h"
 #include "nodeviewedge.h"
 #include "nodeviewitem.h"
-#include "project/item/sequence/sequence.h"
 
 namespace olive {
 
diff --git a/app/widget/nodeview/nodeviewundo.cpp b/app/widget/nodeview/nodeviewundo.cpp
index d5135fd71..731b5f989 100644
--- a/app/widget/nodeview/nodeviewundo.cpp
+++ b/app/widget/nodeview/nodeviewundo.cpp
@@ -20,7 +20,7 @@
 
 #include "nodeviewundo.h"
 
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 #include "widget/timelinewidget/timelineundo.h"
 
 namespace olive {
diff --git a/app/widget/nodeview/nodeviewundo.h b/app/widget/nodeview/nodeviewundo.h
index 205987894..72b8e5e82 100644
--- a/app/widget/nodeview/nodeviewundo.h
+++ b/app/widget/nodeview/nodeviewundo.h
@@ -23,7 +23,7 @@
 
 #include "node/graph.h"
 #include "node/node.h"
-#include "project/project.h"
+#include "node/project/project.h"
 #include "undo/undocommand.h"
 
 namespace olive {
diff --git a/app/widget/projectexplorer/projectexplorer.h b/app/widget/projectexplorer/projectexplorer.h
index 37dd78bde..190faa510 100644
--- a/app/widget/projectexplorer/projectexplorer.h
+++ b/app/widget/projectexplorer/projectexplorer.h
@@ -26,8 +26,8 @@
 #include <QTimer>
 #include <QTreeView>
 
-#include "project/project.h"
-#include "project/projectviewmodel.h"
+#include "node/project/project.h"
+#include "node/project/projectviewmodel.h"
 #include "widget/projectexplorer/projectexplorericonview.h"
 #include "widget/projectexplorer/projectexplorerlistview.h"
 #include "widget/projectexplorer/projectexplorertreeview.h"
diff --git a/app/widget/timebased/timebasedwidget.cpp b/app/widget/timebased/timebasedwidget.cpp
index ff0fb7408..d65ccacfc 100644
--- a/app/widget/timebased/timebasedwidget.cpp
+++ b/app/widget/timebased/timebasedwidget.cpp
@@ -26,7 +26,7 @@
 #include "common/timecodefunctions.h"
 #include "config/config.h"
 #include "core.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 #include "widget/timelinewidget/timelineundo.h"
 
 namespace olive {
diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp
index b7f47cf5b..7d112bf63 100644
--- a/app/widget/timelinewidget/tool/import.cpp
+++ b/app/widget/timelinewidget/tool/import.cpp
@@ -33,7 +33,7 @@
 #include "node/distort/transform/transformdistortnode.h"
 #include "node/generator/matrix/matrix.h"
 #include "node/math/math/math.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 #include "widget/nodeview/nodeviewundo.h"
 #include "window/mainwindow/mainwindow.h"
 #include "window/mainwindow/mainwindowundo.h"
diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp
index 87dbd59c6..919b48799 100644
--- a/app/widget/timelinewidget/view/timelineview.cpp
+++ b/app/widget/timelinewidget/view/timelineview.cpp
@@ -31,7 +31,7 @@
 #include "common/flipmodifiers.h"
 #include "common/qtutils.h"
 #include "common/timecodefunctions.h"
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 #include "ui/colorcoding.h"
 
 namespace olive {
diff --git a/app/widget/timelinewidget/view/timelineviewghostitem.h b/app/widget/timelinewidget/view/timelineviewghostitem.h
index b84de8243..5be41898e 100644
--- a/app/widget/timelinewidget/view/timelineviewghostitem.h
+++ b/app/widget/timelinewidget/view/timelineviewghostitem.h
@@ -24,7 +24,7 @@
 #include <QVariant>
 
 #include "node/output/track/track.h"
-#include "project/item/footage/footage.h"
+#include "node/project/footage/footage.h"
 #include "timeline/timelinecommon.h"
 
 namespace olive {
diff --git a/app/widget/videoparamedit/videoparamedit.h b/app/widget/videoparamedit/videoparamedit.h
index da2684a94..95cf42395 100644
--- a/app/widget/videoparamedit/videoparamedit.h
+++ b/app/widget/videoparamedit/videoparamedit.h
@@ -25,7 +25,7 @@
 #include <QLabel>
 #include <QWidget>
 
-#include "render/colormanager.h"
+#include "node/color/colormanager/colormanager.h"
 #include "render/videoparams.h"
 #include "widget/slider/floatslider.h"
 #include "widget/slider/integerslider.h"
diff --git a/app/widget/viewer/footageviewer.cpp b/app/widget/viewer/footageviewer.cpp
index 7143e69e2..7f602d5ca 100644
--- a/app/widget/viewer/footageviewer.cpp
+++ b/app/widget/viewer/footageviewer.cpp
@@ -24,7 +24,7 @@
 #include <QMimeData>
 
 #include "config/config.h"
-#include "project/project.h"
+#include "node/project/project.h"
 
 namespace olive {
 
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index cbd9a3b01..cf0113ce2 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -35,7 +35,7 @@
 #include "common/ratiodialog.h"
 #include "common/timecodefunctions.h"
 #include "config/config.h"
-#include "project/project.h"
+#include "node/project/project.h"
 #include "render/rendermanager.h"
 #include "task/taskmanager.h"
 #include "widget/menu/menu.h"
diff --git a/app/widget/viewer/viewerdisplay.h b/app/widget/viewer/viewerdisplay.h
index 920ea91b6..40215def3 100644
--- a/app/widget/viewer/viewerdisplay.h
+++ b/app/widget/viewer/viewerdisplay.h
@@ -24,9 +24,9 @@
 #include <QOpenGLWidget>
 #include <QMatrix4x4>
 
+#include "node/color/colormanager/colormanager.h"
 #include "node/node.h"
 #include "render/color.h"
-#include "render/colormanager.h"
 #include "tool/tool.h"
 #include "viewersafemargininfo.h"
 #include "widget/manageddisplay/manageddisplay.h"
diff --git a/app/window/mainwindow/mainwindow.h b/app/window/mainwindow/mainwindow.h
index 4af363f19..a31cc6b30 100644
--- a/app/window/mainwindow/mainwindow.h
+++ b/app/window/mainwindow/mainwindow.h
@@ -24,6 +24,7 @@
 #include <QMainWindow>
 
 #include "mainwindowlayoutinfo.h"
+#include "node/project/project.h"
 #include "panel/panelmanager.h"
 #include "panel/audiomonitor/audiomonitor.h"
 #include "panel/curve/curve.h"
@@ -38,7 +39,6 @@
 #include "panel/footageviewer/footageviewer.h"
 #include "panel/sequenceviewer/sequenceviewer.h"
 #include "panel/pixelsampler/pixelsamplerpanel.h"
-#include "project/project.h"
 
 #ifdef Q_OS_WINDOWS
 #include <shobjidl.h>
diff --git a/app/window/mainwindow/mainwindowlayoutinfo.h b/app/window/mainwindow/mainwindowlayoutinfo.h
index bb14ab66e..fc619610d 100644
--- a/app/window/mainwindow/mainwindowlayoutinfo.h
+++ b/app/window/mainwindow/mainwindowlayoutinfo.h
@@ -1,8 +1,8 @@
 #ifndef MAINWINDOWLAYOUTINFO_H
 #define MAINWINDOWLAYOUTINFO_H
 
-#include "project/item/folder/folder.h"
-#include "project/item/sequence/sequence.h"
+#include "node/project/folder/folder.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {
 
diff --git a/app/window/mainwindow/mainwindowundo.h b/app/window/mainwindow/mainwindowundo.h
index f64f7f92e..5d1617e06 100644
--- a/app/window/mainwindow/mainwindowundo.h
+++ b/app/window/mainwindow/mainwindowundo.h
@@ -21,7 +21,7 @@
 #ifndef MAINWINDOWUNDO_H
 #define MAINWINDOWUNDO_H
 
-#include "project/item/sequence/sequence.h"
+#include "node/project/sequence/sequence.h"
 
 namespace olive {