diff --git a/SConstruct b/SConstruct
index f43fae8a2..14033d41f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1670,6 +1670,9 @@ if not HELP_REQUESTED:
     # Build the core library
     SConscript('src/build.py')
 
+    # Install headers
+    SConscript('include/build.py')
+
     # Build the requested and able-to-be-compiled input plug-ins
     GDAL_BUILT = False
     OGR_BUILT = False
diff --git a/bindings/python/mapnik_text_placement.cpp b/bindings/python/mapnik_text_placement.cpp
index 29fdad066..99952cee8 100644
--- a/bindings/python/mapnik_text_placement.cpp
+++ b/bindings/python/mapnik_text_placement.cpp
@@ -28,7 +28,7 @@
 #include <mapnik/formatting/text.hpp>
 #include <mapnik/formatting/list.hpp>
 #include <mapnik/formatting/format.hpp>
-#include <mapnik/formatting/expression.hpp>
+#include <mapnik/formatting/expression_format.hpp>
 #include <mapnik/processed_text.hpp>
 #include <mapnik/expression_string.hpp>
 #include <mapnik/text_symbolizer.hpp>
diff --git a/include/build.py b/include/build.py
new file mode 100644
index 000000000..0876ff044
--- /dev/null
+++ b/include/build.py
@@ -0,0 +1,29 @@
+import os
+from glob import glob
+
+Import('env')
+
+base = '../include/mapnik/'
+subdirs = ['svg','wkt','grid','json','util']
+
+#if env['SVG_RENDERER']:
+#    subdirs.append('svg/output')
+
+inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik')
+
+if 'install' in COMMAND_LINE_TARGETS:
+    
+    includes = glob('../include/mapnik/*.hpp')
+
+    for subdir in subdirs:
+        pathdir = os.path.join(base,subdir,'*.hpp')
+        includes.extend(glob(pathdir))
+
+    env.Alias(target='install', source=env.Install(inc_target, includes))
+    
+    # special case these as duplicate named headers break scons
+    for subdir in ['text_placements','formatting']:
+        includes = glob('../include/mapnik/%s*.hpp' % subdir)
+        env.Alias(target='install', source=env.Install(inc_target, includes))
+
+env['create_uninstall_target'](env, inc_target)
diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp
index cab5179fd..cb4479e47 100644
--- a/include/mapnik/feature_style_processor_impl.hpp
+++ b/include/mapnik/feature_style_processor_impl.hpp
@@ -52,7 +52,7 @@
 #endif
 
 #if defined(SVG_RENDERER)
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 #endif
 
 #if defined(RENDERING_STATS)
diff --git a/include/mapnik/formatting/expression.hpp b/include/mapnik/formatting/expression_format.hpp
similarity index 100%
rename from include/mapnik/formatting/expression.hpp
rename to include/mapnik/formatting/expression_format.hpp
diff --git a/include/mapnik/placement_finder.hpp b/include/mapnik/placement_finder.hpp
index fb7cd13be..fca15958b 100644
--- a/include/mapnik/placement_finder.hpp
+++ b/include/mapnik/placement_finder.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/geometry.hpp>
 #include <mapnik/text_properties.hpp>
-#include <mapnik/text_placements/base.hpp>
+//#include <mapnik/text_placements/base.hpp>
 #include <mapnik/symbolizer_helpers.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/ctrans.hpp>
diff --git a/include/mapnik/svg/svg_generator.hpp b/include/mapnik/svg/output/svg_generator.hpp
similarity index 100%
rename from include/mapnik/svg/svg_generator.hpp
rename to include/mapnik/svg/output/svg_generator.hpp
diff --git a/include/mapnik/svg/svg_output_attributes.hpp b/include/mapnik/svg/output/svg_output_attributes.hpp
similarity index 100%
rename from include/mapnik/svg/svg_output_attributes.hpp
rename to include/mapnik/svg/output/svg_output_attributes.hpp
diff --git a/include/mapnik/svg/svg_output_grammars.hpp b/include/mapnik/svg/output/svg_output_grammars.hpp
similarity index 98%
rename from include/mapnik/svg/svg_output_grammars.hpp
rename to include/mapnik/svg/output/svg_output_grammars.hpp
index 121ca2aae..dafb3dbd8 100644
--- a/include/mapnik/svg/svg_output_grammars.hpp
+++ b/include/mapnik/svg/output/svg_output_grammars.hpp
@@ -27,8 +27,8 @@
 #include <mapnik/vertex.hpp>
 #include <mapnik/ctrans.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/svg/svg_path_iterator.hpp>
-#include <mapnik/svg/svg_output_attributes.hpp>
+#include <mapnik/svg/output/svg_path_iterator.hpp>
+#include <mapnik/svg/output/svg_output_attributes.hpp>
 
 // boost
 #include <boost/spirit/include/karma.hpp>
diff --git a/include/mapnik/svg/svg_path_iterator.hpp b/include/mapnik/svg/output/svg_path_iterator.hpp
similarity index 100%
rename from include/mapnik/svg/svg_path_iterator.hpp
rename to include/mapnik/svg/output/svg_path_iterator.hpp
diff --git a/include/mapnik/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp
similarity index 98%
rename from include/mapnik/svg_renderer.hpp
rename to include/mapnik/svg/output/svg_renderer.hpp
index fe91de259..d44034048 100644
--- a/include/mapnik/svg_renderer.hpp
+++ b/include/mapnik/svg/output/svg_renderer.hpp
@@ -26,8 +26,8 @@
 // mapnik
 #include <mapnik/feature_style_processor.hpp>
 #include <mapnik/map.hpp>
-#include <mapnik/svg/svg_generator.hpp>
-#include <mapnik/svg/svg_output_attributes.hpp>
+#include <mapnik/svg/output/svg_generator.hpp>
+#include <mapnik/svg/output/svg_output_attributes.hpp>
 
 // stl
 #include <string>
diff --git a/include/mapnik/svg/svg_renderer.hpp b/include/mapnik/svg/svg_renderer_agg.hpp
similarity index 98%
rename from include/mapnik/svg/svg_renderer.hpp
rename to include/mapnik/svg/svg_renderer_agg.hpp
index cc354d761..28a9b6128 100644
--- a/include/mapnik/svg/svg_renderer.hpp
+++ b/include/mapnik/svg/svg_renderer_agg.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_SVG_RENDERER_HPP
-#define MAPNIK_SVG_RENDERER_HPP
+#ifndef MAPNIK_SVG_RENDERER_AGG_HPP
+#define MAPNIK_SVG_RENDERER_AGG_HPP
 
 // mapnik
 #include <mapnik/debug.hpp>
@@ -100,7 +100,7 @@ private:
 };
 
 template <typename VertexSource, typename AttributeSource, typename ScanlineRenderer, typename PixelFormat>
-class svg_renderer : boost::noncopyable
+class svg_renderer_agg : boost::noncopyable
 {
 public:
     typedef agg::conv_curve<VertexSource>            curved_type;
@@ -110,7 +110,7 @@ public:
     typedef agg::conv_contour<curved_trans_type>     curved_trans_contour_type;
     typedef agg::renderer_base<PixelFormat>          renderer_base;
 
-    svg_renderer(VertexSource & source, AttributeSource const& attributes)
+    svg_renderer_agg(VertexSource & source, AttributeSource const& attributes)
         : source_(source),
           curved_(source_),
           curved_stroked_(curved_),
@@ -440,4 +440,4 @@ private:
 
 }}
 
-#endif //MAPNIK_SVG_RENDERER_HPP
+#endif //MAPNIK_SVG_RENDERER_AGG_HPP
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index a1ce58534..d9a75a906 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -36,7 +36,7 @@
 #include <mapnik/parse_path.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/svg/svg_converter.hpp>
-#include <mapnik/svg/svg_renderer.hpp>
+#include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 
 #include <mapnik/image_compositing.hpp>
@@ -323,7 +323,7 @@ void agg_renderer<T>::render_marker(pixel_position const& pos, marker const& mar
         using namespace mapnik::svg;
         vertex_stl_adapter<svg_path_storage> stl_storage((*marker.get_vector_data())->source());
         svg_path_adapter svg_path(stl_storage);
-        svg_renderer<svg_path_adapter,
+        svg_renderer_agg<svg_path_adapter,
             agg::pod_bvector<path_attributes>,
             renderer_type,
             agg::pixfmt_rgba32> svg_renderer(svg_path,
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 078dfd5cd..5624b6b9b 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -32,7 +32,7 @@
 #include <mapnik/marker_helpers.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
-#include <mapnik/svg/svg_renderer.hpp>
+#include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
@@ -89,7 +89,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                 using namespace mapnik::svg;
                 typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
                 typedef agg::pod_bvector<path_attributes> svg_attribute_type;
-                typedef svg_renderer<svg_path_adapter,
+                typedef svg_renderer_agg<svg_path_adapter,
                                      svg_attribute_type,
                                      renderer_type,
                                      pixfmt_comp_type > svg_renderer_type;
diff --git a/src/agg/process_shield_symbolizer.cpp b/src/agg/process_shield_symbolizer.cpp
index f33381f0b..61f3c9fee 100644
--- a/src/agg/process_shield_symbolizer.cpp
+++ b/src/agg/process_shield_symbolizer.cpp
@@ -25,7 +25,7 @@
 #include <mapnik/agg_rasterizer.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/svg/svg_converter.hpp>
-#include <mapnik/svg/svg_renderer.hpp>
+#include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/symbolizer_helpers.hpp>
 
diff --git a/src/build.py b/src/build.py
index 6953215b8..6a5162454 100644
--- a/src/build.py
+++ b/src/build.py
@@ -162,10 +162,10 @@ source = Split(
     wkt/wkt_generator.cpp
     mapped_memory_cache.cpp
     marker_cache.cpp
-    svg_parser.cpp
-    svg_path_parser.cpp
-    svg_points_parser.cpp
-    svg_transform_parser.cpp
+    svg/svg_parser.cpp
+    svg/svg_path_parser.cpp
+    svg/svg_points_parser.cpp
+    svg/svg_transform_parser.cpp
     warp.cpp
     json/geometry_grammar.cpp
     json/geometry_parser.cpp
@@ -284,20 +284,20 @@ source += Split(
 #if env['SVG_RENDERER']: # svg backend
 #    source += Split(
 #              """
-#        svg/svg_renderer.cpp
-#        svg/svg_generator.cpp
-#        svg/svg_output_attributes.cpp
-#        svg/process_symbolizers.cpp
-#        svg/process_building_symbolizer.cpp
-#        svg/process_line_pattern_symbolizer.cpp
-#        svg/process_line_symbolizer.cpp
-#        svg/process_markers_symbolizer.cpp
-#        svg/process_point_symbolizer.cpp
-#        svg/process_polygon_pattern_symbolizer.cpp
-#        svg/process_polygon_symbolizer.cpp
-#       svg/process_raster_symbolizer.cpp
-#        svg/process_shield_symbolizer.cpp
-#        svg/process_text_symbolizer.cpp
+#        svg/output/svg_renderer.cpp
+#        svg/output/svg_generator.cpp
+#        svg/output/svg_output_attributes.cpp
+#        svg/output/process_symbolizers.cpp
+#        svg/output/process_building_symbolizer.cpp
+#        svg/output/process_line_pattern_symbolizer.cpp
+#        svg/output/process_line_symbolizer.cpp
+#        svg/output/process_markers_symbolizer.cpp
+#        svg/output/process_point_symbolizer.cpp
+#        svg/output/process_polygon_pattern_symbolizer.cpp
+#        svg/output/process_polygon_symbolizer.cpp
+#        svg/output/process_raster_symbolizer.cpp
+#        svg/output/process_shield_symbolizer.cpp
+#        svg/output/process_text_symbolizer.cpp
 #        """)
 #    lib_env.Append(CXXFLAGS = '-DSVG_RENDERER')
 #    libmapnik_cxxflags.append('-DSVG_RENDERER')
@@ -383,41 +383,4 @@ else:
     # delete in reverse order..
     env['create_uninstall_target'](env, target2)
     env['create_uninstall_target'](env, target1)
-    env['create_uninstall_target'](env, target)
-
-includes = glob.glob('../include/mapnik/*.hpp')
-svg_includes = glob.glob('../include/mapnik/svg/*.hpp')
-wkt_includes = glob.glob('../include/mapnik/wkt/*.hpp')
-grid_includes = glob.glob('../include/mapnik/grid/*.hpp')
-json_includes = glob.glob('../include/mapnik/json/*.hpp')
-util_includes = glob.glob('../include/mapnik/util/*.hpp')
-text_placements_includes = glob.glob('../include/mapnik/text_placements/*.hpp')
-formatting_includes = glob.glob('../include/mapnik/formatting/*.hpp')
-
-inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik')
-svg_inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/svg')
-wkt_inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/wkt')
-grid_inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/grid')
-json_inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/json')
-util_inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/util')
-text_placements_inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/text_placements')
-formatting_inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/formatting')
-
-if 'uninstall' not in COMMAND_LINE_TARGETS:
-    env.Alias(target='install', source=env.Install(inc_target, includes))
-    env.Alias(target='install', source=env.Install(svg_inc_target, svg_includes))
-    env.Alias(target='install', source=env.Install(wkt_inc_target, wkt_includes))
-    env.Alias(target='install', source=env.Install(grid_inc_target, grid_includes))
-    env.Alias(target='install', source=env.Install(json_inc_target, json_includes))
-    env.Alias(target='install', source=env.Install(util_inc_target, util_includes))
-    env.Alias(target='install', source=env.Install(text_placements_inc_target, text_placements_includes))
-    env.Alias(target='install', source=env.Install(formatting_inc_target, formatting_includes))
-
-env['create_uninstall_target'](env, inc_target)
-env['create_uninstall_target'](env, svg_inc_target)
-env['create_uninstall_target'](env, wkt_inc_target)
-env['create_uninstall_target'](env, grid_inc_target)
-env['create_uninstall_target'](env, json_inc_target)
-env['create_uninstall_target'](env, util_inc_target)
-env['create_uninstall_target'](env, text_placements_inc_target)
-env['create_uninstall_target'](env, formatting_inc_target)
+    env['create_uninstall_target'](env, target)
\ No newline at end of file
diff --git a/src/formatting/expression.cpp b/src/formatting/expression.cpp
index bb7261f51..5d032f8a4 100644
--- a/src/formatting/expression.cpp
+++ b/src/formatting/expression.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/formatting/expression.hpp>
+#include <mapnik/formatting/expression_format.hpp>
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/expression_string.hpp>
 #include <mapnik/expression_evaluator.hpp>
diff --git a/src/formatting/registry.cpp b/src/formatting/registry.cpp
index 0e2b8c81b..b9a9d0bf7 100644
--- a/src/formatting/registry.cpp
+++ b/src/formatting/registry.cpp
@@ -23,7 +23,7 @@
 #include <mapnik/formatting/registry.hpp>
 #include <mapnik/formatting/text.hpp>
 #include <mapnik/formatting/format.hpp>
-#include <mapnik/formatting/expression.hpp>
+#include <mapnik/formatting/expression_format.hpp>
 #include <mapnik/xml_node.hpp>
 #include <mapnik/config_error.hpp>
 
diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp
index 4e2b11663..3cd8bf61a 100644
--- a/src/grid/grid_renderer.cpp
+++ b/src/grid/grid_renderer.cpp
@@ -37,7 +37,7 @@
 #include <mapnik/parse_path.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/svg/svg_converter.hpp>
-#include <mapnik/svg/svg_renderer.hpp>
+#include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 
 // boost
@@ -158,7 +158,7 @@ void grid_renderer<T>::render_marker(mapnik::feature_impl & feature, unsigned in
         using namespace mapnik::svg;
         vertex_stl_adapter<svg_path_storage> stl_storage((*marker.get_vector_data())->source());
         svg_path_adapter svg_path(stl_storage);
-        svg_renderer<svg_path_adapter,
+        svg_renderer_agg<svg_path_adapter,
             agg::pod_bvector<path_attributes>,
             renderer,
             mapnik::pixfmt_gray32> svg_renderer(svg_path,
diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp
index d21a23d03..6b4b24052 100644
--- a/src/grid/process_markers_symbolizer.cpp
+++ b/src/grid/process_markers_symbolizer.cpp
@@ -57,7 +57,7 @@ porting notes -->
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/marker_helpers.hpp>
-#include <mapnik/svg/svg_renderer.hpp>
+#include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
@@ -106,7 +106,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
             {
                 using namespace mapnik::svg;
                 typedef agg::pod_bvector<path_attributes> svg_attribute_type;
-                typedef svg_renderer<svg_path_adapter,
+                typedef svg_renderer_agg<svg_path_adapter,
                                      svg_attribute_type,
                                      renderer_type,
                                      pixfmt_type > svg_renderer_type;
diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp
index ac092061b..4fe455bdb 100644
--- a/src/grid/process_shield_symbolizer.cpp
+++ b/src/grid/process_shield_symbolizer.cpp
@@ -28,7 +28,7 @@
 #include <mapnik/grid/grid.hpp>
 #include <mapnik/symbolizer_helpers.hpp>
 #include <mapnik/svg/svg_converter.hpp>
-#include <mapnik/svg/svg_renderer.hpp>
+#include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 
 // agg
diff --git a/src/svg/process_building_symbolizer.cpp b/src/svg/output/process_building_symbolizer.cpp
similarity index 97%
rename from src/svg/process_building_symbolizer.cpp
rename to src/svg/output/process_building_symbolizer.cpp
index 2575d49c3..a86405c45 100644
--- a/src/svg/process_building_symbolizer.cpp
+++ b/src/svg/output/process_building_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/process_line_pattern_symbolizer.cpp b/src/svg/output/process_line_pattern_symbolizer.cpp
similarity index 97%
rename from src/svg/process_line_pattern_symbolizer.cpp
rename to src/svg/output/process_line_pattern_symbolizer.cpp
index a15b48d4b..f0fa7376d 100644
--- a/src/svg/process_line_pattern_symbolizer.cpp
+++ b/src/svg/output/process_line_pattern_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/process_line_symbolizer.cpp b/src/svg/output/process_line_symbolizer.cpp
similarity index 97%
rename from src/svg/process_line_symbolizer.cpp
rename to src/svg/output/process_line_symbolizer.cpp
index 4eff12d54..8c31fcc5d 100644
--- a/src/svg/process_line_symbolizer.cpp
+++ b/src/svg/output/process_line_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/process_markers_symbolizer.cpp b/src/svg/output/process_markers_symbolizer.cpp
similarity index 97%
rename from src/svg/process_markers_symbolizer.cpp
rename to src/svg/output/process_markers_symbolizer.cpp
index e8273eb50..cd1d7ef75 100644
--- a/src/svg/process_markers_symbolizer.cpp
+++ b/src/svg/output/process_markers_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/process_point_symbolizer.cpp b/src/svg/output/process_point_symbolizer.cpp
similarity index 97%
rename from src/svg/process_point_symbolizer.cpp
rename to src/svg/output/process_point_symbolizer.cpp
index e209ab78b..7b732acd2 100644
--- a/src/svg/process_point_symbolizer.cpp
+++ b/src/svg/output/process_point_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/process_polygon_pattern_symbolizer.cpp b/src/svg/output/process_polygon_pattern_symbolizer.cpp
similarity index 97%
rename from src/svg/process_polygon_pattern_symbolizer.cpp
rename to src/svg/output/process_polygon_pattern_symbolizer.cpp
index 23237b4a3..cd0e6fe27 100644
--- a/src/svg/process_polygon_pattern_symbolizer.cpp
+++ b/src/svg/output/process_polygon_pattern_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/process_polygon_symbolizer.cpp b/src/svg/output/process_polygon_symbolizer.cpp
similarity index 97%
rename from src/svg/process_polygon_symbolizer.cpp
rename to src/svg/output/process_polygon_symbolizer.cpp
index 032fba249..e9dd3da1b 100644
--- a/src/svg/process_polygon_symbolizer.cpp
+++ b/src/svg/output/process_polygon_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/process_raster_symbolizer.cpp b/src/svg/output/process_raster_symbolizer.cpp
similarity index 97%
rename from src/svg/process_raster_symbolizer.cpp
rename to src/svg/output/process_raster_symbolizer.cpp
index 0201c54c9..6ba640714 100644
--- a/src/svg/process_raster_symbolizer.cpp
+++ b/src/svg/output/process_raster_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/process_shield_symbolizer.cpp b/src/svg/output/process_shield_symbolizer.cpp
similarity index 97%
rename from src/svg/process_shield_symbolizer.cpp
rename to src/svg/output/process_shield_symbolizer.cpp
index d5c3015c4..0fde67fd2 100644
--- a/src/svg/process_shield_symbolizer.cpp
+++ b/src/svg/output/process_shield_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/process_symbolizers.cpp b/src/svg/output/process_symbolizers.cpp
similarity index 98%
rename from src/svg/process_symbolizers.cpp
rename to src/svg/output/process_symbolizers.cpp
index 2a1bcbad1..7ee1406ad 100644
--- a/src/svg/process_symbolizers.cpp
+++ b/src/svg/output/process_symbolizers.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik {
 
diff --git a/src/svg/process_text_symbolizer.cpp b/src/svg/output/process_text_symbolizer.cpp
similarity index 97%
rename from src/svg/process_text_symbolizer.cpp
rename to src/svg/output/process_text_symbolizer.cpp
index 03b19c08f..16bec775e 100644
--- a/src/svg/process_text_symbolizer.cpp
+++ b/src/svg/output/process_text_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 namespace mapnik
 {
diff --git a/src/svg/svg_generator.cpp b/src/svg/output/svg_generator.cpp
similarity index 98%
rename from src/svg/svg_generator.cpp
rename to src/svg/output/svg_generator.cpp
index edb64b4df..91baaf4fa 100644
--- a/src/svg/svg_generator.cpp
+++ b/src/svg/output/svg_generator.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/svg/svg_generator.hpp>
+#include <mapnik/svg/output/svg_generator.hpp>
 #include <mapnik/geometry.hpp>
 
 // boost
diff --git a/src/svg/svg_output_attributes.cpp b/src/svg/output/svg_output_attributes.cpp
similarity index 100%
rename from src/svg/svg_output_attributes.cpp
rename to src/svg/output/svg_output_attributes.cpp
diff --git a/src/svg/svg_renderer.cpp b/src/svg/output/svg_renderer.cpp
similarity index 98%
rename from src/svg/svg_renderer.cpp
rename to src/svg/output/svg_renderer.cpp
index 839492f4c..fa7507efc 100644
--- a/src/svg/svg_renderer.cpp
+++ b/src/svg/output/svg_renderer.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 #include <mapnik/map.hpp>
 
 // stl
diff --git a/src/svg_parser.cpp b/src/svg/svg_parser.cpp
similarity index 100%
rename from src/svg_parser.cpp
rename to src/svg/svg_parser.cpp
diff --git a/src/svg_path_parser.cpp b/src/svg/svg_path_parser.cpp
similarity index 97%
rename from src/svg_path_parser.cpp
rename to src/svg/svg_path_parser.cpp
index 47f9f3b61..6d11836cc 100644
--- a/src/svg_path_parser.cpp
+++ b/src/svg/svg_path_parser.cpp
@@ -25,7 +25,7 @@
 #include <mapnik/svg/svg_path_parser.hpp>
 #include <mapnik/svg/svg_path_grammar.hpp>
 #include <mapnik/svg/svg_converter.hpp>
-#include <mapnik/svg/svg_renderer.hpp>
+
 // agg
 #include "agg_path_storage.h"
 
diff --git a/src/svg_points_parser.cpp b/src/svg/svg_points_parser.cpp
similarity index 100%
rename from src/svg_points_parser.cpp
rename to src/svg/svg_points_parser.cpp
diff --git a/src/svg_transform_parser.cpp b/src/svg/svg_transform_parser.cpp
similarity index 100%
rename from src/svg_transform_parser.cpp
rename to src/svg/svg_transform_parser.cpp
diff --git a/tests/cpp_tests/svg_renderer_tests/combined_test.cpp b/tests/cpp_tests/svg_renderer_tests/combined_test.cpp
index 38c22aa3a..34fec7504 100644
--- a/tests/cpp_tests/svg_renderer_tests/combined_test.cpp
+++ b/tests/cpp_tests/svg_renderer_tests/combined_test.cpp
@@ -5,7 +5,7 @@
 
 // mapnik
 #include <mapnik/map.hpp>
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 #include <mapnik/color_factory.hpp>
 
 // std
diff --git a/tests/cpp_tests/svg_renderer_tests/compilation_test.cpp b/tests/cpp_tests/svg_renderer_tests/compilation_test.cpp
index 34723d3f3..e1356a4ab 100644
--- a/tests/cpp_tests/svg_renderer_tests/compilation_test.cpp
+++ b/tests/cpp_tests/svg_renderer_tests/compilation_test.cpp
@@ -5,7 +5,7 @@
 
 // mapnik
 #include <mapnik/map.hpp>
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 
 // std
 #include <sstream>
diff --git a/tests/cpp_tests/svg_renderer_tests/file_output_test.cpp b/tests/cpp_tests/svg_renderer_tests/file_output_test.cpp
index fb71a557b..8d468339e 100644
--- a/tests/cpp_tests/svg_renderer_tests/file_output_test.cpp
+++ b/tests/cpp_tests/svg_renderer_tests/file_output_test.cpp
@@ -14,7 +14,7 @@
 
 // mapnik
 #include <mapnik/map.hpp>
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 #include <mapnik/color_factory.hpp>
 
 // stl
diff --git a/tests/cpp_tests/svg_renderer_tests/path_element_test.cpp b/tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
index 14089fa59..126d2e7a6 100644
--- a/tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
+++ b/tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
@@ -11,7 +11,7 @@
 
 // mapnik
 #include <mapnik/map.hpp>
-#include <mapnik/svg_renderer.hpp>
+#include <mapnik/svg/output/svg_renderer.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/font_engine_freetype.hpp>
 #include <mapnik/expression.hpp>
diff --git a/utils/svg2png/svg2png.cpp b/utils/svg2png/svg2png.cpp
index 83a4b695e..790e9d475 100644
--- a/utils/svg2png/svg2png.cpp
+++ b/utils/svg2png/svg2png.cpp
@@ -32,7 +32,7 @@
 #include <mapnik/image_util.hpp>
 #include <mapnik/graphics.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
-#include <mapnik/svg/svg_renderer.hpp>
+#include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
 
 #include <boost/algorithm/string.hpp>
@@ -170,7 +170,7 @@ int main (int argc,char** argv)
 
             mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage((*marker.get_vector_data())->source());
             mapnik::svg::svg_path_adapter svg_path(stl_storage);
-            mapnik::svg::svg_renderer<mapnik::svg::svg_path_adapter,
+            mapnik::svg::svg_renderer_agg<mapnik::svg::svg_path_adapter,
                 agg::pod_bvector<mapnik::svg::path_attributes>,
                 renderer_solid,
                 agg::pixfmt_rgba32_plain > svg_renderer_this(svg_path,