diff --git a/app/core.cpp b/app/core.cpp
index 62ed05fd6..01db4d6cf 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -297,7 +297,7 @@ void Core::CreateNewSequence()
                                                                                  folder,
                                                                                  new_sequence);
 
-    new_sequence->AddDefaultNodes();
+    new_sequence->add_default_nodes();
 
     olive::undo_stack.push(aic);
 
diff --git a/app/node/CMakeLists.txt b/app/node/CMakeLists.txt
index a6f1004d3..dcaa35d5a 100644
--- a/app/node/CMakeLists.txt
+++ b/app/node/CMakeLists.txt
@@ -21,7 +21,6 @@ add_subdirectory(distort)
 add_subdirectory(generator)
 add_subdirectory(input)
 add_subdirectory(output)
-add_subdirectory(processor)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
diff --git a/app/node/blend/alphaover/alphaover.cpp b/app/node/blend/alphaover/alphaover.cpp
index d29d1e717..d7b560835 100644
--- a/app/node/blend/alphaover/alphaover.cpp
+++ b/app/node/blend/alphaover/alphaover.cpp
@@ -20,10 +20,10 @@
 
 #include "alphaover.h"
 
-#include "node/processor/videorenderer/videorenderer.h"
 #include "render/gl/functions.h"
-#include "render/rendertexture.h"
 #include "render/gl/shadergenerators.h"
+#include "render/rendertexture.h"
+#include "render/video/videorenderer.h"
 
 AlphaOverBlend::AlphaOverBlend()
 {
diff --git a/app/node/block/clip/clip.cpp b/app/node/block/clip/clip.cpp
index 112d1faad..9c6112a53 100644
--- a/app/node/block/clip/clip.cpp
+++ b/app/node/block/clip/clip.cpp
@@ -20,8 +20,6 @@
 
 #include "clip.h"
 
-#include "node/processor/videorenderer/videorenderer.h"
-
 ClipBlock::ClipBlock()
 {
   texture_input_ = new NodeInput("tex_in");
diff --git a/app/node/color/opacity/opacity.cpp b/app/node/color/opacity/opacity.cpp
index 568259aaf..b1c1525d8 100644
--- a/app/node/color/opacity/opacity.cpp
+++ b/app/node/color/opacity/opacity.cpp
@@ -20,9 +20,9 @@
 
 #include "opacity.h"
 
-#include "node/processor/videorenderer/videorenderer.h"
 #include "render/gl/functions.h"
 #include "render/rendertexture.h"
+#include "render/video/videorenderer.h"
 
 OpacityNode::OpacityNode()
 {
diff --git a/app/node/input/media/media.cpp b/app/node/input/media/media.cpp
index c408f169c..06b296b1e 100644
--- a/app/node/input/media/media.cpp
+++ b/app/node/input/media/media.cpp
@@ -25,11 +25,11 @@
 
 #include "core.h"
 #include "decoder/ffmpeg/ffmpegdecoder.h"
-#include "node/processor/videorenderer/videorenderer.h"
 #include "project/item/footage/footage.h"
 #include "render/gl/shadergenerators.h"
 #include "render/gl/functions.h"
 #include "render/pixelservice.h"
+#include "render/video/videorenderer.h"
 
 MediaInput::MediaInput() :
   decoder_(nullptr),
diff --git a/app/node/processor/videorenderer/CMakeLists.txt b/app/node/processor/videorenderer/CMakeLists.txt
deleted file mode 100644
index 297c91f9c..000000000
--- a/app/node/processor/videorenderer/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Olive - Non-Linear Video Editor
-# Copyright (C) 2019 Olive Team
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set(OLIVE_SOURCES
-  ${OLIVE_SOURCES}
-  node/processor/videorenderer/videorenderer.h
-  node/processor/videorenderer/videorenderer.cpp
-  node/processor/videorenderer/videorendererthreadbase.h
-  node/processor/videorenderer/videorendererthreadbase.cpp
-  node/processor/videorenderer/videorendererdownloadthread.h
-  node/processor/videorenderer/videorendererdownloadthread.cpp
-  node/processor/videorenderer/videorendererprocessthread.h
-  node/processor/videorenderer/videorendererprocessthread.cpp
-  PARENT_SCOPE
-)
diff --git a/app/project/item/sequence/sequence.h b/app/project/item/sequence/sequence.h
index d4f381a36..dac92c432 100644
--- a/app/project/item/sequence/sequence.h
+++ b/app/project/item/sequence/sequence.h
@@ -25,7 +25,7 @@
 #include "node/graph.h"
 #include "node/output/timeline/timeline.h"
 #include "node/output/viewer/viewer.h"
-#include "node/processor/videorenderer/videorenderer.h"
+#include "render/video/videorenderer.h"
 #include "project/item/item.h"
 
 class Sequence;
diff --git a/app/render/CMakeLists.txt b/app/render/CMakeLists.txt
index 05f649d8e..a7234a734 100644
--- a/app/render/CMakeLists.txt
+++ b/app/render/CMakeLists.txt
@@ -14,7 +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(audio)
 add_subdirectory(gl)
+add_subdirectory(video)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
diff --git a/app/node/processor/CMakeLists.txt b/app/render/audio/CMakeLists.txt
similarity index 71%
rename from app/node/processor/CMakeLists.txt
rename to app/render/audio/CMakeLists.txt
index 285103c0e..826055ece 100644
--- a/app/node/processor/CMakeLists.txt
+++ b/app/render/audio/CMakeLists.txt
@@ -14,10 +14,15 @@
 # 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(audiorenderer)
-add_subdirectory(videorenderer)
-
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
+  render/audio/audiorenderer.h
+  render/audio/audiorenderer.cpp
+  render/audio/audiorendererparams.h
+  render/audio/audiorendererparams.cpp
+  render/audio/audiorendererthread.h
+  render/audio/audiorendererthread.cpp
+  render/audio/audiorendererthreadbase.h
+  render/audio/audiorendererthreadbase.cpp
   PARENT_SCOPE
 )
diff --git a/app/node/processor/audiorenderer/audiorenderer.cpp b/app/render/audio/audiorenderer.cpp
similarity index 100%
rename from app/node/processor/audiorenderer/audiorenderer.cpp
rename to app/render/audio/audiorenderer.cpp
diff --git a/app/node/processor/audiorenderer/audiorenderer.h b/app/render/audio/audiorenderer.h
similarity index 100%
rename from app/node/processor/audiorenderer/audiorenderer.h
rename to app/render/audio/audiorenderer.h
diff --git a/app/node/processor/audiorenderer/audiorendererparams.cpp b/app/render/audio/audiorendererparams.cpp
similarity index 100%
rename from app/node/processor/audiorenderer/audiorendererparams.cpp
rename to app/render/audio/audiorendererparams.cpp
diff --git a/app/node/processor/audiorenderer/audiorendererparams.h b/app/render/audio/audiorendererparams.h
similarity index 100%
rename from app/node/processor/audiorenderer/audiorendererparams.h
rename to app/render/audio/audiorendererparams.h
diff --git a/app/node/processor/audiorenderer/audiorendererthread.cpp b/app/render/audio/audiorendererthread.cpp
similarity index 100%
rename from app/node/processor/audiorenderer/audiorendererthread.cpp
rename to app/render/audio/audiorendererthread.cpp
diff --git a/app/node/processor/audiorenderer/audiorendererthread.h b/app/render/audio/audiorendererthread.h
similarity index 100%
rename from app/node/processor/audiorenderer/audiorendererthread.h
rename to app/render/audio/audiorendererthread.h
diff --git a/app/node/processor/audiorenderer/audiorendererthreadbase.cpp b/app/render/audio/audiorendererthreadbase.cpp
similarity index 100%
rename from app/node/processor/audiorenderer/audiorendererthreadbase.cpp
rename to app/render/audio/audiorendererthreadbase.cpp
diff --git a/app/node/processor/audiorenderer/audiorendererthreadbase.h b/app/render/audio/audiorendererthreadbase.h
similarity index 100%
rename from app/node/processor/audiorenderer/audiorendererthreadbase.h
rename to app/render/audio/audiorendererthreadbase.h
diff --git a/app/node/processor/audiorenderer/CMakeLists.txt b/app/render/video/CMakeLists.txt
similarity index 63%
rename from app/node/processor/audiorenderer/CMakeLists.txt
rename to app/render/video/CMakeLists.txt
index 60057f8d2..10d5a6691 100644
--- a/app/node/processor/audiorenderer/CMakeLists.txt
+++ b/app/render/video/CMakeLists.txt
@@ -16,13 +16,13 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  node/processor/audiorenderer/audiorenderer.h
-  node/processor/audiorenderer/audiorenderer.cpp
-  node/processor/audiorenderer/audiorendererparams.h
-  node/processor/audiorenderer/audiorendererparams.cpp
-  node/processor/audiorenderer/audiorendererthread.h
-  node/processor/audiorenderer/audiorendererthread.cpp
-  node/processor/audiorenderer/audiorendererthreadbase.h
-  node/processor/audiorenderer/audiorendererthreadbase.cpp
+  render/video/videorenderer.h
+  render/video/videorenderer.cpp
+  render/video/videorendererthreadbase.h
+  render/video/videorendererthreadbase.cpp
+  render/video/videorendererdownloadthread.h
+  render/video/videorendererdownloadthread.cpp
+  render/video/videorendererprocessthread.h
+  render/video/videorendererprocessthread.cpp
   PARENT_SCOPE
 )
diff --git a/app/node/processor/videorenderer/videorenderer.cpp b/app/render/video/videorenderer.cpp
similarity index 100%
rename from app/node/processor/videorenderer/videorenderer.cpp
rename to app/render/video/videorenderer.cpp
diff --git a/app/node/processor/videorenderer/videorenderer.h b/app/render/video/videorenderer.h
similarity index 100%
rename from app/node/processor/videorenderer/videorenderer.h
rename to app/render/video/videorenderer.h
diff --git a/app/node/processor/videorenderer/videorendererdownloadthread.cpp b/app/render/video/videorendererdownloadthread.cpp
similarity index 100%
rename from app/node/processor/videorenderer/videorendererdownloadthread.cpp
rename to app/render/video/videorendererdownloadthread.cpp
diff --git a/app/node/processor/videorenderer/videorendererdownloadthread.h b/app/render/video/videorendererdownloadthread.h
similarity index 100%
rename from app/node/processor/videorenderer/videorendererdownloadthread.h
rename to app/render/video/videorendererdownloadthread.h
diff --git a/app/node/processor/videorenderer/videorendererprocessthread.cpp b/app/render/video/videorendererprocessthread.cpp
similarity index 100%
rename from app/node/processor/videorenderer/videorendererprocessthread.cpp
rename to app/render/video/videorendererprocessthread.cpp
diff --git a/app/node/processor/videorenderer/videorendererprocessthread.h b/app/render/video/videorendererprocessthread.h
similarity index 100%
rename from app/node/processor/videorenderer/videorendererprocessthread.h
rename to app/render/video/videorendererprocessthread.h
diff --git a/app/node/processor/videorenderer/videorendererthreadbase.cpp b/app/render/video/videorendererthreadbase.cpp
similarity index 100%
rename from app/node/processor/videorenderer/videorendererthreadbase.cpp
rename to app/render/video/videorendererthreadbase.cpp
diff --git a/app/node/processor/videorenderer/videorendererthreadbase.h b/app/render/video/videorendererthreadbase.h
similarity index 100%
rename from app/node/processor/videorenderer/videorendererthreadbase.h
rename to app/render/video/videorendererthreadbase.h
diff --git a/app/node/processor/videorenderer/videorendermanager.cpp b/app/render/video/videorendermanager.cpp
similarity index 100%
rename from app/node/processor/videorenderer/videorendermanager.cpp
rename to app/render/video/videorendermanager.cpp
diff --git a/app/node/processor/videorenderer/videorendermanager.h b/app/render/video/videorendermanager.h
similarity index 100%
rename from app/node/processor/videorenderer/videorendermanager.h
rename to app/render/video/videorendermanager.h