diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18133a8..6bc2ece 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,19 +17,17 @@ add_definitions(${GLIB2_CFLAGS_OTHER})
 aux_source_directory("widgets" LAYER_SOURCES)
 aux_source_directory("cell-selector" CELL_SELECTOR_SOURCES)
 aux_source_directory("gds-utils" GDS_SOURCES)
-aux_source_directory("latex-renderer" LATEX_SOURCES)
-aux_source_directory("cairo-renderer" CAIRO_SOURCES)
+aux_source_directory("output-renderers" OUTPUT_RENDERER_SOURCES)
 aux_source_directory("geometric" GEOMETRIC_SOURCES)
 aux_source_directory("layer" LAYER_SELECTOR_SOURCES)
-set(SOURCE "main.c" "command-line.c" "gds-render-gui.c" "external-renderer.c")
+set(SOURCE "main.c" "command-line.c" "gds-render-gui.c")
 
 set(SOURCE
   ${SOURCE}
   ${LAYER_SOURCES}
   ${CELL_SELECTOR_SOURCES}
   ${GDS_SOURCES}
-  ${LATEX_SOURCES}
-  ${CAIRO_SOURCES}
+  ${OUTPUT_RENDERER_SOURCES}
   ${GEOMETRIC_SOURCES}
   ${LAYER_SELECTOR_SOURCES}
 )
diff --git a/command-line.c b/command-line.c
index 66bc9ac..276cf4e 100644
--- a/command-line.c
+++ b/command-line.c
@@ -34,9 +34,9 @@
 #include <gds-render/gds-utils/gds-parser.h>
 #include <gds-render/layer/mapping-parser.h>
 #include <gds-render/layer/layer-info.h>
-#include <gds-render/cairo-renderer/cairo-output.h>
-#include <gds-render/latex-renderer/latex-output.h>
-#include <gds-render/external-renderer.h>
+#include <gds-render/output-renderers/cairo-output.h>
+#include <gds-render/output-renderers/latex-output.h>
+#include <gds-render/output-renderers/external-renderer.h>
 #include <gds-render/gds-utils/gds-tree-checker.h>
 
 /**
diff --git a/gds-render-gui.c b/gds-render-gui.c
index 1790fad..c12ddcc 100644
--- a/gds-render-gui.c
+++ b/gds-render-gui.c
@@ -37,8 +37,8 @@
 #include <gds-render/widgets/activity-bar.h>
 #include <gds-render/cell-selector/tree-store.h>
 #include <gds-render/cell-selector/lib-cell-renderer.h>
-#include <gds-render/latex-renderer/latex-output.h>
-#include <gds-render/cairo-renderer/cairo-output.h>
+#include <gds-render/output-renderers/latex-output.h>
+#include <gds-render/output-renderers/cairo-output.h>
 #include <gds-render/widgets/conv-settings-dialog.h>
 #include <gds-render/geometric/cell-geometrics.h>
 #include <gds-render/version.h>
diff --git a/include/gds-render/cairo-renderer/cairo-output.h b/include/gds-render/output-renderers/cairo-output.h
similarity index 100%
rename from include/gds-render/cairo-renderer/cairo-output.h
rename to include/gds-render/output-renderers/cairo-output.h
diff --git a/include/gds-render/external-renderer.h b/include/gds-render/output-renderers/external-renderer.h
similarity index 100%
rename from include/gds-render/external-renderer.h
rename to include/gds-render/output-renderers/external-renderer.h
diff --git a/include/gds-render/latex-renderer/latex-output.h b/include/gds-render/output-renderers/latex-output.h
similarity index 100%
rename from include/gds-render/latex-renderer/latex-output.h
rename to include/gds-render/output-renderers/latex-output.h
diff --git a/main.c b/main.c
index 69377c4..b169292 100644
--- a/main.c
+++ b/main.c
@@ -29,7 +29,7 @@
 
 #include <gds-render/gds-render-gui.h>
 #include <gds-render/command-line.h>
-#include <gds-render/external-renderer.h>
+#include <gds-render/output-renderers/external-renderer.h>
 #include <gds-render/version.h>
 
 /**
diff --git a/cairo-renderer/cairo-output.c b/output-renderers/cairo-output.c
similarity index 99%
rename from cairo-renderer/cairo-output.c
rename to output-renderers/cairo-output.c
index f52c2dc..309a03e 100644
--- a/cairo-renderer/cairo-output.c
+++ b/output-renderers/cairo-output.c
@@ -32,7 +32,7 @@
 #include <cairo-pdf.h>
 #include <cairo-svg.h>
 
-#include <gds-render/cairo-renderer/cairo-output.h>
+#include <gds-render/output-renderers/cairo-output.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
diff --git a/external-renderer.c b/output-renderers/external-renderer.c
similarity index 97%
rename from external-renderer.c
rename to output-renderers/external-renderer.c
index c073366..66d7f78 100644
--- a/external-renderer.c
+++ b/output-renderers/external-renderer.c
@@ -31,7 +31,7 @@
 #include <dlfcn.h>
 #include <stdio.h>
 
-#include <gds-render/external-renderer.h>
+#include <gds-render/output-renderers/external-renderer.h>
 
 int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList *layer_info_list,
 				  char *output_file, char *so_path)
diff --git a/latex-renderer/latex-output.c b/output-renderers/latex-output.c
similarity index 99%
rename from latex-renderer/latex-output.c
rename to output-renderers/latex-output.c
index a47ff6f..a95aa80 100644
--- a/latex-renderer/latex-output.c
+++ b/output-renderers/latex-output.c
@@ -25,7 +25,7 @@
 
 #include <math.h>
 
-#include <gds-render/latex-renderer/latex-output.h>
+#include <gds-render/output-renderers/latex-output.h>
 
 /**
  * @addtogroup LaTeX-Renderer