diff --git a/benchmark/test_polygon_clipping.cpp b/benchmark/test_polygon_clipping.cpp
index b189a0443..d65ec34e2 100644
--- a/benchmark/test_polygon_clipping.cpp
+++ b/benchmark/test_polygon_clipping.cpp
@@ -10,10 +10,10 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/vertex_adapters.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
-#include <mapnik/geometry_envelope.hpp>
-#include <mapnik/geometry_correct.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
+#include <mapnik/geometry/envelope.hpp>
+#include <mapnik/geometry/correct.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/color.hpp>
 // boost geometry
diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index 1300d3220..5e09ebb3c 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -29,7 +29,7 @@
 #include <mapnik/value.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 //
 #include <mapnik/feature_kv_iterator.hpp>
 #include <mapnik/util/noncopyable.hpp>
diff --git a/include/mapnik/geom_util.hpp b/include/mapnik/geom_util.hpp
index 7dbe51ff4..e08c519f2 100644
--- a/include/mapnik/geom_util.hpp
+++ b/include/mapnik/geom_util.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/vertex.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 // stl
 #include <cmath>
 #include <vector>
diff --git a/include/mapnik/geometry_adapters.hpp b/include/mapnik/geometry/boost_adapters.hpp
similarity index 100%
rename from include/mapnik/geometry_adapters.hpp
rename to include/mapnik/geometry/boost_adapters.hpp
diff --git a/include/mapnik/geometry_centroid.hpp b/include/mapnik/geometry/centroid.hpp
similarity index 96%
rename from include/mapnik/geometry_centroid.hpp
rename to include/mapnik/geometry/centroid.hpp
index 590ba4898..2fe458edd 100644
--- a/include/mapnik/geometry_centroid.hpp
+++ b/include/mapnik/geometry/centroid.hpp
@@ -24,10 +24,10 @@
 #define MAPNIK_GEOMETRY_CENTROID_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <boost/geometry/algorithms/centroid.hpp>
-#include <mapnik/geometry_is_empty.hpp>
-#include <mapnik/geometry_remove_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/geometry/remove_empty.hpp>
 
 namespace mapnik { namespace geometry {
 
diff --git a/include/mapnik/geometry_correct.hpp b/include/mapnik/geometry/correct.hpp
similarity index 98%
rename from include/mapnik/geometry_correct.hpp
rename to include/mapnik/geometry/correct.hpp
index dc83ad3a2..40379bd22 100644
--- a/include/mapnik/geometry_correct.hpp
+++ b/include/mapnik/geometry/correct.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_CORRECT_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/variant.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/geometry_envelope.hpp b/include/mapnik/geometry/envelope.hpp
similarity index 100%
rename from include/mapnik/geometry_envelope.hpp
rename to include/mapnik/geometry/envelope.hpp
diff --git a/include/mapnik/geometry_envelope_impl.hpp b/include/mapnik/geometry/envelope_impl.hpp
similarity index 99%
rename from include/mapnik/geometry_envelope_impl.hpp
rename to include/mapnik/geometry/envelope_impl.hpp
index 2ebddb9d9..542936314 100644
--- a/include/mapnik/geometry_envelope_impl.hpp
+++ b/include/mapnik/geometry/envelope_impl.hpp
@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/box2d.hpp>
 
diff --git a/include/mapnik/geometry_fusion_adapted.hpp b/include/mapnik/geometry/fusion_adapted.hpp
similarity index 100%
rename from include/mapnik/geometry_fusion_adapted.hpp
rename to include/mapnik/geometry/fusion_adapted.hpp
diff --git a/include/mapnik/geometry_type.hpp b/include/mapnik/geometry/geometry_type.hpp
similarity index 98%
rename from include/mapnik/geometry_type.hpp
rename to include/mapnik/geometry/geometry_type.hpp
index b052446cd..006394f1e 100644
--- a/include/mapnik/geometry_type.hpp
+++ b/include/mapnik/geometry/geometry_type.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 
 namespace mapnik { namespace geometry { namespace detail {
 
diff --git a/include/mapnik/geometry_types.hpp b/include/mapnik/geometry/geometry_types.hpp
similarity index 100%
rename from include/mapnik/geometry_types.hpp
rename to include/mapnik/geometry/geometry_types.hpp
diff --git a/include/mapnik/geometry_is_empty.hpp b/include/mapnik/geometry/is_empty.hpp
similarity index 100%
rename from include/mapnik/geometry_is_empty.hpp
rename to include/mapnik/geometry/is_empty.hpp
diff --git a/include/mapnik/geometry_is_simple.hpp b/include/mapnik/geometry/is_simple.hpp
similarity index 98%
rename from include/mapnik/geometry_is_simple.hpp
rename to include/mapnik/geometry/is_simple.hpp
index 868b41afd..64da5ac05 100644
--- a/include/mapnik/geometry_is_simple.hpp
+++ b/include/mapnik/geometry/is_simple.hpp
@@ -29,7 +29,7 @@
 #if BOOST_VERSION >= 105600
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <boost/geometry/algorithms/is_simple.hpp>
 
 namespace mapnik { namespace geometry {
diff --git a/include/mapnik/geometry_is_valid.hpp b/include/mapnik/geometry/is_valid.hpp
similarity index 97%
rename from include/mapnik/geometry_is_valid.hpp
rename to include/mapnik/geometry/is_valid.hpp
index 95319cce9..ecdc2e16f 100644
--- a/include/mapnik/geometry_is_valid.hpp
+++ b/include/mapnik/geometry/is_valid.hpp
@@ -29,7 +29,7 @@
 #if BOOST_VERSION >= 105800
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <boost/geometry/algorithms/is_valid.hpp>
 #include <boost/geometry/algorithms/validity_failure_type.hpp>
 
@@ -102,7 +102,7 @@ struct geometry_is_valid
 struct geometry_is_valid_reason
 {
     using result_type = bool;
-    
+
     boost::geometry::validity_failure_type & failure_;
 
     geometry_is_valid_reason(boost::geometry::validity_failure_type & failure):
@@ -170,7 +170,7 @@ struct geometry_is_valid_reason
 struct geometry_is_valid_string
 {
     using result_type = bool;
-    
+
     std::string & message_;
 
     geometry_is_valid_string(std::string & message):
@@ -257,7 +257,7 @@ inline bool is_valid(T const& geom, boost::geometry::validity_failure_type & fai
 }
 
 template <typename T>
-inline bool is_valid(mapnik::geometry::geometry<T> const& geom, 
+inline bool is_valid(mapnik::geometry::geometry<T> const& geom,
                      boost::geometry::validity_failure_type & failure)
 {
     return util::apply_visitor(detail::geometry_is_valid_reason(failure), geom);
@@ -270,7 +270,7 @@ inline bool is_valid(T const& geom, std::string & message)
 }
 
 template <typename T>
-inline bool is_valid(mapnik::geometry::geometry<T> const& geom, 
+inline bool is_valid(mapnik::geometry::geometry<T> const& geom,
                      std::string & message)
 {
     return util::apply_visitor(detail::geometry_is_valid_string(message), geom);
diff --git a/include/mapnik/geometry_remove_empty.hpp b/include/mapnik/geometry/remove_empty.hpp
similarity index 98%
rename from include/mapnik/geometry_remove_empty.hpp
rename to include/mapnik/geometry/remove_empty.hpp
index 9838b5a61..7b820213a 100644
--- a/include/mapnik/geometry_remove_empty.hpp
+++ b/include/mapnik/geometry/remove_empty.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_REMOVE_EMPTY_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 
 namespace mapnik { namespace geometry {
 
diff --git a/include/mapnik/geometry_reprojection.hpp b/include/mapnik/geometry/reprojection.hpp
similarity index 100%
rename from include/mapnik/geometry_reprojection.hpp
rename to include/mapnik/geometry/reprojection.hpp
diff --git a/include/mapnik/geometry_reprojection_impl.hpp b/include/mapnik/geometry/reprojection_impl.hpp
similarity index 99%
rename from include/mapnik/geometry_reprojection_impl.hpp
rename to include/mapnik/geometry/reprojection_impl.hpp
index ff01bd451..1cc46fa1e 100644
--- a/include/mapnik/geometry_reprojection_impl.hpp
+++ b/include/mapnik/geometry/reprojection_impl.hpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/geometry_reprojection.hpp>
+#include <mapnik/geometry/reprojection.hpp>
 #include <mapnik/geometry.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/geometry_strategy.hpp b/include/mapnik/geometry/strategy.hpp
similarity index 97%
rename from include/mapnik/geometry_strategy.hpp
rename to include/mapnik/geometry/strategy.hpp
index cc4121e60..5e55512d5 100644
--- a/include/mapnik/geometry_strategy.hpp
+++ b/include/mapnik/geometry/strategy.hpp
@@ -23,20 +23,20 @@
 #ifndef MAPNIK_GEOMETRY_STRATEGY_HPP
 #define MAPNIK_GEOMETRY_STRATEGY_HPP
 
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/rounding_cast.hpp>
 
-namespace mapnik { 
+namespace mapnik {
 namespace geometry {
 
 namespace helper
 {
     template <std::size_t... Ts>
     struct index {};
- 
+
     template <std::size_t N, std::size_t... Ts>
     struct gen_seq : gen_seq<N - 1, N - 1, Ts...> {};
- 
+
     template <std::size_t... Ts>
     struct gen_seq<0, Ts...> : index<Ts...> {};
 }
@@ -70,7 +70,7 @@ struct strategy_group
 
     template <typename P1, typename P2, typename T, typename ...Args>
     inline P2 execute(P1 const& p, bool & status, T const& strat, Args const& ... args) const
-    { 
+    {
         return execute<P1,P2>(strat.template execute<P1,P1>(p, status), status, args...);
     }
 
@@ -79,7 +79,7 @@ struct strategy_group
     {
         return strat.template execute<P1,P2>(p, status);
     }
-    
+
 private:
     std::tuple<Strategies const& ...> ops_;
 
@@ -87,7 +87,7 @@ private:
 
 
 // The difference between this strategy group and the previous is that the conversion from P1 to P2 happens
-// in the first strategy rather then the last strategy. 
+// in the first strategy rather then the last strategy.
 template <typename... Strategies>
 struct strategy_group_first
 {
@@ -116,13 +116,13 @@ struct strategy_group_first
 
     template <typename P1, typename P2, typename T, typename ...Args>
     inline P2 execute_first(P1 const& p, bool & status, T const& strat, Args const& ... args) const
-    { 
+    {
         return execute<P2>(strat.template execute<P1,P2>(p, status), status, args...);
     }
 
     template <typename P2, typename T, typename ...Args>
     inline P2 execute(P2 const& p, bool & status, T const& strat, Args const& ... args) const
-    { 
+    {
         return execute<P2>(strat.template execute<P2,P2>(p, status), status, args...);
     }
 
@@ -131,13 +131,13 @@ struct strategy_group_first
     {
         return strat.template execute<P2,P2>(p, status);
     }
-    
+
     template <typename P2>
     inline P2 execute(P2 const& p, bool & status) const
     {
         return p;
     }
-    
+
 private:
     std::tuple<Strategies const& ...> ops_;
 
@@ -151,7 +151,7 @@ struct scale_strategy
     template <typename P1, typename P2>
     inline bool apply(P1 const & p1, P2 & p2) const
     {
-        
+
         using p2_type = typename boost::geometry::coordinate_type<P2>::type;
         double x = (boost::geometry::get<0>(p1) * scale_) + offset_;
         double y = (boost::geometry::get<1>(p1) * scale_) + offset_;
@@ -159,7 +159,7 @@ struct scale_strategy
         boost::geometry::set<1>(p2, static_cast<p2_type>(y));
         return true;
     }
-    
+
     template <typename P1, typename P2>
     inline P2 execute(P1 const& p1, bool & status) const
     {
@@ -181,7 +181,7 @@ struct scale_rounding_strategy
     template <typename P1, typename P2>
     inline bool apply(P1 const & p1, P2 & p2) const
     {
-        
+
         using p2_type = typename boost::geometry::coordinate_type<P2>::type;
         double x = (boost::geometry::get<0>(p1) * scale_) + offset_;
         double y = (boost::geometry::get<1>(p1) * scale_) + offset_;
@@ -189,7 +189,7 @@ struct scale_rounding_strategy
         boost::geometry::set<1>(p2, static_cast<p2_type>(std::round(y)));
         return true;
     }
-    
+
     template <typename P1, typename P2>
     inline P2 execute(P1 const& p1, bool & status) const
     {
diff --git a/include/mapnik/geometry_transform.hpp b/include/mapnik/geometry/transform.hpp
similarity index 99%
rename from include/mapnik/geometry_transform.hpp
rename to include/mapnik/geometry/transform.hpp
index a7bb2f13d..cee47d9cf 100644
--- a/include/mapnik/geometry_transform.hpp
+++ b/include/mapnik/geometry/transform.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_TRANSFORM_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <boost/geometry/algorithms/transform.hpp>
 
 namespace mapnik { namespace geometry { namespace detail {
diff --git a/include/mapnik/json/extract_bounding_box_grammar_impl.hpp b/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
index bdc1b98b2..fb9868322 100644
--- a/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
+++ b/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/json/extract_bounding_box_grammar.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 // boost
 #include <boost/spirit/include/qi_omit.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
diff --git a/include/mapnik/json/geometry_generator_grammar.hpp b/include/mapnik/json/geometry_generator_grammar.hpp
index 0e314650b..018608849 100644
--- a/include/mapnik/json/geometry_generator_grammar.hpp
+++ b/include/mapnik/json/geometry_generator_grammar.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 // boost
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/json/geometry_generator_grammar_impl.hpp b/include/mapnik/json/geometry_generator_grammar_impl.hpp
index 87a60db70..c1e2b4fe8 100644
--- a/include/mapnik/json/geometry_generator_grammar_impl.hpp
+++ b/include/mapnik/json/geometry_generator_grammar_impl.hpp
@@ -23,8 +23,8 @@
 // mapnik
 #include <mapnik/json/geometry_generator_grammar.hpp>
 #include <mapnik/util/spirit_transform_attribute.hpp>
-#include <mapnik/geometry_types.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 
 // boost
 #pragma GCC diagnostic push
diff --git a/include/mapnik/json/geometry_grammar_impl.hpp b/include/mapnik/json/geometry_grammar_impl.hpp
index 171894c78..219d3689f 100644
--- a/include/mapnik/json/geometry_grammar_impl.hpp
+++ b/include/mapnik/json/geometry_grammar_impl.hpp
@@ -24,7 +24,7 @@
 #include <mapnik/config.hpp>
 #include <mapnik/json/error_handler.hpp>
 #include <mapnik/json/geometry_grammar.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 // boost
 #include <boost/spirit/include/phoenix_stl.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
diff --git a/include/mapnik/json/geometry_util.hpp b/include/mapnik/json/geometry_util.hpp
index cf538ae73..d26720e48 100644
--- a/include/mapnik/json/geometry_util.hpp
+++ b/include/mapnik/json/geometry_util.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_JSON_GEOMETRY_UTIL_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 #include <mapnik/json/positions.hpp>
 
 namespace mapnik { namespace json {
diff --git a/include/mapnik/json/positions_grammar_impl.hpp b/include/mapnik/json/positions_grammar_impl.hpp
index 65f2a93c0..32379ea2c 100644
--- a/include/mapnik/json/positions_grammar_impl.hpp
+++ b/include/mapnik/json/positions_grammar_impl.hpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/json/positions_grammar.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 // boost
 #include <boost/spirit/include/qi_omit.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
diff --git a/include/mapnik/json/topojson_utils.hpp b/include/mapnik/json/topojson_utils.hpp
index 40a2c91ff..557e09067 100644
--- a/include/mapnik/json/topojson_utils.hpp
+++ b/include/mapnik/json/topojson_utils.hpp
@@ -29,8 +29,8 @@
 #include <mapnik/json/topology.hpp>
 #include <mapnik/json/attribute_value_visitor.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/geometry_adapters.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 namespace mapnik { namespace topojson {
 
diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index 8ba3c6f4b..03d859c3e 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -25,8 +25,8 @@
 
 #include <mapnik/feature.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
-#include <mapnik/geometry_centroid.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
+#include <mapnik/geometry/centroid.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/marker.hpp> // for svg_storage_type
diff --git a/include/mapnik/markers_placements/interior.hpp b/include/mapnik/markers_placements/interior.hpp
index 6a2705e15..be3dd0f12 100644
--- a/include/mapnik/markers_placements/interior.hpp
+++ b/include/mapnik/markers_placements/interior.hpp
@@ -25,7 +25,7 @@
 
 #include <mapnik/markers_placements/point.hpp>
 #include <mapnik/geom_util.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 
 namespace mapnik {
 
diff --git a/include/mapnik/markers_placements/line.hpp b/include/mapnik/markers_placements/line.hpp
index bc99cc937..ea858aa0d 100644
--- a/include/mapnik/markers_placements/line.hpp
+++ b/include/mapnik/markers_placements/line.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/view_transform.hpp>
 #include <mapnik/vertex_cache.hpp>
 #include <mapnik/tolerance_iterator.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 
 namespace mapnik {
 
diff --git a/include/mapnik/markers_placements/point.hpp b/include/mapnik/markers_placements/point.hpp
index 6e2f1dafb..344797905 100644
--- a/include/mapnik/markers_placements/point.hpp
+++ b/include/mapnik/markers_placements/point.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_MARKERS_PLACEMENTS_POINT_HPP
 
 #include <mapnik/geom_util.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/markers_placements/basic.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/memory_featureset.hpp b/include/mapnik/memory_featureset.hpp
index cc5005b42..f4863268f 100644
--- a/include/mapnik/memory_featureset.hpp
+++ b/include/mapnik/memory_featureset.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 #include <mapnik/featureset.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/memory_datasource.hpp>
diff --git a/include/mapnik/renderer_common/process_point_symbolizer.hpp b/include/mapnik/renderer_common/process_point_symbolizer.hpp
index ef0863fd6..508f7a2ce 100644
--- a/include/mapnik/renderer_common/process_point_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_point_symbolizer.hpp
@@ -29,9 +29,9 @@
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/label_collision_detector.hpp>
-#include <mapnik/geometry_centroid.hpp>
-#include <mapnik/geometry_type.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/centroid.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/vertex_adapters.hpp>
 #include <mapnik/geom_util.hpp>
 
diff --git a/include/mapnik/svg/geometry_svg_generator_impl.hpp b/include/mapnik/svg/geometry_svg_generator_impl.hpp
index 57df89f96..cb94a7a28 100644
--- a/include/mapnik/svg/geometry_svg_generator_impl.hpp
+++ b/include/mapnik/svg/geometry_svg_generator_impl.hpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/svg/geometry_svg_generator.hpp>
 
 namespace mapnik { namespace svg {
diff --git a/include/mapnik/util/geometry_to_wkb.hpp b/include/mapnik/util/geometry_to_wkb.hpp
index bb9d05b34..a01509d16 100644
--- a/include/mapnik/util/geometry_to_wkb.hpp
+++ b/include/mapnik/util/geometry_to_wkb.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/make_unique.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 // stl
 #include <sstream>
diff --git a/include/mapnik/vertex_adapters.hpp b/include/mapnik/vertex_adapters.hpp
index 0c77d7550..5a4307ee0 100644
--- a/include/mapnik/vertex_adapters.hpp
+++ b/include/mapnik/vertex_adapters.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_VERTEX_ADAPTERS_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/vertex.hpp>
 
 namespace mapnik { namespace geometry {
diff --git a/include/mapnik/wkt/wkt_generator_grammar.hpp b/include/mapnik/wkt/wkt_generator_grammar.hpp
index f31fcc08e..c88f9cfd5 100644
--- a/include/mapnik/wkt/wkt_generator_grammar.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
index 8d950edd0..6cb015562 100644
--- a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
@@ -23,7 +23,7 @@
 // mapnik
 #include <mapnik/wkt/wkt_generator_grammar.hpp>
 #include <mapnik/util/spirit_transform_attribute.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/wkt/wkt_grammar_impl.hpp b/include/mapnik/wkt/wkt_grammar_impl.hpp
index d2444130a..a9ac43b1e 100644
--- a/include/mapnik/wkt/wkt_grammar_impl.hpp
+++ b/include/mapnik/wkt/wkt_grammar_impl.hpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include <mapnik/wkt/wkt_grammar.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/plugins/input/csv/csv_datasource.cpp b/plugins/input/csv/csv_datasource.cpp
index 322940528..17b9f3adb 100644
--- a/plugins/input/csv/csv_datasource.cpp
+++ b/plugins/input/csv/csv_datasource.cpp
@@ -38,7 +38,7 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/util/fs.hpp>
diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
index 217276f6a..62e9e760b 100644
--- a/plugins/input/csv/csv_utils.cpp
+++ b/plugins/input/csv/csv_utils.cpp
@@ -23,7 +23,7 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 #include <mapnik/wkt/wkt_factory.hpp>
 #include <mapnik/json/geometry_parser.hpp>
 #include <mapnik/util/conversions.hpp>
diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 60fd7b715..054b1e07b 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -49,7 +49,7 @@
 #include <mapnik/util/file_io.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/make_unique.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/json/feature_collection_grammar.hpp>
 #include <mapnik/json/extract_bounding_box_grammar_impl.hpp>
 #include <mapnik/util/fs.hpp>
diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index 4cd139899..2764c62af 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/json/feature_grammar.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/util/spatial_index.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 // stl
 #include <string>
 #include <vector>
diff --git a/plugins/input/geojson/geojson_memory_index_featureset.cpp b/plugins/input/geojson/geojson_memory_index_featureset.cpp
index 32b851373..78789a07a 100644
--- a/plugins/input/geojson/geojson_memory_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_memory_index_featureset.cpp
@@ -25,7 +25,7 @@
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/json/feature_grammar.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 // stl
 #include <string>
 #include <vector>
diff --git a/plugins/input/ogr/ogr_featureset.cpp b/plugins/input/ogr/ogr_featureset.cpp
index 267ebc017..c82a8431f 100644
--- a/plugins/input/ogr/ogr_featureset.cpp
+++ b/plugins/input/ogr/ogr_featureset.cpp
@@ -31,7 +31,7 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 // ogr
 #include "ogr_featureset.hpp"
diff --git a/plugins/input/ogr/ogr_index_featureset.cpp b/plugins/input/ogr/ogr_index_featureset.cpp
index 54b91f470..768e16e91 100644
--- a/plugins/input/ogr/ogr_index_featureset.cpp
+++ b/plugins/input/ogr/ogr_index_featureset.cpp
@@ -30,7 +30,7 @@
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 // boost
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
diff --git a/plugins/input/shape/shape_io.cpp b/plugins/input/shape/shape_io.cpp
index 5dd591996..9ccfb91dd 100644
--- a/plugins/input/shape/shape_io.cpp
+++ b/plugins/input/shape/shape_io.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/make_unique.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/util/is_clockwise.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 using mapnik::datasource_exception;
 const std::string shape_io::SHP = ".shp";
diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp
index 28add6453..74b936668 100644
--- a/plugins/input/sqlite/sqlite_datasource.cpp
+++ b/plugins/input/sqlite/sqlite_datasource.cpp
@@ -34,7 +34,7 @@
 #include <mapnik/wkb.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/util/fs.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 
 // boost
 #include <boost/algorithm/string.hpp>
diff --git a/plugins/input/sqlite/sqlite_featureset.cpp b/plugins/input/sqlite/sqlite_featureset.cpp
index 99a44db54..fc5af1d09 100644
--- a/plugins/input/sqlite/sqlite_featureset.cpp
+++ b/plugins/input/sqlite/sqlite_featureset.cpp
@@ -30,8 +30,8 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/geometry_is_empty.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 // ogr
 #include "sqlite_featureset.hpp"
diff --git a/plugins/input/sqlite/sqlite_utils.hpp b/plugins/input/sqlite/sqlite_utils.hpp
index 959e3f7c6..58091a42d 100644
--- a/plugins/input/sqlite/sqlite_utils.hpp
+++ b/plugins/input/sqlite/sqlite_utils.hpp
@@ -35,8 +35,8 @@
 #include <mapnik/params.hpp>
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/fs.hpp>
-#include <mapnik/geometry_is_empty.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp
index 67bae443b..6c557d1f6 100644
--- a/plugins/input/topojson/topojson_datasource.cpp
+++ b/plugins/input/topojson/topojson_datasource.cpp
@@ -33,7 +33,7 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/box2d.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/json/topojson_grammar.hpp>
 #include <mapnik/json/topojson_utils.hpp>
 #include <mapnik/util/variant.hpp>
diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index 9bace2539..e8435a0a0 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -31,7 +31,7 @@
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/renderer_common/clipping_extent.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
diff --git a/src/build.py b/src/build.py
index 6dd0f24a9..f4d444ee0 100644
--- a/src/build.py
+++ b/src/build.py
@@ -168,7 +168,8 @@ source = Split(
     datasource_cache.cpp
     datasource_cache_static.cpp
     debug.cpp
-    geometry_reprojection.cpp
+    geometry/reprojection.cpp
+    geometry/envelope.cpp
     expression_node.cpp
     expression_string.cpp
     expression.cpp
@@ -200,7 +201,6 @@ source = Split(
     palette.cpp
     marker_helpers.cpp
     transform_expression_grammar.cpp
-    geometry_envelope.cpp
     plugin.cpp
     rule.cpp
     save_map.cpp
diff --git a/src/cairo/process_line_symbolizer.cpp b/src/cairo/process_line_symbolizer.cpp
index ed64d5c01..d567ced88 100644
--- a/src/cairo/process_line_symbolizer.cpp
+++ b/src/cairo/process_line_symbolizer.cpp
@@ -29,7 +29,7 @@
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 namespace mapnik
 {
diff --git a/src/geometry_envelope.cpp b/src/geometry/envelope.cpp
similarity index 95%
rename from src/geometry_envelope.cpp
rename to src/geometry/envelope.cpp
index bb79f59ad..d9c4d7a93 100644
--- a/src/geometry_envelope.cpp
+++ b/src/geometry/envelope.cpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#include <mapnik/geometry_envelope.hpp>
-#include <mapnik/geometry_envelope_impl.hpp>
+#include <mapnik/geometry/envelope.hpp>
+#include <mapnik/geometry/envelope_impl.hpp>
 #include <mapnik/text/symbolizer_helpers.hpp>
 
 namespace mapnik { namespace geometry {
diff --git a/src/geometry_reprojection.cpp b/src/geometry/reprojection.cpp
similarity index 98%
rename from src/geometry_reprojection.cpp
rename to src/geometry/reprojection.cpp
index 7cd3ff08d..59cbd1ef5 100644
--- a/src/geometry_reprojection.cpp
+++ b/src/geometry/reprojection.cpp
@@ -21,8 +21,8 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/geometry_reprojection.hpp>
-#include <mapnik/geometry_reprojection_impl.hpp>
+#include <mapnik/geometry/reprojection.hpp>
+#include <mapnik/geometry/reprojection_impl.hpp>
 
 namespace mapnik {
 
diff --git a/src/grid/process_line_symbolizer.cpp b/src/grid/process_line_symbolizer.cpp
index b65dd8502..7bb126298 100644
--- a/src/grid/process_line_symbolizer.cpp
+++ b/src/grid/process_line_symbolizer.cpp
@@ -31,7 +31,7 @@
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
diff --git a/src/memory_datasource.cpp b/src/memory_datasource.cpp
index 1127f4b83..24238f382 100644
--- a/src/memory_datasource.cpp
+++ b/src/memory_datasource.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/memory_datasource.hpp>
 #include <mapnik/memory_featureset.hpp>
 #include <mapnik/boolean.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 // stl
 #include <algorithm>
@@ -95,7 +95,7 @@ void memory_datasource::push(feature_ptr feature)
             throw std::runtime_error("Can not add a raster feature to a memory datasource that contains vectors");
         }
     }
-    else 
+    else
     {
         if (!type_set_)
         {
diff --git a/src/renderer_common/render_markers_symbolizer.cpp b/src/renderer_common/render_markers_symbolizer.cpp
index 6706cb1cd..965ff45b4 100644
--- a/src/renderer_common/render_markers_symbolizer.cpp
+++ b/src/renderer_common/render_markers_symbolizer.cpp
@@ -25,7 +25,7 @@
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/marker_helpers.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 #include <mapnik/renderer_common/render_markers_symbolizer.hpp>
 #include <mapnik/symbolizer.hpp>
 
diff --git a/src/svg/output/process_symbolizers.cpp b/src/svg/output/process_symbolizers.cpp
index 6ff486f7f..cfd82f694 100644
--- a/src/svg/output/process_symbolizers.cpp
+++ b/src/svg/output/process_symbolizers.cpp
@@ -32,7 +32,7 @@
 #include <mapnik/svg/output/svg_output_attributes.hpp>
 #include <mapnik/symbolizer_dispatch.hpp>
 #include <mapnik/vertex_processor.hpp>
-#include <mapnik/geometry_transform.hpp>
+#include <mapnik/geometry/transform.hpp>
 #include <mapnik/geometry_to_path.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/safe_cast.hpp>
diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
index fe5568ad2..85c5876b6 100644
--- a/src/text/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -29,8 +29,8 @@
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
-#include <mapnik/geometry_centroid.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
+#include <mapnik/geometry/centroid.hpp>
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/parse_path.hpp>
diff --git a/src/twkb.cpp b/src/twkb.cpp
index f1928e5a6..bcb9dc07a 100644
--- a/src/twkb.cpp
+++ b/src/twkb.cpp
@@ -26,7 +26,7 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 #include <cmath>
 
 namespace mapnik { namespace detail {
diff --git a/src/vertex_adapters.cpp b/src/vertex_adapters.cpp
index e96a9e25e..446a61550 100644
--- a/src/vertex_adapters.cpp
+++ b/src/vertex_adapters.cpp
@@ -22,7 +22,7 @@
 
 #include <mapnik/vertex_adapters.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/vertex.hpp>
 
 namespace mapnik { namespace geometry {
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 94c1fccde..f2e1fce6e 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/wkb.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 namespace mapnik
 {
diff --git a/test/unit/datasource/csv.cpp b/test/unit/datasource/csv.cpp
index 6142185ca..18c337702 100644
--- a/test/unit/datasource/csv.cpp
+++ b/test/unit/datasource/csv.cpp
@@ -28,8 +28,8 @@
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/debug.hpp>
diff --git a/test/unit/datasource/ds_test_util.hpp b/test/unit/datasource/ds_test_util.hpp
index 46868d4e5..2a0d2ac90 100644
--- a/test/unit/datasource/ds_test_util.hpp
+++ b/test/unit/datasource/ds_test_util.hpp
@@ -29,8 +29,8 @@
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 namespace {
 
diff --git a/test/unit/datasource/geojson.cpp b/test/unit/datasource/geojson.cpp
index b03668436..d65977d93 100644
--- a/test/unit/datasource/geojson.cpp
+++ b/test/unit/datasource/geojson.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 #include <mapnik/util/fs.hpp>
 #include <cstdlib>
 
diff --git a/test/unit/datasource/postgis.cpp b/test/unit/datasource/postgis.cpp
index 95ee65851..219dcda8e 100644
--- a/test/unit/datasource/postgis.cpp
+++ b/test/unit/datasource/postgis.cpp
@@ -25,7 +25,7 @@
 
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 #include <mapnik/util/fs.hpp>
 
 /*
diff --git a/test/unit/geometry/centroid.cpp b/test/unit/geometry/centroid.cpp
index cdfbd6e4b..bd13ba9b8 100644
--- a/test/unit/geometry/centroid.cpp
+++ b/test/unit/geometry/centroid.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/geometry_centroid.hpp>
+#include <mapnik/geometry/centroid.hpp>
 
 TEST_CASE("geometry centroid") {
 
diff --git a/test/unit/geometry/geometry_envelope_test.cpp b/test/unit/geometry/geometry_envelope_test.cpp
index 75049820a..6c3d68048 100644
--- a/test/unit/geometry/geometry_envelope_test.cpp
+++ b/test/unit/geometry/geometry_envelope_test.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 namespace {
 
diff --git a/test/unit/geometry/geometry_hit_test.cpp b/test/unit/geometry/geometry_hit_test.cpp
index 3b21407f6..7208785d1 100644
--- a/test/unit/geometry/geometry_hit_test.cpp
+++ b/test/unit/geometry/geometry_hit_test.cpp
@@ -1,9 +1,8 @@
-
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>
 #include <mapnik/hit_test_filter.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 TEST_CASE("geometry ops") {
 
diff --git a/test/unit/geometry/geometry_is_simple.cpp b/test/unit/geometry/geometry_is_simple.cpp
index 55480585c..061bcd799 100644
--- a/test/unit/geometry/geometry_is_simple.cpp
+++ b/test/unit/geometry/geometry_is_simple.cpp
@@ -1,9 +1,8 @@
-
 #include "catch.hpp"
 
 #include <boost/version.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_is_simple.hpp>
+#include <mapnik/geometry/is_simple.hpp>
 
 TEST_CASE("geometry is_simple") {
 
@@ -53,7 +52,7 @@ SECTION("point Infinity") {
 
 SECTION("multi point") {
     mapnik::geometry::multi_point<double> mpt;
-    mpt.add_coord(0,0);    
+    mpt.add_coord(0,0);
     mpt.add_coord(1,1);
     CHECK( mapnik::geometry::is_simple(mpt) );
 }
@@ -65,7 +64,7 @@ SECTION("multi point empty") {
 
 SECTION("line_string") {
     mapnik::geometry::line_string<double> line;
-    line.add_coord(0,0);    
+    line.add_coord(0,0);
     line.add_coord(1,1);
     CHECK( mapnik::geometry::is_simple(line) );
 }
@@ -73,7 +72,7 @@ SECTION("line_string") {
 // This fails while is_valid will not fail!
 SECTION("line_string repeated points") {
     mapnik::geometry::line_string<double> line;
-    line.add_coord(0,0);    
+    line.add_coord(0,0);
     line.add_coord(1,1);
     line.add_coord(1,1);
     line.add_coord(2,2);
@@ -87,10 +86,10 @@ SECTION("line_string empty") {
 
 SECTION("multi_line_string") {
     mapnik::geometry::line_string<double> line1;
-    line1.add_coord(0,0);    
+    line1.add_coord(0,0);
     line1.add_coord(1,1);
     mapnik::geometry::line_string<double> line2;
-    line2.add_coord(0,1);    
+    line2.add_coord(0,1);
     line2.add_coord(1,2);
     mapnik::geometry::multi_line_string<double> lines;
     lines.emplace_back(line1);
@@ -113,7 +112,7 @@ SECTION("multi_line_string empty") {
 SECTION("polygon") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(0,1);
@@ -125,7 +124,7 @@ SECTION("polygon") {
 SECTION("polygon invalid winding order") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(0,1);
     ring.add_coord(1,1);
     ring.add_coord(1,0);
@@ -139,7 +138,7 @@ SECTION("polygon invalid winding order") {
 SECTION("polygon 2 repeated points") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(1,1);
@@ -153,7 +152,7 @@ SECTION("polygon 2 repeated points") {
 SECTION("polygon 3 repeated points") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(1,1);
@@ -181,7 +180,7 @@ SECTION("polygon that has empty exterior ring") {
 SECTION("polygon that has empty interior ring") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(0,1);
@@ -209,7 +208,7 @@ SECTION("polygon that has empty exterior ring") {
 SECTION("polygon that has empty interior ring") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(0,1);
@@ -226,7 +225,7 @@ SECTION("polygon that has empty interior ring") {
 SECTION("polygon with spike") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(2,2);
@@ -240,14 +239,14 @@ SECTION("polygon with spike") {
 SECTION("polygon with hole") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(3,0);
     ring.add_coord(3,3);
     ring.add_coord(0,3);
     ring.add_coord(0,0);
     poly.set_exterior_ring(std::move(ring));
     mapnik::geometry::linear_ring<double> hole;
-    hole.add_coord(1,1);    
+    hole.add_coord(1,1);
     hole.add_coord(1,2);
     hole.add_coord(2,2);
     hole.add_coord(2,1);
@@ -260,14 +259,14 @@ SECTION("polygon with hole") {
 SECTION("polygon with hole with invalid winding order") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(3,0);
     ring.add_coord(3,3);
     ring.add_coord(0,3);
     ring.add_coord(0,0);
     poly.set_exterior_ring(std::move(ring));
     mapnik::geometry::linear_ring<double> hole;
-    hole.add_coord(1,1);    
+    hole.add_coord(1,1);
     hole.add_coord(2,1);
     hole.add_coord(2,2);
     hole.add_coord(1,2);
@@ -280,7 +279,7 @@ SECTION("multi polygon") {
     mapnik::geometry::multi_polygon<double> mp;
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(0,1);
@@ -288,7 +287,7 @@ SECTION("multi polygon") {
     poly.set_exterior_ring(std::move(ring));
     mapnik::geometry::polygon<double> poly2;
     mapnik::geometry::linear_ring<double> ring2;
-    ring2.add_coord(0,0);    
+    ring2.add_coord(0,0);
     ring2.add_coord(-1,0);
     ring2.add_coord(-1,-1);
     ring2.add_coord(0,-1);
@@ -303,7 +302,7 @@ SECTION("multi polygon with hole") {
     mapnik::geometry::multi_polygon<double> mp;
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(3,0);
     ring.add_coord(3,3);
     ring.add_coord(0,3);
@@ -318,14 +317,14 @@ SECTION("multi polygon with hole") {
     poly.add_hole(std::move(hole));
     mapnik::geometry::polygon<double> poly2;
     mapnik::geometry::linear_ring<double> ring2;
-    ring2.add_coord(0,0);    
+    ring2.add_coord(0,0);
     ring2.add_coord(-3,0);
     ring2.add_coord(-3,-3);
     ring2.add_coord(0,-3);
     ring2.add_coord(0,0);
     poly2.set_exterior_ring(std::move(ring2));
     mapnik::geometry::linear_ring<double> hole2;
-    hole2.add_coord(-1,-1);    
+    hole2.add_coord(-1,-1);
     hole2.add_coord(-1,-2);
     hole2.add_coord(-2,-2);
     hole2.add_coord(-2,-1);
diff --git a/test/unit/geometry/geometry_is_valid.cpp b/test/unit/geometry/geometry_is_valid.cpp
index de1ee4c04..aa5f1ecaf 100644
--- a/test/unit/geometry/geometry_is_valid.cpp
+++ b/test/unit/geometry/geometry_is_valid.cpp
@@ -1,8 +1,7 @@
-
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_is_valid.hpp>
+#include <mapnik/geometry/is_valid.hpp>
 
 TEST_CASE("geometry is_valid") {
 
diff --git a/test/unit/geometry/geometry_reprojection.cpp b/test/unit/geometry/geometry_reprojection.cpp
index c8ec36243..764a190f2 100644
--- a/test/unit/geometry/geometry_reprojection.cpp
+++ b/test/unit/geometry/geometry_reprojection.cpp
@@ -1,4 +1,3 @@
-
 #include "catch.hpp"
 #include "geometry_equal.hpp"
 
@@ -6,7 +5,7 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/proj_transform.hpp>
-#include <mapnik/geometry_reprojection.hpp>
+#include <mapnik/geometry/reprojection.hpp>
 
 TEST_CASE("geometry reprojection") {
 
diff --git a/test/unit/geometry/geometry_strategy_test.cpp b/test/unit/geometry/geometry_strategy_test.cpp
index c08e828cb..c79a5e2d9 100644
--- a/test/unit/geometry/geometry_strategy_test.cpp
+++ b/test/unit/geometry/geometry_strategy_test.cpp
@@ -1,4 +1,3 @@
-
 #include "catch.hpp"
 #include "geometry_equal.hpp"
 
@@ -6,8 +5,8 @@
 #include <mapnik/projection.hpp>
 #include <mapnik/proj_transform.hpp>
 #include <mapnik/view_transform.hpp>
-#include <mapnik/geometry_transform.hpp>
-#include <mapnik/geometry_strategy.hpp>
+#include <mapnik/geometry/transform.hpp>
+#include <mapnik/geometry/strategy.hpp>
 #include <mapnik/proj_strategy.hpp>
 #include <mapnik/view_strategy.hpp>
 
diff --git a/test/unit/geometry/geometry_test_helper.cpp b/test/unit/geometry/geometry_test_helper.cpp
index 44bcce596..98c254b55 100644
--- a/test/unit/geometry/geometry_test_helper.cpp
+++ b/test/unit/geometry/geometry_test_helper.cpp
@@ -1,6 +1,6 @@
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope.hpp>
-#include <mapnik/geometry_envelope_impl.hpp>
+#include <mapnik/geometry/envelope.hpp>
+#include <mapnik/geometry/envelope_impl.hpp>
 
 
 namespace mapnik { namespace geometry {
diff --git a/test/unit/geometry/has_empty.cpp b/test/unit/geometry/has_empty.cpp
index b7fcab14e..671ffdea2 100644
--- a/test/unit/geometry/has_empty.cpp
+++ b/test/unit/geometry/has_empty.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 
 TEST_CASE("geometry has_empty") {
 
diff --git a/test/unit/geometry/is_empty.cpp b/test/unit/geometry/is_empty.cpp
index 949b2b285..28b290b39 100644
--- a/test/unit/geometry/is_empty.cpp
+++ b/test/unit/geometry/is_empty.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 
 TEST_CASE("geometry is_empty") {
 
diff --git a/test/unit/geometry/remove_empty.cpp b/test/unit/geometry/remove_empty.cpp
index 93881c854..c160182a6 100644
--- a/test/unit/geometry/remove_empty.cpp
+++ b/test/unit/geometry/remove_empty.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/geometry_remove_empty.hpp>
+#include <mapnik/geometry/remove_empty.hpp>
 
 TEST_CASE("geometry remove_empty") {
 
diff --git a/test/unit/serialization/wkb_formats_test.cpp b/test/unit/serialization/wkb_formats_test.cpp
index bc0c17198..d74c7ed63 100644
--- a/test/unit/serialization/wkb_formats_test.cpp
+++ b/test/unit/serialization/wkb_formats_test.cpp
@@ -2,9 +2,9 @@
 
 #include <iostream>
 #include <mapnik/wkb.hpp>
-#include <mapnik/geometry_is_valid.hpp>
-#include <mapnik/geometry_is_simple.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/is_valid.hpp>
+#include <mapnik/geometry/is_simple.hpp>
+#include <mapnik/geometry/correct.hpp>
 #include <boost/version.hpp>
 
 TEST_CASE("geometry formats") {
diff --git a/test/unit/serialization/wkb_test.cpp b/test/unit/serialization/wkb_test.cpp
index 8a617df26..7e25bf2a2 100644
--- a/test/unit/serialization/wkb_test.cpp
+++ b/test/unit/serialization/wkb_test.cpp
@@ -2,8 +2,8 @@
 // mapnik
 #include <mapnik/wkb.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/util/geometry_to_wkt.hpp>
 // bool
 #include <boost/version.hpp>
diff --git a/test/unit/vertex_adapter/vertex_adapter.cpp b/test/unit/vertex_adapter/vertex_adapter.cpp
index da3e815fa..487f6bbd9 100644
--- a/test/unit/vertex_adapter/vertex_adapter.cpp
+++ b/test/unit/vertex_adapter/vertex_adapter.cpp
@@ -1,8 +1,7 @@
-
 #include "catch.hpp"
 
 #include <mapnik/vertex_adapters.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 TEST_CASE("vertex_adapters") {
 
diff --git a/utils/mapnik-index/process_csv_file.cpp b/utils/mapnik-index/process_csv_file.cpp
index a0342cff5..79802392c 100644
--- a/utils/mapnik-index/process_csv_file.cpp
+++ b/utils/mapnik-index/process_csv_file.cpp
@@ -24,7 +24,7 @@
 #include "../../plugins/input/csv/csv_getline.hpp"
 #include "../../plugins/input/csv/csv_utils.hpp"
 #include <mapnik/datasource.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
diff --git a/utils/pgsql2sqlite/pgsql2sqlite.hpp b/utils/pgsql2sqlite/pgsql2sqlite.hpp
index 9de886732..8e702a2fa 100644
--- a/utils/pgsql2sqlite/pgsql2sqlite.hpp
+++ b/utils/pgsql2sqlite/pgsql2sqlite.hpp
@@ -29,8 +29,8 @@
 #include <mapnik/global.hpp>
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/conversions.hpp>
-#include <mapnik/geometry_is_empty.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 #include "connection_manager.hpp"
 #include "cursorresultset.hpp"
diff --git a/utils/shapeindex/shapeindex.cpp b/utils/shapeindex/shapeindex.cpp
index 9dcff1189..bc086fccf 100644
--- a/utils/shapeindex/shapeindex.cpp
+++ b/utils/shapeindex/shapeindex.cpp
@@ -20,13 +20,12 @@
  *
  *****************************************************************************/
 
-
 #include <iostream>
 #include <vector>
 #include <string>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/quad_tree.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 #include "shapefile.hpp"
 #include "shape_io.hpp"
 #include "shape_index_featureset.hpp"