diff --git a/include/boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp b/include/boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp
deleted file mode 100644
index 5fb829c52..000000000
--- a/include/boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_EXTENSIONS_GIS_GEOGRAPHIC_STRATEGIES_DMS_PARSER_HPP
-#define BOOST_GEOMETRY_EXTENSIONS_GIS_GEOGRAPHIC_STRATEGIES_DMS_PARSER_HPP
-
-// This file is totally revised from PROJ4 dmstor.c
-
-// PROJ4 is originally written by Gerald Evenden (then of the USGS)
-// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Geometry Library by Barend Gehrels (Geodan, Amsterdam)
-
-// Original copyright notice:
-
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-#include <string>
-
-#include <boost/static_assert.hpp>
-
-#if !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
-#include <boost/lexical_cast.hpp>
-#endif // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
-
-#include <boost/algorithm/string.hpp>
-
-#include <boost/geometry/core/cs.hpp>
-#include <boost/geometry/extensions/strategies/parse.hpp>
-
-#include <boost/geometry/util/math.hpp>
-
-namespace boost { namespace geometry
-{
-
-
-struct dms_result
-{
-    enum axis_selector {axis_lat = 1, axis_lon = 0};
-
-    private :
-        typedef double T;
-        T m_angle;
-        axis_selector m_axis;
-
-    public :
-
-        explicit dms_result(T const& v, axis_selector ax)
-            : m_angle(v)
-            , m_axis(ax)
-        {}
-
-        inline axis_selector axis() const { return m_axis; }
-
-        inline operator double() const { return m_angle; }
-
-        template <typename CH, typename TR>
-        inline friend std::basic_ostream<CH, TR>& operator<<(std::basic_ostream<CH, TR>& os,
-                        const dms_result& d)
-        {
-            os << d.m_angle;
-            return os;
-        }
-
-};
-
-
-namespace strategy
-{
-
-    template <bool as_radian = true
-            , char N = 'N', char E = 'E', char S = 'S', char W = 'W' // translatable
-            , char MIN = '\'', char SEC = '"' // other char's possible
-            , char D = 'D', char R = 'R' // degree sign might be small o
-            >
-    struct dms_parser
-    {
-
-
-        // Question from Barend: can we compile-time select that it is case-sensitive/case-insensitive?
-        // We have to change the switch then -> specializations
-
-        // For now: make it (compile-time) case sensitive
-        static const int diff = 'a' - 'A';
-#ifndef __GNUC__
-        BOOST_STATIC_ASSERT((diff > 0)); // make sure we've the right assumption. GCC does not accept this here.
-#endif
-        static const char n_alter = N <= 'Z' ? N + diff : N - diff;
-        static const char e_alter = E <= 'Z' ? E + diff : E - diff;
-        static const char s_alter = S <= 'Z' ? S + diff : S - diff;
-        static const char w_alter = W <= 'Z' ? W + diff : W - diff;
-
-        static const char r_alter = R <= 'Z' ? R + diff : R - diff;
-
-        // degree is normally D (proj4) but might be superscript o
-        // Note d_alter is not correct then, so map it to NULL now, guarded by the while
-        static const char d_alter =
-            ((D >= 'A' && D <= 'Z') || (D >= 'a' && D <= 'z')) ? (D <= 'Z' ? D + diff : D - diff) : '\0';
-
-
-        struct dms_value
-        {
-            double dms[3];
-            bool has_dms[3];
-
-            dms_value()
-            {
-                memset(this, 0, sizeof(dms_value));
-            }
-        };
-
-
-        template <size_t I>
-        static inline void assign_dms(dms_value& dms, std::string& value, bool& has_value)
-        {
-#if !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
-            dms.dms[I] = boost::lexical_cast<double>(value.c_str());
-#else // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
-            dms.dms[I] = std::atof(value.c_str());
-#endif // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
-            dms.has_dms[I] = true;
-            has_value = false;
-            value.clear();
-        }
-
-        static inline void process(dms_value& dms, std::string& value, bool& has_value)
-        {
-            if (has_value)
-            {
-                // Assign last one, sequentially
-                if (! dms.has_dms[0]) assign_dms<0>(dms, value, has_value);
-                else if (! dms.has_dms[1]) assign_dms<1>(dms, value, has_value);
-                else if (! dms.has_dms[2]) assign_dms<2>(dms, value, has_value);
-            }
-        }
-
-
-        dms_result operator()(const char* is) const
-        {
-            dms_value dms;
-            bool has_value = false;
-            std::string value;
-
-            double factor = 1.0; // + denotes N/E values, -1 denotes S/W values
-            dms_result::axis_selector axis = dms_result::axis_lon; // true denotes N/S values
-            bool in_radian = false; // true denotes values as "0.1R"
-
-            while(*is)
-            {
-                switch(*is)
-                {
-                    case '-' :
-                        if (! has_value && ! dms.has_dms[0])
-                        {
-                            factor = -factor;
-                        }
-                        break;
-                    case N :
-                    case n_alter :
-                        axis = dms_result::axis_lat;
-                        break;
-                    case S :
-                    case s_alter :
-                        axis = dms_result::axis_lat;
-                        factor = -factor;
-                        break;
-                    case E :
-                    case e_alter :
-                        axis = dms_result::axis_lon;
-                        break;
-                    case W :
-                    case w_alter :
-                        axis = dms_result::axis_lon;
-                        factor = -factor;
-                        break;
-                    case D :
-                    case d_alter :
-                        if (! dms.has_dms[0] && has_value)
-                        {
-                            assign_dms<0>(dms, value, has_value);
-                        }
-                        break;
-                    case R :
-                    case r_alter :
-                        if (! dms.has_dms[0] && has_value)
-                        {
-                            // specified value is in radian!
-                            in_radian = true;
-                            assign_dms<0>(dms, value, has_value);
-                        }
-                        break;
-                    case MIN:
-                        if (! dms.has_dms[1] && has_value)
-                        {
-                            assign_dms<1>(dms, value, has_value);
-                        }
-                        break;
-                    case SEC :
-                        if (! dms.has_dms[2] && has_value)
-                        {
-                            assign_dms<2>(dms, value, has_value);
-                        }
-                        break;
-                    case ' ' :
-                    case '\t' :
-                    case '\n' :
-                        process(dms, value, has_value);
-                        break;
-                    default :
-                        value += *is;
-                        has_value = true;
-                        break;
-                }
-                is++;
-            }
-
-            // Assign last one, if any
-            process(dms, value, has_value);
-
-            double const d2r = math::d2r<double>();
-            double const r2d = math::r2d<double>();
-
-            return dms_result(factor *
-                (in_radian && as_radian
-                        ? dms.dms[0]
-                : in_radian && ! as_radian
-                        ? dms.dms[0] * r2d
-                : ! in_radian && as_radian
-                        ? dms.dms[0] * d2r + dms.dms[1] * d2r / 60.0 + dms.dms[2] * d2r / 3600.0
-                        : dms.dms[0] + dms.dms[1] / 60.0 + dms.dms[2] / 3600.0)
-                , axis);
-        }
-    };
-
-}
-
-
-#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
-
-template <template<typename> class CoordinateSystem>
-struct strategy_parse<geographic_tag, CoordinateSystem<degree> >
-{
-    typedef strategy::dms_parser<false> type;
-};
-
-
-template <template<typename> class CoordinateSystem>
-struct strategy_parse<geographic_tag, CoordinateSystem<radian> >
-{
-    typedef strategy::dms_parser<true> type;
-};
-
-#endif
-
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_GEOGRAPHIC_STRATEGIES_DMS_PARSER_HPP
diff --git a/include/boost/geometry/extensions/gis/projections/factory.hpp b/include/boost/geometry/extensions/gis/projections/factory.hpp
deleted file mode 100644
index 8f5b53be9..000000000
--- a/include/boost/geometry/extensions/gis/projections/factory.hpp
+++ /dev/null
@@ -1,275 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
-
-// This file was modified by Oracle on 2017.
-// Modifications copyright (c) 2017, Oracle and/or its affiliates.
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
-
-#include <map>
-#include <string>
-
-#include <boost/shared_ptr.hpp>
-
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/parameters.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/aea.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/aeqd.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/airy.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/aitoff.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/august.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/bacon.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/bipc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/boggs.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/bonne.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/cass.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/cc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/cea.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/chamb.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/collg.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/crast.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/denoy.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/eck1.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/eck2.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/eck3.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/eck4.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/eck5.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/eqc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/eqdc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/etmerc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/fahey.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/fouc_s.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/gall.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/geocent.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/geos.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/gins8.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/gnom.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/goode.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/gstmerc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/hammer.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/hatano.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/healpix.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/krovak.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/igh.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/imw_p.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/isea.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/laea.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/labrd.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/lagrng.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/larr.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/lask.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/latlong.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/lcc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/lcca.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/loxim.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/lsat.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/merc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/mill.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/mod_ster.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/moll.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/natearth.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/nell.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/nell_h.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/nocol.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/nsper.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/nzmg.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/ob_tran.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/ocea.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/oea.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/omerc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/ortho.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/qsc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/poly.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/putp2.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/putp3.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/putp4p.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/putp5.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/putp6.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/robin.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/rouss.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/rpoly.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/sconics.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/somerc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/stere.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/sterea.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/sts.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/tcc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/tcea.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/tmerc.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/tpeqd.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/urm5.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/urmfps.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/vandg.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/vandg2.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/vandg4.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/wag2.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/wag3.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/wag7.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/wink1.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/wink2.hpp>
-
-namespace boost { namespace geometry { namespace projections
-{
-
-namespace detail
-{
-
-template <typename CT, typename Parameters>
-class factory : public detail::base_factory<CT, Parameters>
-{
-private:
-
-    typedef std::map
-        <
-            std::string,
-            boost::shared_ptr
-                <
-                    detail::factory_entry
-                        <
-                            CT,
-                            Parameters
-                        >
-                >
-        > prj_registry;
-    prj_registry m_registry;
-
-public:
-
-    factory()
-    {
-        detail::aea_init(*this);
-        detail::aeqd_init(*this);
-        detail::airy_init(*this);
-        detail::aitoff_init(*this);
-        detail::august_init(*this);
-        detail::bacon_init(*this);
-        detail::bipc_init(*this);
-        detail::boggs_init(*this);
-        detail::bonne_init(*this);
-        detail::cass_init(*this);
-        detail::cc_init(*this);
-        detail::cea_init(*this);
-        detail::chamb_init(*this);
-        detail::collg_init(*this);
-        detail::crast_init(*this);
-        detail::denoy_init(*this);
-        detail::eck1_init(*this);
-        detail::eck2_init(*this);
-        detail::eck3_init(*this);
-        detail::eck4_init(*this);
-        detail::eck5_init(*this);
-        detail::eqc_init(*this);
-        detail::eqdc_init(*this);
-        detail::etmerc_init(*this);
-        detail::fahey_init(*this);
-        detail::fouc_s_init(*this);
-        detail::gall_init(*this);
-        detail::geocent_init(*this);
-        detail::geos_init(*this);
-        detail::gins8_init(*this);
-        detail::gn_sinu_init(*this);
-        detail::gnom_init(*this);
-        detail::goode_init(*this);
-        detail::gstmerc_init(*this);
-        detail::hammer_init(*this);
-        detail::hatano_init(*this);
-        detail::healpix_init(*this);
-        detail::krovak_init(*this);
-        detail::igh_init(*this);
-        detail::imw_p_init(*this);
-        detail::isea_init(*this);
-        detail::labrd_init(*this);
-        detail::laea_init(*this);
-        detail::lagrng_init(*this);
-        detail::larr_init(*this);
-        detail::lask_init(*this);
-        detail::latlong_init(*this);
-        detail::lcc_init(*this);
-        detail::lcca_init(*this);
-        detail::loxim_init(*this);
-        detail::lsat_init(*this);
-        detail::mbtfpp_init(*this);
-        detail::mbtfpq_init(*this);
-        detail::mbt_fps_init(*this);
-        detail::merc_init(*this);
-        detail::mill_init(*this);
-        detail::mod_ster_init(*this);
-        detail::moll_init(*this);
-        detail::natearth_init(*this);
-        detail::nell_init(*this);
-        detail::nell_h_init(*this);
-        detail::nocol_init(*this);
-        detail::nsper_init(*this);
-        detail::nzmg_init(*this);
-        detail::ob_tran_init(*this);
-        detail::ocea_init(*this);
-        detail::oea_init(*this);
-        detail::omerc_init(*this);
-        detail::ortho_init(*this);
-        detail::qsc_init(*this);
-        detail::poly_init(*this);
-        detail::putp2_init(*this);
-        detail::putp3_init(*this);
-        detail::putp4p_init(*this);
-        detail::putp5_init(*this);
-        detail::putp6_init(*this);
-        detail::robin_init(*this);
-        detail::rouss_init(*this);
-        detail::rpoly_init(*this);
-        detail::sconics_init(*this);
-        detail::somerc_init(*this);
-        detail::stere_init(*this);
-        detail::sterea_init(*this);
-        detail::sts_init(*this);
-        detail::tcc_init(*this);
-        detail::tcea_init(*this);
-        detail::tmerc_init(*this);
-        detail::tpeqd_init(*this);
-        detail::urm5_init(*this);
-        detail::urmfps_init(*this);
-        detail::vandg_init(*this);
-        detail::vandg2_init(*this);
-        detail::vandg4_init(*this);
-        detail::wag2_init(*this);
-        detail::wag3_init(*this);
-        detail::wag7_init(*this);
-        detail::wink1_init(*this);
-        detail::wink2_init(*this);
-    }
-
-    virtual ~factory() {}
-
-    virtual void add_to_factory(std::string const& name,
-                    detail::factory_entry<CT, Parameters>* sub)
-    {
-        m_registry[name].reset(sub);
-    }
-
-    inline detail::base_v<CT, Parameters>* create_new(Parameters const& parameters) const
-    {
-        typename prj_registry::const_iterator it = m_registry.find(parameters.name);
-        if (it != m_registry.end())
-        {
-            return it->second->create_new(parameters);
-        }
-
-        return 0;
-    }
-};
-
-} // namespace detail
-
-}}} // namespace boost::geometry::projections
-
-#endif // BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
diff --git a/include/boost/geometry/extensions/gis/projections/new_projection.hpp b/include/boost/geometry/extensions/gis/projections/new_projection.hpp
deleted file mode 100644
index 3b594723a..000000000
--- a/include/boost/geometry/extensions/gis/projections/new_projection.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2012 Krzysztof Czainski
-// Copyright (c) 2012 Barend Gehrels, Amsterdam, the Netherlands.
-
-// This file was modified by Oracle on 2017.
-// Modifications copyright (c) 2017, Oracle and/or its affiliates.
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_PROJECTIONS_NEW_PROJECTION_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_NEW_PROJECTION_HPP
-
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/projection_point_type.hpp>
-
-namespace boost { namespace geometry { namespace projections
-{
-
-/*!
-\brief  Creates a type-erased projection
-\details  Creates using operator new a class derived from projection, that forwards method
-          calls to @p Proj.
-\ingroup projection
-\tparam Projection  Type of the concrete projection to be created.
-\tparam Parameters  projection parameters type
-\see  projection
-\see  factory
-*/
-
-//@{
-template <typename Projection, typename Parameters>
-inline base_v
-        <
-            typename detail::projection_point_type<Projection, geographic_tag>::type
-          , typename detail::projection_point_type<Projection, cartesian_tag>::type
-          , Parameters
-        >* new_projection(Parameters const& par)
-{
-    return new detail::base_v_fi
-        <
-            Projection
-            , typename detail::projection_point_type<Projection, geographic_tag>::type
-            , typename detail::projection_point_type<Projection, cartesian_tag>::type
-            , Parameters
-        >(par);
-}
-//@}
-
-}}} // boost::geometry::projections
-
-#endif // BOOST_GEOMETRY_PROJECTIONS_NEW_PROJECTION_HPP
diff --git a/include/boost/geometry/extensions/gis/projections/projection_point_type.hpp b/include/boost/geometry/extensions/gis/projections/projection_point_type.hpp
deleted file mode 100644
index 635b6f887..000000000
--- a/include/boost/geometry/extensions/gis/projections/projection_point_type.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2012 Krzysztof Czainski
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_PROJECTIONS_PROJECTION_POINT_TYPE_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_PROJECTION_POINT_TYPE_HPP
-
-namespace boost { namespace geometry { namespace projections
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-template <typename Projection, typename CoordinateSystemTag>
-struct projection_point_type
-{};
-
-template <typename Projection>
-struct projection_point_type<Projection, cartesian_tag>
-{
-    typedef typename Projection::cartesian_point_type type;
-};
-
-template <typename Projection>
-struct projection_point_type<Projection, geographic_tag>
-{
-    typedef typename Projection::geographic_point_type type;
-};
-
-} // detail
-#endif // DOXYGEN_NO_DETAIL
-
-}}} // boost::geometry::projection
-
-#endif // BOOST_GEOMETRY_PROJECTIONS_PROJECTION_POINT_TYPE_HPP
diff --git a/include/boost/geometry/extensions/strategies/parse.hpp b/include/boost/geometry/extensions/strategies/parse.hpp
deleted file mode 100644
index de0cdc2ab..000000000
--- a/include/boost/geometry/extensions/strategies/parse.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_STRATEGIES_EXTENSIONS_PARSE_HPP
-#define BOOST_GEOMETRY_STRATEGIES_EXTENSIONS_PARSE_HPP
-
-#include <boost/geometry/strategies/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-
-/*!
-    \brief Tagraits class binding a parsing strategy to a coordinate system
-    \ingroup parse
-    \tparam Tag tag of coordinate system of point-type
-    \tparam CoordinateSystem coordinate system
-*/
-template <typename Tag, typename CoordinateSystem>
-struct strategy_parse
-{
-    typedef strategy::not_implemented type;
-};
-
-
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_STRATEGIES_EXTENSIONS_PARSE_HPP
diff --git a/include/boost/geometry/extensions/gis/projections/ellps.hpp b/include/boost/geometry/srs/ellps.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/ellps.hpp
rename to include/boost/geometry/srs/ellps.hpp
index ec99a534a..6415198a7 100644
--- a/include/boost/geometry/extensions/gis/projections/ellps.hpp
+++ b/include/boost/geometry/srs/ellps.hpp
@@ -7,8 +7,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_GEOMETRY_PROJECTIONS_ELLPS_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_ELLPS_HPP
+#ifndef BOOST_GEOMETRY_SRS_ELLPS_HPP
+#define BOOST_GEOMETRY_SRS_ELLPS_HPP
 
 
 #include <boost/geometry/srs/sphere.hpp>
@@ -118,8 +118,9 @@ BOOST_GEOMETRY_PROJECTIONS_DETAIL_ELLPS_A_RF(WGS66, 6378145.0, 298.25)
 BOOST_GEOMETRY_PROJECTIONS_DETAIL_ELLPS_A_RF(WGS72, 6378135.0, 298.26)
 BOOST_GEOMETRY_PROJECTIONS_DETAIL_ELLPS_A_RF(WGS84, 6378137.0, 298.257223563)
 BOOST_GEOMETRY_PROJECTIONS_DETAIL_SPHER_R   (sphere, 6370997.0)
-BOOST_GEOMETRY_PROJECTIONS_DETAIL_SPHER_R   (WGS84_sphere, 6378137.0)
+
 
 }} // namespace boost::geometry
 
-#endif // BOOST_GEOMETRY_PROJECTIONS_ELLPS_HPP
+
+#endif // BOOST_GEOMETRY_SRS_ELLPS_HPP
diff --git a/include/boost/geometry/extensions/gis/projections/parameters.hpp b/include/boost/geometry/srs/parameters.hpp
similarity index 92%
rename from include/boost/geometry/extensions/gis/projections/parameters.hpp
rename to include/boost/geometry/srs/parameters.hpp
index d270d116c..2ba6fa1b0 100644
--- a/include/boost/geometry/extensions/gis/projections/parameters.hpp
+++ b/include/boost/geometry/srs/parameters.hpp
@@ -10,8 +10,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_GEOMETRY_PROJECTIONS_PARAMETERS_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_PARAMETERS_HPP
+#ifndef BOOST_GEOMETRY_SRS_PARAMETERS_HPP
+#define BOOST_GEOMETRY_SRS_PARAMETERS_HPP
 
 
 #include <string>
@@ -91,4 +91,5 @@ struct static_epsg
 
 
 }}} // namespace boost::geometry::srs
-#endif
+
+#endif // BOOST_GEOMETRY_SRS_PARAMETERS_HPP
diff --git a/include/boost/geometry/extensions/gis/projections/projection.hpp b/include/boost/geometry/srs/projection.hpp
similarity index 91%
rename from include/boost/geometry/extensions/gis/projections/projection.hpp
rename to include/boost/geometry/srs/projection.hpp
index bd741c921..1339da8ab 100644
--- a/include/boost/geometry/extensions/gis/projections/projection.hpp
+++ b/include/boost/geometry/srs/projection.hpp
@@ -10,8 +10,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_GEOMETRY_PROJECTIONS_PROJECTION_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_PROJECTION_HPP
+#ifndef BOOST_GEOMETRY_SRS_PROJECTION_HPP
+#define BOOST_GEOMETRY_SRS_PROJECTION_HPP
 
 
 #include <string>
@@ -20,15 +20,15 @@
 
 #include <boost/geometry/core/coordinate_dimension.hpp>
 
-#include <boost/geometry/extensions/gis/projections/ellps.hpp>
-#include <boost/geometry/extensions/gis/projections/epsg.hpp>
-#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
-#include <boost/geometry/extensions/gis/projections/exception.hpp>
-#include <boost/geometry/extensions/gis/projections/factory.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_init.hpp>
-#include <boost/geometry/extensions/gis/projections/parameters.hpp>
+#include <boost/geometry/srs/ellps.hpp>
+#include <boost/geometry/srs/parameters.hpp>
+#include <boost/geometry/srs/projections/epsg.hpp>
+#include <boost/geometry/srs/projections/epsg_traits.hpp>
+#include <boost/geometry/srs/projections/exception.hpp>
+#include <boost/geometry/srs/projections/factory.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/pj_init.hpp>
 
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/if.hpp>
@@ -99,6 +99,11 @@ inline bool inverse(Proj const& proj, XY const& xy, LL& ll)
 }} // namespace projections::detail
 #endif // DOXYGEN_NO_DETAIL
 
+
+namespace srs
+{
+
+
 /*!
     \brief Representation of projection
     \details Either dynamic or static projection representation
@@ -266,8 +271,11 @@ private:
     projection_type m_proj;
 };
 
+
+} // namespace srs
+
+
 }} // namespace boost::geometry
 
 
-#endif
-
+#endif // BOOST_GEOMETRY_SRS_PROJECTION_HPP
diff --git a/include/boost/geometry/extensions/gis/projections/epsg.hpp b/include/boost/geometry/srs/projections/epsg.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/epsg.hpp
rename to include/boost/geometry/srs/projections/epsg.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/epsg_traits.hpp b/include/boost/geometry/srs/projections/epsg_traits.hpp
similarity index 99%
rename from include/boost/geometry/extensions/gis/projections/epsg_traits.hpp
rename to include/boost/geometry/srs/projections/epsg_traits.hpp
index e9fa36463..2e0c60053 100644
--- a/include/boost/geometry/extensions/gis/projections/epsg_traits.hpp
+++ b/include/boost/geometry/srs/projections/epsg_traits.hpp
@@ -16,8 +16,8 @@
 
 #include <boost/geometry/core/tags.hpp>
 
-#include <boost/geometry/extensions/gis/projections/factory.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/factory.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
 
 
 namespace boost { namespace geometry { namespace projections
diff --git a/include/boost/geometry/extensions/gis/projections/exception.hpp b/include/boost/geometry/srs/projections/exception.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/exception.hpp
rename to include/boost/geometry/srs/projections/exception.hpp
diff --git a/include/boost/geometry/srs/projections/factory.hpp b/include/boost/geometry/srs/projections/factory.hpp
new file mode 100644
index 000000000..067cbe1f1
--- /dev/null
+++ b/include/boost/geometry/srs/projections/factory.hpp
@@ -0,0 +1,274 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
+
+#include <map>
+#include <string>
+
+#include <boost/shared_ptr.hpp>
+
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/proj/aea.hpp>
+#include <boost/geometry/srs/projections/proj/aeqd.hpp>
+#include <boost/geometry/srs/projections/proj/airy.hpp>
+#include <boost/geometry/srs/projections/proj/aitoff.hpp>
+#include <boost/geometry/srs/projections/proj/august.hpp>
+#include <boost/geometry/srs/projections/proj/bacon.hpp>
+#include <boost/geometry/srs/projections/proj/bipc.hpp>
+#include <boost/geometry/srs/projections/proj/boggs.hpp>
+#include <boost/geometry/srs/projections/proj/bonne.hpp>
+#include <boost/geometry/srs/projections/proj/cass.hpp>
+#include <boost/geometry/srs/projections/proj/cc.hpp>
+#include <boost/geometry/srs/projections/proj/cea.hpp>
+#include <boost/geometry/srs/projections/proj/chamb.hpp>
+#include <boost/geometry/srs/projections/proj/collg.hpp>
+#include <boost/geometry/srs/projections/proj/crast.hpp>
+#include <boost/geometry/srs/projections/proj/denoy.hpp>
+#include <boost/geometry/srs/projections/proj/eck1.hpp>
+#include <boost/geometry/srs/projections/proj/eck2.hpp>
+#include <boost/geometry/srs/projections/proj/eck3.hpp>
+#include <boost/geometry/srs/projections/proj/eck4.hpp>
+#include <boost/geometry/srs/projections/proj/eck5.hpp>
+#include <boost/geometry/srs/projections/proj/eqc.hpp>
+#include <boost/geometry/srs/projections/proj/eqdc.hpp>
+#include <boost/geometry/srs/projections/proj/etmerc.hpp>
+#include <boost/geometry/srs/projections/proj/fahey.hpp>
+#include <boost/geometry/srs/projections/proj/fouc_s.hpp>
+#include <boost/geometry/srs/projections/proj/gall.hpp>
+#include <boost/geometry/srs/projections/proj/geocent.hpp>
+#include <boost/geometry/srs/projections/proj/geos.hpp>
+#include <boost/geometry/srs/projections/proj/gins8.hpp>
+#include <boost/geometry/srs/projections/proj/gn_sinu.hpp>
+#include <boost/geometry/srs/projections/proj/gnom.hpp>
+#include <boost/geometry/srs/projections/proj/goode.hpp>
+#include <boost/geometry/srs/projections/proj/gstmerc.hpp>
+#include <boost/geometry/srs/projections/proj/hammer.hpp>
+#include <boost/geometry/srs/projections/proj/hatano.hpp>
+#include <boost/geometry/srs/projections/proj/healpix.hpp>
+#include <boost/geometry/srs/projections/proj/krovak.hpp>
+#include <boost/geometry/srs/projections/proj/igh.hpp>
+#include <boost/geometry/srs/projections/proj/imw_p.hpp>
+#include <boost/geometry/srs/projections/proj/isea.hpp>
+#include <boost/geometry/srs/projections/proj/laea.hpp>
+#include <boost/geometry/srs/projections/proj/labrd.hpp>
+#include <boost/geometry/srs/projections/proj/lagrng.hpp>
+#include <boost/geometry/srs/projections/proj/larr.hpp>
+#include <boost/geometry/srs/projections/proj/lask.hpp>
+#include <boost/geometry/srs/projections/proj/latlong.hpp>
+#include <boost/geometry/srs/projections/proj/lcc.hpp>
+#include <boost/geometry/srs/projections/proj/lcca.hpp>
+#include <boost/geometry/srs/projections/proj/loxim.hpp>
+#include <boost/geometry/srs/projections/proj/lsat.hpp>
+#include <boost/geometry/srs/projections/proj/mbtfpp.hpp>
+#include <boost/geometry/srs/projections/proj/mbtfpq.hpp>
+#include <boost/geometry/srs/projections/proj/mbt_fps.hpp>
+#include <boost/geometry/srs/projections/proj/merc.hpp>
+#include <boost/geometry/srs/projections/proj/mill.hpp>
+#include <boost/geometry/srs/projections/proj/mod_ster.hpp>
+#include <boost/geometry/srs/projections/proj/moll.hpp>
+#include <boost/geometry/srs/projections/proj/natearth.hpp>
+#include <boost/geometry/srs/projections/proj/nell.hpp>
+#include <boost/geometry/srs/projections/proj/nell_h.hpp>
+#include <boost/geometry/srs/projections/proj/nocol.hpp>
+#include <boost/geometry/srs/projections/proj/nsper.hpp>
+#include <boost/geometry/srs/projections/proj/nzmg.hpp>
+#include <boost/geometry/srs/projections/proj/ob_tran.hpp>
+#include <boost/geometry/srs/projections/proj/ocea.hpp>
+#include <boost/geometry/srs/projections/proj/oea.hpp>
+#include <boost/geometry/srs/projections/proj/omerc.hpp>
+#include <boost/geometry/srs/projections/proj/ortho.hpp>
+#include <boost/geometry/srs/projections/proj/qsc.hpp>
+#include <boost/geometry/srs/projections/proj/poly.hpp>
+#include <boost/geometry/srs/projections/proj/putp2.hpp>
+#include <boost/geometry/srs/projections/proj/putp3.hpp>
+#include <boost/geometry/srs/projections/proj/putp4p.hpp>
+#include <boost/geometry/srs/projections/proj/putp5.hpp>
+#include <boost/geometry/srs/projections/proj/putp6.hpp>
+#include <boost/geometry/srs/projections/proj/robin.hpp>
+#include <boost/geometry/srs/projections/proj/rouss.hpp>
+#include <boost/geometry/srs/projections/proj/rpoly.hpp>
+#include <boost/geometry/srs/projections/proj/sconics.hpp>
+#include <boost/geometry/srs/projections/proj/somerc.hpp>
+#include <boost/geometry/srs/projections/proj/stere.hpp>
+#include <boost/geometry/srs/projections/proj/sterea.hpp>
+#include <boost/geometry/srs/projections/proj/sts.hpp>
+#include <boost/geometry/srs/projections/proj/tcc.hpp>
+#include <boost/geometry/srs/projections/proj/tcea.hpp>
+#include <boost/geometry/srs/projections/proj/tmerc.hpp>
+#include <boost/geometry/srs/projections/proj/tpeqd.hpp>
+#include <boost/geometry/srs/projections/proj/urm5.hpp>
+#include <boost/geometry/srs/projections/proj/urmfps.hpp>
+#include <boost/geometry/srs/projections/proj/vandg.hpp>
+#include <boost/geometry/srs/projections/proj/vandg2.hpp>
+#include <boost/geometry/srs/projections/proj/vandg4.hpp>
+#include <boost/geometry/srs/projections/proj/wag2.hpp>
+#include <boost/geometry/srs/projections/proj/wag3.hpp>
+#include <boost/geometry/srs/projections/proj/wag7.hpp>
+#include <boost/geometry/srs/projections/proj/wink1.hpp>
+#include <boost/geometry/srs/projections/proj/wink2.hpp>
+
+namespace boost { namespace geometry { namespace projections
+{
+
+namespace detail
+{
+
+template <typename CT, typename Parameters>
+class factory : public detail::base_factory<CT, Parameters>
+{
+private:
+
+    typedef std::map
+        <
+            std::string,
+            boost::shared_ptr
+                <
+                    detail::factory_entry
+                        <
+                            CT,
+                            Parameters
+                        >
+                >
+        > prj_registry;
+    prj_registry m_registry;
+
+public:
+
+    factory()
+    {
+        detail::aea_init(*this);
+        detail::aeqd_init(*this);
+        detail::airy_init(*this);
+        detail::aitoff_init(*this);
+        detail::august_init(*this);
+        detail::bacon_init(*this);
+        detail::bipc_init(*this);
+        detail::boggs_init(*this);
+        detail::bonne_init(*this);
+        detail::cass_init(*this);
+        detail::cc_init(*this);
+        detail::cea_init(*this);
+        detail::chamb_init(*this);
+        detail::collg_init(*this);
+        detail::crast_init(*this);
+        detail::denoy_init(*this);
+        detail::eck1_init(*this);
+        detail::eck2_init(*this);
+        detail::eck3_init(*this);
+        detail::eck4_init(*this);
+        detail::eck5_init(*this);
+        detail::eqc_init(*this);
+        detail::eqdc_init(*this);
+        detail::etmerc_init(*this);
+        detail::fahey_init(*this);
+        detail::fouc_s_init(*this);
+        detail::gall_init(*this);
+        detail::geocent_init(*this);
+        detail::geos_init(*this);
+        detail::gins8_init(*this);
+        detail::gn_sinu_init(*this);
+        detail::gnom_init(*this);
+        detail::goode_init(*this);
+        detail::gstmerc_init(*this);
+        detail::hammer_init(*this);
+        detail::hatano_init(*this);
+        detail::healpix_init(*this);
+        detail::krovak_init(*this);
+        detail::igh_init(*this);
+        detail::imw_p_init(*this);
+        detail::isea_init(*this);
+        detail::labrd_init(*this);
+        detail::laea_init(*this);
+        detail::lagrng_init(*this);
+        detail::larr_init(*this);
+        detail::lask_init(*this);
+        detail::latlong_init(*this);
+        detail::lcc_init(*this);
+        detail::lcca_init(*this);
+        detail::loxim_init(*this);
+        detail::lsat_init(*this);
+        detail::mbtfpp_init(*this);
+        detail::mbtfpq_init(*this);
+        detail::mbt_fps_init(*this);
+        detail::merc_init(*this);
+        detail::mill_init(*this);
+        detail::mod_ster_init(*this);
+        detail::moll_init(*this);
+        detail::natearth_init(*this);
+        detail::nell_init(*this);
+        detail::nell_h_init(*this);
+        detail::nocol_init(*this);
+        detail::nsper_init(*this);
+        detail::nzmg_init(*this);
+        detail::ob_tran_init(*this);
+        detail::ocea_init(*this);
+        detail::oea_init(*this);
+        detail::omerc_init(*this);
+        detail::ortho_init(*this);
+        detail::qsc_init(*this);
+        detail::poly_init(*this);
+        detail::putp2_init(*this);
+        detail::putp3_init(*this);
+        detail::putp4p_init(*this);
+        detail::putp5_init(*this);
+        detail::putp6_init(*this);
+        detail::robin_init(*this);
+        detail::rouss_init(*this);
+        detail::rpoly_init(*this);
+        detail::sconics_init(*this);
+        detail::somerc_init(*this);
+        detail::stere_init(*this);
+        detail::sterea_init(*this);
+        detail::sts_init(*this);
+        detail::tcc_init(*this);
+        detail::tcea_init(*this);
+        detail::tmerc_init(*this);
+        detail::tpeqd_init(*this);
+        detail::urm5_init(*this);
+        detail::urmfps_init(*this);
+        detail::vandg_init(*this);
+        detail::vandg2_init(*this);
+        detail::vandg4_init(*this);
+        detail::wag2_init(*this);
+        detail::wag3_init(*this);
+        detail::wag7_init(*this);
+        detail::wink1_init(*this);
+        detail::wink2_init(*this);
+    }
+
+    virtual ~factory() {}
+
+    virtual void add_to_factory(std::string const& name,
+                    detail::factory_entry<CT, Parameters>* sub)
+    {
+        m_registry[name].reset(sub);
+    }
+
+    inline detail::base_v<CT, Parameters>* create_new(Parameters const& parameters) const
+    {
+        typename prj_registry::const_iterator it = m_registry.find(parameters.name);
+        if (it != m_registry.end())
+        {
+            return it->second->create_new(parameters);
+        }
+
+        return 0;
+    }
+};
+
+} // namespace detail
+
+}}} // namespace boost::geometry::projections
+
+#endif // BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
diff --git a/include/boost/geometry/extensions/gis/projections/impl/aasincos.hpp b/include/boost/geometry/srs/projections/impl/aasincos.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/aasincos.hpp
rename to include/boost/geometry/srs/projections/impl/aasincos.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/adjlon.hpp b/include/boost/geometry/srs/projections/impl/adjlon.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/adjlon.hpp
rename to include/boost/geometry/srs/projections/impl/adjlon.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp b/include/boost/geometry/srs/projections/impl/base_dynamic.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp
rename to include/boost/geometry/srs/projections/impl/base_dynamic.hpp
index 386edde30..14f67967b 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp
+++ b/include/boost/geometry/srs/projections/impl/base_dynamic.hpp
@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
 
 namespace boost { namespace geometry { namespace projections
 {
diff --git a/include/boost/geometry/extensions/gis/projections/impl/base_static.hpp b/include/boost/geometry/srs/projections/impl/base_static.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/impl/base_static.hpp
rename to include/boost/geometry/srs/projections/impl/base_static.hpp
index dac284401..859a53e77 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/base_static.hpp
+++ b/include/boost/geometry/srs/projections/impl/base_static.hpp
@@ -23,8 +23,8 @@
 
 #include <boost/geometry/core/tags.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_inv.hpp>
+#include <boost/geometry/srs/projections/impl/pj_fwd.hpp>
+#include <boost/geometry/srs/projections/impl/pj_inv.hpp>
 
 #include <boost/mpl/assert.hpp>
 
diff --git a/include/boost/geometry/srs/projections/impl/dms_parser.hpp b/include/boost/geometry/srs/projections/impl/dms_parser.hpp
new file mode 100644
index 000000000..4ca0dd0ad
--- /dev/null
+++ b/include/boost/geometry/srs/projections/impl/dms_parser.hpp
@@ -0,0 +1,264 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_SRS_PROJECTIONS_IMPL_DMS_PARSER_HPP
+#define BOOST_GEOMETRY_SRS_PROJECTIONS_IMPL_DMS_PARSER_HPP
+
+// This file is totally revised from PROJ4 dmstor.c
+
+// PROJ4 is originally written by Gerald Evenden (then of the USGS)
+// PROJ4 is maintained by Frank Warmerdam
+// PROJ4 is converted to Geometry Library by Barend Gehrels (Geodan, Amsterdam)
+
+// Original copyright notice:
+
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+#include <string>
+
+#include <boost/static_assert.hpp>
+
+#if !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
+#include <boost/lexical_cast.hpp>
+#endif // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
+
+#include <boost/algorithm/string.hpp>
+
+#include <boost/geometry/core/cs.hpp>
+
+#include <boost/geometry/util/math.hpp>
+
+namespace boost { namespace geometry { namespace projections
+{
+
+namespace detail
+{
+
+struct dms_result
+{
+    enum axis_selector {axis_lat = 1, axis_lon = 0};
+
+    private :
+        typedef double T;
+        T m_angle;
+        axis_selector m_axis;
+
+    public :
+
+        explicit dms_result(T const& v, axis_selector ax)
+            : m_angle(v)
+            , m_axis(ax)
+        {}
+
+        inline axis_selector axis() const { return m_axis; }
+
+        inline operator double() const { return m_angle; }
+
+        template <typename CH, typename TR>
+        inline friend std::basic_ostream<CH, TR>& operator<<(std::basic_ostream<CH, TR>& os,
+                        const dms_result& d)
+        {
+            os << d.m_angle;
+            return os;
+        }
+
+};
+
+
+template <bool as_radian = true
+        , char N = 'N', char E = 'E', char S = 'S', char W = 'W' // translatable
+        , char MIN = '\'', char SEC = '"' // other char's possible
+        , char D = 'D', char R = 'R' // degree sign might be small o
+        >
+struct dms_parser
+{
+
+
+    // Question from Barend: can we compile-time select that it is case-sensitive/case-insensitive?
+    // We have to change the switch then -> specializations
+
+    // For now: make it (compile-time) case sensitive
+    static const int diff = 'a' - 'A';
+#ifndef __GNUC__
+    BOOST_STATIC_ASSERT((diff > 0)); // make sure we've the right assumption. GCC does not accept this here.
+#endif
+    static const char n_alter = N <= 'Z' ? N + diff : N - diff;
+    static const char e_alter = E <= 'Z' ? E + diff : E - diff;
+    static const char s_alter = S <= 'Z' ? S + diff : S - diff;
+    static const char w_alter = W <= 'Z' ? W + diff : W - diff;
+
+    static const char r_alter = R <= 'Z' ? R + diff : R - diff;
+
+    // degree is normally D (proj4) but might be superscript o
+    // Note d_alter is not correct then, so map it to NULL now, guarded by the while
+    static const char d_alter =
+        ((D >= 'A' && D <= 'Z') || (D >= 'a' && D <= 'z')) ? (D <= 'Z' ? D + diff : D - diff) : '\0';
+
+
+    struct dms_value
+    {
+        double dms[3];
+        bool has_dms[3];
+
+        dms_value()
+        {
+            memset(this, 0, sizeof(dms_value));
+        }
+    };
+
+
+    template <size_t I>
+    static inline void assign_dms(dms_value& dms, std::string& value, bool& has_value)
+    {
+#if !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
+        dms.dms[I] = boost::lexical_cast<double>(value.c_str());
+#else // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
+        dms.dms[I] = std::atof(value.c_str());
+#endif // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
+        dms.has_dms[I] = true;
+        has_value = false;
+        value.clear();
+    }
+
+    static inline void process(dms_value& dms, std::string& value, bool& has_value)
+    {
+        if (has_value)
+        {
+            // Assign last one, sequentially
+            if (! dms.has_dms[0]) assign_dms<0>(dms, value, has_value);
+            else if (! dms.has_dms[1]) assign_dms<1>(dms, value, has_value);
+            else if (! dms.has_dms[2]) assign_dms<2>(dms, value, has_value);
+        }
+    }
+
+
+    dms_result operator()(const char* is) const
+    {
+        dms_value dms;
+        bool has_value = false;
+        std::string value;
+
+        double factor = 1.0; // + denotes N/E values, -1 denotes S/W values
+        dms_result::axis_selector axis = dms_result::axis_lon; // true denotes N/S values
+        bool in_radian = false; // true denotes values as "0.1R"
+
+        while(*is)
+        {
+            switch(*is)
+            {
+                case '-' :
+                    if (! has_value && ! dms.has_dms[0])
+                    {
+                        factor = -factor;
+                    }
+                    break;
+                case N :
+                case n_alter :
+                    axis = dms_result::axis_lat;
+                    break;
+                case S :
+                case s_alter :
+                    axis = dms_result::axis_lat;
+                    factor = -factor;
+                    break;
+                case E :
+                case e_alter :
+                    axis = dms_result::axis_lon;
+                    break;
+                case W :
+                case w_alter :
+                    axis = dms_result::axis_lon;
+                    factor = -factor;
+                    break;
+                case D :
+                case d_alter :
+                    if (! dms.has_dms[0] && has_value)
+                    {
+                        assign_dms<0>(dms, value, has_value);
+                    }
+                    break;
+                case R :
+                case r_alter :
+                    if (! dms.has_dms[0] && has_value)
+                    {
+                        // specified value is in radian!
+                        in_radian = true;
+                        assign_dms<0>(dms, value, has_value);
+                    }
+                    break;
+                case MIN:
+                    if (! dms.has_dms[1] && has_value)
+                    {
+                        assign_dms<1>(dms, value, has_value);
+                    }
+                    break;
+                case SEC :
+                    if (! dms.has_dms[2] && has_value)
+                    {
+                        assign_dms<2>(dms, value, has_value);
+                    }
+                    break;
+                case ' ' :
+                case '\t' :
+                case '\n' :
+                    process(dms, value, has_value);
+                    break;
+                default :
+                    value += *is;
+                    has_value = true;
+                    break;
+            }
+            is++;
+        }
+
+        // Assign last one, if any
+        process(dms, value, has_value);
+
+        double const d2r = math::d2r<double>();
+        double const r2d = math::r2d<double>();
+
+        return dms_result(factor *
+            (in_radian && as_radian
+                    ? dms.dms[0]
+            : in_radian && ! as_radian
+                    ? dms.dms[0] * r2d
+            : ! in_radian && as_radian
+                    ? dms.dms[0] * d2r + dms.dms[1] * d2r / 60.0 + dms.dms[2] * d2r / 3600.0
+                    : dms.dms[0] + dms.dms[1] / 60.0 + dms.dms[2] / 3600.0)
+            , axis);
+    }
+};
+
+
+} // namespace detail
+
+
+}}} // namespace boost::geometry::projections
+
+
+#endif // BOOST_GEOMETRY_SRS_PROJECTIONS_IMPL_DMS_PARSER_HPP
diff --git a/include/boost/geometry/extensions/gis/projections/impl/factory_entry.hpp b/include/boost/geometry/srs/projections/impl/factory_entry.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/impl/factory_entry.hpp
rename to include/boost/geometry/srs/projections/impl/factory_entry.hpp
index 98c6511bd..7c587af5b 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/factory_entry.hpp
+++ b/include/boost/geometry/srs/projections/impl/factory_entry.hpp
@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
 
 namespace boost { namespace geometry { namespace projections
 {
diff --git a/include/boost/geometry/extensions/gis/projections/impl/function_overloads.hpp b/include/boost/geometry/srs/projections/impl/function_overloads.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/function_overloads.hpp
rename to include/boost/geometry/srs/projections/impl/function_overloads.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_auth.hpp b/include/boost/geometry/srs/projections/impl/pj_auth.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_auth.hpp
rename to include/boost/geometry/srs/projections/impl/pj_auth.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_datum_set.hpp b/include/boost/geometry/srs/projections/impl/pj_datum_set.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_datum_set.hpp
rename to include/boost/geometry/srs/projections/impl/pj_datum_set.hpp
index 66b56355a..5f8a589e9 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_datum_set.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_datum_set.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -35,14 +39,16 @@
 #ifndef BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_DATUM_SET_HPP
 #define BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_DATUM_SET_HPP
 
+
 #include <string>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/pj_datums.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_param.hpp>
-#include <boost/geometry/extensions/gis/projections/parameters.hpp>
+#include <boost/geometry/srs/parameters.hpp>
+#include <boost/geometry/srs/projections/impl/pj_datums.hpp>
+#include <boost/geometry/srs/projections/impl/pj_param.hpp>
+
 
 namespace boost { namespace geometry { namespace projections {
 
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_datums.hpp b/include/boost/geometry/srs/projections/impl/pj_datums.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_datums.hpp
rename to include/boost/geometry/srs/projections/impl/pj_datums.hpp
index 539b9d8bf..41834cd25 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_datums.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_datums.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +39,7 @@
 #ifndef BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_DATUMS_HPP
 #define BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_DATUMS_HPP
 
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
 
 namespace boost { namespace geometry { namespace projections {
 
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_ell_set.hpp b/include/boost/geometry/srs/projections/impl/pj_ell_set.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_ell_set.hpp
rename to include/boost/geometry/srs/projections/impl/pj_ell_set.hpp
index cd196bbe2..a7977886e 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_ell_set.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_ell_set.hpp
@@ -45,9 +45,9 @@
 #include <boost/geometry/formulas/eccentricity_sqr.hpp>
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/pj_ellps.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_param.hpp>
-#include <boost/geometry/extensions/gis/projections/parameters.hpp>
+#include <boost/geometry/srs/parameters.hpp>
+#include <boost/geometry/srs/projections/impl/pj_ellps.hpp>
+#include <boost/geometry/srs/projections/impl/pj_param.hpp>
 
 
 namespace boost { namespace geometry { namespace projections {
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_ellps.hpp b/include/boost/geometry/srs/projections/impl/pj_ellps.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_ellps.hpp
rename to include/boost/geometry/srs/projections/impl/pj_ellps.hpp
index 780db85a5..6047936ef 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_ellps.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_ellps.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +39,7 @@
 #ifndef BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_ELLPS_HPP
 #define BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_ELLPS_HPP
 
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
 
 namespace boost { namespace geometry { namespace projections {
 
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp b/include/boost/geometry/srs/projections/impl/pj_fwd.hpp
similarity index 91%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp
rename to include/boost/geometry/srs/projections/impl/pj_fwd.hpp
index 06562b5d4..633b8bc09 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_fwd.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -38,8 +42,8 @@
 #include <boost/geometry/core/radian_access.hpp>
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/adjlon.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/adjlon.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
 
 #include <boost/math/constants/constants.hpp>
 
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_gauss.hpp b/include/boost/geometry/srs/projections/impl/pj_gauss.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_gauss.hpp
rename to include/boost/geometry/srs/projections/impl/pj_gauss.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_init.hpp b/include/boost/geometry/srs/projections/impl/pj_init.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_init.hpp
rename to include/boost/geometry/srs/projections/impl/pj_init.hpp
index 1b9e790e8..7b1a70142 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_init.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_init.hpp
@@ -51,16 +51,14 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/condition.hpp>
 
-
-#include <boost/geometry/extensions/gis/projections/impl/pj_datum_set.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_datums.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_ell_set.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_param.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_units.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/parameters.hpp>
-
-#include <boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp>
+#include <boost/geometry/srs/parameters.hpp>
+#include <boost/geometry/srs/projections/impl/dms_parser.hpp>
+#include <boost/geometry/srs/projections/impl/pj_datum_set.hpp>
+#include <boost/geometry/srs/projections/impl/pj_datums.hpp>
+#include <boost/geometry/srs/projections/impl/pj_ell_set.hpp>
+#include <boost/geometry/srs/projections/impl/pj_param.hpp>
+#include <boost/geometry/srs/projections/impl/pj_units.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
 
 
 namespace boost { namespace geometry { namespace projections
@@ -289,7 +287,7 @@ inline parameters pj_init(BGParams const& bg_params, R const& arguments, bool us
         if (index == -1) { throw proj_exception(-7); }
         if (value.empty()) { throw proj_exception(-46); }
 
-        geometry::strategy::dms_parser<true> parser;
+        dms_parser<true> parser;
         pin.from_greenwich = parser(value.c_str());
     }
     else
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_inv.hpp b/include/boost/geometry/srs/projections/impl/pj_inv.hpp
similarity index 92%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_inv.hpp
rename to include/boost/geometry/srs/projections/impl/pj_inv.hpp
index dceabdf2b..3c7115018 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_inv.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_inv.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -37,7 +41,7 @@
 
 
 
-#include <boost/geometry/extensions/gis/projections/impl/adjlon.hpp>
+#include <boost/geometry/srs/projections/impl/adjlon.hpp>
 #include <boost/geometry/core/radian_access.hpp>
 #include <boost/geometry/util/math.hpp>
 
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp b/include/boost/geometry/srs/projections/impl/pj_mlfn.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp
rename to include/boost/geometry/srs/projections/impl/pj_mlfn.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp b/include/boost/geometry/srs/projections/impl/pj_msfn.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp
rename to include/boost/geometry/srs/projections/impl/pj_msfn.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_param.hpp b/include/boost/geometry/srs/projections/impl/pj_param.hpp
similarity index 93%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_param.hpp
rename to include/boost/geometry/srs/projections/impl/pj_param.hpp
index 8e49ba46a..90d48f08b 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_param.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_param.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -39,9 +43,8 @@
 #include <string>
 #include <vector>
 
-#include <boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp>
-
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/dms_parser.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
 
 
 namespace boost { namespace geometry { namespace projections {
@@ -116,7 +119,7 @@ inline pvalue pj_param(std::vector<pvalue> const& pl, std::string opt)
                 break;
             case 'r':    /* degrees input */
                 {
-                    geometry::strategy::dms_parser<true> parser;
+                    dms_parser<true> parser;
                     value.f = parser(it->s.c_str());
                 }
                 break;
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp b/include/boost/geometry/srs/projections/impl/pj_phi2.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp
rename to include/boost/geometry/srs/projections/impl/pj_phi2.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp b/include/boost/geometry/srs/projections/impl/pj_qsfn.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp
rename to include/boost/geometry/srs/projections/impl/pj_qsfn.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp b/include/boost/geometry/srs/projections/impl/pj_tsfn.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp
rename to include/boost/geometry/srs/projections/impl/pj_tsfn.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_units.hpp b/include/boost/geometry/srs/projections/impl/pj_units.hpp
similarity index 93%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_units.hpp
rename to include/boost/geometry/srs/projections/impl/pj_units.hpp
index 55f0252e7..269b8ff92 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_units.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_units.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +39,7 @@
 #ifndef BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_UNITS_HPP
 #define BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_UNITS_HPP
 
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
 
 namespace boost { namespace geometry { namespace projections {
 namespace detail {
diff --git a/include/boost/geometry/extensions/gis/projections/impl/pj_zpoly1.hpp b/include/boost/geometry/srs/projections/impl/pj_zpoly1.hpp
similarity index 93%
rename from include/boost/geometry/extensions/gis/projections/impl/pj_zpoly1.hpp
rename to include/boost/geometry/srs/projections/impl/pj_zpoly1.hpp
index af5708fd9..7910a0aa7 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/pj_zpoly1.hpp
+++ b/include/boost/geometry/srs/projections/impl/pj_zpoly1.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -36,7 +40,7 @@
 #define BOOST_GEOMETRY_PROJECTIONS_ZPOLY1_HPP
 
 
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
 
 
 namespace boost { namespace geometry { namespace projections { namespace detail {
diff --git a/include/boost/geometry/extensions/gis/projections/impl/proj_mdist.hpp b/include/boost/geometry/srs/projections/impl/proj_mdist.hpp
similarity index 100%
rename from include/boost/geometry/extensions/gis/projections/impl/proj_mdist.hpp
rename to include/boost/geometry/srs/projections/impl/proj_mdist.hpp
diff --git a/include/boost/geometry/extensions/gis/projections/impl/projects.hpp b/include/boost/geometry/srs/projections/impl/projects.hpp
similarity index 98%
rename from include/boost/geometry/extensions/gis/projections/impl/projects.hpp
rename to include/boost/geometry/srs/projections/impl/projects.hpp
index 6b34e2210..af58f62c7 100644
--- a/include/boost/geometry/extensions/gis/projections/impl/projects.hpp
+++ b/include/boost/geometry/srs/projections/impl/projects.hpp
@@ -44,7 +44,7 @@
 #include <string>
 #include <vector>
 
-#include <boost/geometry/extensions/gis/projections/exception.hpp>
+#include <boost/geometry/srs/projections/exception.hpp>
 #include <boost/math/constants/constants.hpp>
 
 
diff --git a/include/boost/geometry/extensions/gis/projections/proj/aea.hpp b/include/boost/geometry/srs/projections/proj/aea.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/aea.hpp
rename to include/boost/geometry/srs/projections/proj/aea.hpp
index 622cf420a..d2070efdd 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/aea.hpp
+++ b/include/boost/geometry/srs/projections/proj/aea.hpp
@@ -49,15 +49,15 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/pj_msfn.hpp>
+#include <boost/geometry/srs/projections/impl/pj_qsfn.hpp>
 
-#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
+#include <boost/geometry/srs/projections/epsg_traits.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/aeqd.hpp b/include/boost/geometry/srs/projections/proj/aeqd.hpp
similarity index 98%
rename from include/boost/geometry/extensions/gis/projections/proj/aeqd.hpp
rename to include/boost/geometry/srs/projections/proj/aeqd.hpp
index 0f7caba48..1ce1c38aa 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/aeqd.hpp
+++ b/include/boost/geometry/srs/projections/proj/aeqd.hpp
@@ -48,12 +48,12 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/airy.hpp b/include/boost/geometry/srs/projections/proj/airy.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/airy.hpp
rename to include/boost/geometry/srs/projections/proj/airy.hpp
index 5bd890ab6..374d6f4a8 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/airy.hpp
+++ b/include/boost/geometry/srs/projections/proj/airy.hpp
@@ -47,10 +47,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/aitoff.hpp b/include/boost/geometry/srs/projections/proj/aitoff.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/aitoff.hpp
rename to include/boost/geometry/srs/projections/proj/aitoff.hpp
index 84cc9ba9b..f690bed00 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/aitoff.hpp
+++ b/include/boost/geometry/srs/projections/proj/aitoff.hpp
@@ -49,10 +49,10 @@
 #include <boost/core/ignore_unused.hpp>
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/august.hpp b/include/boost/geometry/srs/projections/proj/august.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/august.hpp
rename to include/boost/geometry/srs/projections/proj/august.hpp
index f55b5d3fe..7ee229ebd 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/august.hpp
+++ b/include/boost/geometry/srs/projections/proj/august.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/bacon.hpp b/include/boost/geometry/srs/projections/proj/bacon.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/bacon.hpp
rename to include/boost/geometry/srs/projections/proj/bacon.hpp
index 81c741e1b..4220d6627 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/bacon.hpp
+++ b/include/boost/geometry/srs/projections/proj/bacon.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/bipc.hpp b/include/boost/geometry/srs/projections/proj/bipc.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/bipc.hpp
rename to include/boost/geometry/srs/projections/proj/bipc.hpp
index 9bd8c0f9e..60d89b59a 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/bipc.hpp
+++ b/include/boost/geometry/srs/projections/proj/bipc.hpp
@@ -44,10 +44,10 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/boggs.hpp b/include/boost/geometry/srs/projections/proj/boggs.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/boggs.hpp
rename to include/boost/geometry/srs/projections/proj/boggs.hpp
index f5b687750..e0419085e 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/boggs.hpp
+++ b/include/boost/geometry/srs/projections/proj/boggs.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/bonne.hpp b/include/boost/geometry/srs/projections/proj/bonne.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/bonne.hpp
rename to include/boost/geometry/srs/projections/proj/bonne.hpp
index 29d570756..9a2eb04ff 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/bonne.hpp
+++ b/include/boost/geometry/srs/projections/proj/bonne.hpp
@@ -44,11 +44,11 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/cass.hpp b/include/boost/geometry/srs/projections/proj/cass.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/cass.hpp
rename to include/boost/geometry/srs/projections/proj/cass.hpp
index bf9742e1c..cf703a55c 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/cass.hpp
+++ b/include/boost/geometry/srs/projections/proj/cass.hpp
@@ -41,13 +41,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
 
-#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
+#include <boost/geometry/srs/projections/epsg_traits.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/cc.hpp b/include/boost/geometry/srs/projections/proj/cc.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/cc.hpp
rename to include/boost/geometry/srs/projections/proj/cc.hpp
index bb2dd0ab2..386a15d9a 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/cc.hpp
+++ b/include/boost/geometry/srs/projections/proj/cc.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/cea.hpp b/include/boost/geometry/srs/projections/proj/cea.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/cea.hpp
rename to include/boost/geometry/srs/projections/proj/cea.hpp
index b2cb6ea9f..a20e59b9f 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/cea.hpp
+++ b/include/boost/geometry/srs/projections/proj/cea.hpp
@@ -43,12 +43,12 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_auth.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_auth.hpp>
+#include <boost/geometry/srs/projections/impl/pj_qsfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/chamb.hpp b/include/boost/geometry/srs/projections/proj/chamb.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/chamb.hpp
rename to include/boost/geometry/srs/projections/proj/chamb.hpp
index 377feec24..87640af70 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/chamb.hpp
+++ b/include/boost/geometry/srs/projections/proj/chamb.hpp
@@ -44,11 +44,11 @@
 #include <boost/geometry/util/math.hpp>
 #include <cstdio>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/collg.hpp b/include/boost/geometry/srs/projections/proj/collg.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/collg.hpp
rename to include/boost/geometry/srs/projections/proj/collg.hpp
index 110e0099b..d1dfa5c86 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/collg.hpp
+++ b/include/boost/geometry/srs/projections/proj/collg.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/crast.hpp b/include/boost/geometry/srs/projections/proj/crast.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/crast.hpp
rename to include/boost/geometry/srs/projections/proj/crast.hpp
index 2818a0831..3d43dffcb 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/crast.hpp
+++ b/include/boost/geometry/srs/projections/proj/crast.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/denoy.hpp b/include/boost/geometry/srs/projections/proj/denoy.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/denoy.hpp
rename to include/boost/geometry/srs/projections/proj/denoy.hpp
index 4bc7115e7..0a877f654 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/denoy.hpp
+++ b/include/boost/geometry/srs/projections/proj/denoy.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/eck1.hpp b/include/boost/geometry/srs/projections/proj/eck1.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/eck1.hpp
rename to include/boost/geometry/srs/projections/proj/eck1.hpp
index 152610df9..2170f0a47 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/eck1.hpp
+++ b/include/boost/geometry/srs/projections/proj/eck1.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/eck2.hpp b/include/boost/geometry/srs/projections/proj/eck2.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/eck2.hpp
rename to include/boost/geometry/srs/projections/proj/eck2.hpp
index a753a13b6..a2baa51c4 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/eck2.hpp
+++ b/include/boost/geometry/srs/projections/proj/eck2.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/eck3.hpp b/include/boost/geometry/srs/projections/proj/eck3.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/eck3.hpp
rename to include/boost/geometry/srs/projections/proj/eck3.hpp
index 89a23e16d..63f032a17 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/eck3.hpp
+++ b/include/boost/geometry/srs/projections/proj/eck3.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/core/ignore_unused.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/eck4.hpp b/include/boost/geometry/srs/projections/proj/eck4.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/eck4.hpp
rename to include/boost/geometry/srs/projections/proj/eck4.hpp
index 39178b79e..effd21505 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/eck4.hpp
+++ b/include/boost/geometry/srs/projections/proj/eck4.hpp
@@ -41,11 +41,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/eck5.hpp b/include/boost/geometry/srs/projections/proj/eck5.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/eck5.hpp
rename to include/boost/geometry/srs/projections/proj/eck5.hpp
index 5a1683fd6..94f751835 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/eck5.hpp
+++ b/include/boost/geometry/srs/projections/proj/eck5.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/eqc.hpp b/include/boost/geometry/srs/projections/proj/eqc.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/eqc.hpp
rename to include/boost/geometry/srs/projections/proj/eqc.hpp
index a835d1d9f..b7f6382a3 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/eqc.hpp
+++ b/include/boost/geometry/srs/projections/proj/eqc.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/eqdc.hpp b/include/boost/geometry/srs/projections/proj/eqdc.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/eqdc.hpp
rename to include/boost/geometry/srs/projections/proj/eqdc.hpp
index 4216dadec..816dc9430 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/eqdc.hpp
+++ b/include/boost/geometry/srs/projections/proj/eqdc.hpp
@@ -44,12 +44,12 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/pj_msfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/etmerc.hpp b/include/boost/geometry/srs/projections/proj/etmerc.hpp
similarity index 98%
rename from include/boost/geometry/extensions/gis/projections/proj/etmerc.hpp
rename to include/boost/geometry/srs/projections/proj/etmerc.hpp
index a4ff9266f..e0409c9c3 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/etmerc.hpp
+++ b/include/boost/geometry/srs/projections/proj/etmerc.hpp
@@ -45,10 +45,10 @@
 
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/fahey.hpp b/include/boost/geometry/srs/projections/proj/fahey.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/proj/fahey.hpp
rename to include/boost/geometry/srs/projections/proj/fahey.hpp
index cc86196ce..740441356 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/fahey.hpp
+++ b/include/boost/geometry/srs/projections/proj/fahey.hpp
@@ -41,11 +41,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/fouc_s.hpp b/include/boost/geometry/srs/projections/proj/fouc_s.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/fouc_s.hpp
rename to include/boost/geometry/srs/projections/proj/fouc_s.hpp
index b1b4bcfc8..1f381dbec 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/fouc_s.hpp
+++ b/include/boost/geometry/srs/projections/proj/fouc_s.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/gall.hpp b/include/boost/geometry/srs/projections/proj/gall.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/gall.hpp
rename to include/boost/geometry/srs/projections/proj/gall.hpp
index 284cd4c09..6e86f6cfb 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/gall.hpp
+++ b/include/boost/geometry/srs/projections/proj/gall.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/geocent.hpp b/include/boost/geometry/srs/projections/proj/geocent.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/geocent.hpp
rename to include/boost/geometry/srs/projections/proj/geocent.hpp
index 476d7261d..513a4b1d0 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/geocent.hpp
+++ b/include/boost/geometry/srs/projections/proj/geocent.hpp
@@ -47,10 +47,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/geos.hpp b/include/boost/geometry/srs/projections/proj/geos.hpp
similarity index 98%
rename from include/boost/geometry/extensions/gis/projections/proj/geos.hpp
rename to include/boost/geometry/srs/projections/proj/geos.hpp
index 3b12afb71..dd6c32e69 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/geos.hpp
+++ b/include/boost/geometry/srs/projections/proj/geos.hpp
@@ -48,10 +48,10 @@
 
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/gins8.hpp b/include/boost/geometry/srs/projections/proj/gins8.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/gins8.hpp
rename to include/boost/geometry/srs/projections/proj/gins8.hpp
index b5a4bfe7f..c572854d7 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/gins8.hpp
+++ b/include/boost/geometry/srs/projections/proj/gins8.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp b/include/boost/geometry/srs/projections/proj/gn_sinu.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp
rename to include/boost/geometry/srs/projections/proj/gn_sinu.hpp
index 580581df4..e487ce88a 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp
+++ b/include/boost/geometry/srs/projections/proj/gn_sinu.hpp
@@ -43,12 +43,12 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/gnom.hpp b/include/boost/geometry/srs/projections/proj/gnom.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/gnom.hpp
rename to include/boost/geometry/srs/projections/proj/gnom.hpp
index 8cb6b610e..bf8a1a9f0 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/gnom.hpp
+++ b/include/boost/geometry/srs/projections/proj/gnom.hpp
@@ -44,10 +44,10 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/goode.hpp b/include/boost/geometry/srs/projections/proj/goode.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/proj/goode.hpp
rename to include/boost/geometry/srs/projections/proj/goode.hpp
index 1ed9c1484..e6c0f9b00 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/goode.hpp
+++ b/include/boost/geometry/srs/projections/proj/goode.hpp
@@ -41,12 +41,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/moll.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/proj/gn_sinu.hpp>
+#include <boost/geometry/srs/projections/proj/moll.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/gstmerc.hpp b/include/boost/geometry/srs/projections/proj/gstmerc.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/gstmerc.hpp
rename to include/boost/geometry/srs/projections/proj/gstmerc.hpp
index d8871c61d..d83bfd3f7 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/gstmerc.hpp
+++ b/include/boost/geometry/srs/projections/proj/gstmerc.hpp
@@ -41,12 +41,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_phi2.hpp>
+#include <boost/geometry/srs/projections/impl/pj_tsfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/hammer.hpp b/include/boost/geometry/srs/projections/proj/hammer.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/hammer.hpp
rename to include/boost/geometry/srs/projections/proj/hammer.hpp
index 63f0d6e89..4f3802311 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/hammer.hpp
+++ b/include/boost/geometry/srs/projections/proj/hammer.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/hatano.hpp b/include/boost/geometry/srs/projections/proj/hatano.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/hatano.hpp
rename to include/boost/geometry/srs/projections/proj/hatano.hpp
index 06c2e07e4..a88018749 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/hatano.hpp
+++ b/include/boost/geometry/srs/projections/proj/hatano.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/healpix.hpp b/include/boost/geometry/srs/projections/proj/healpix.hpp
similarity index 98%
rename from include/boost/geometry/extensions/gis/projections/proj/healpix.hpp
rename to include/boost/geometry/srs/projections/proj/healpix.hpp
index e86a6c295..5af14d411 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/healpix.hpp
+++ b/include/boost/geometry/srs/projections/proj/healpix.hpp
@@ -51,12 +51,12 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_auth.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_auth.hpp>
+#include <boost/geometry/srs/projections/impl/pj_qsfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/igh.hpp b/include/boost/geometry/srs/projections/proj/igh.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/igh.hpp
rename to include/boost/geometry/srs/projections/proj/igh.hpp
index fee6ffd84..20ec210f3 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/igh.hpp
+++ b/include/boost/geometry/srs/projections/proj/igh.hpp
@@ -44,12 +44,12 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/moll.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/proj/gn_sinu.hpp>
+#include <boost/geometry/srs/projections/proj/moll.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/imw_p.hpp b/include/boost/geometry/srs/projections/proj/imw_p.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/imw_p.hpp
rename to include/boost/geometry/srs/projections/proj/imw_p.hpp
index 622f7998d..7c7c8cf36 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/imw_p.hpp
+++ b/include/boost/geometry/srs/projections/proj/imw_p.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/isea.hpp b/include/boost/geometry/srs/projections/proj/isea.hpp
similarity index 99%
rename from include/boost/geometry/extensions/gis/projections/proj/isea.hpp
rename to include/boost/geometry/srs/projections/proj/isea.hpp
index feaa4b401..cad93e251 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/isea.hpp
+++ b/include/boost/geometry/srs/projections/proj/isea.hpp
@@ -47,10 +47,10 @@
 #include <boost/core/ignore_unused.hpp>
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/krovak.hpp b/include/boost/geometry/srs/projections/proj/krovak.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/krovak.hpp
rename to include/boost/geometry/srs/projections/proj/krovak.hpp
index 190cd9184..0f0476340 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/krovak.hpp
+++ b/include/boost/geometry/srs/projections/proj/krovak.hpp
@@ -46,10 +46,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/labrd.hpp b/include/boost/geometry/srs/projections/proj/labrd.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/labrd.hpp
rename to include/boost/geometry/srs/projections/proj/labrd.hpp
index 1d86af8dd..20ac09cd0 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/labrd.hpp
+++ b/include/boost/geometry/srs/projections/proj/labrd.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/laea.hpp b/include/boost/geometry/srs/projections/proj/laea.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/laea.hpp
rename to include/boost/geometry/srs/projections/proj/laea.hpp
index c64005717..977c686a1 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/laea.hpp
+++ b/include/boost/geometry/srs/projections/proj/laea.hpp
@@ -44,12 +44,12 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_auth.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_auth.hpp>
+#include <boost/geometry/srs/projections/impl/pj_qsfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/lagrng.hpp b/include/boost/geometry/srs/projections/proj/lagrng.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/lagrng.hpp
rename to include/boost/geometry/srs/projections/proj/lagrng.hpp
index f9937dfea..f6822c6d9 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/lagrng.hpp
+++ b/include/boost/geometry/srs/projections/proj/lagrng.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/larr.hpp b/include/boost/geometry/srs/projections/proj/larr.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/proj/larr.hpp
rename to include/boost/geometry/srs/projections/proj/larr.hpp
index 97eea8c84..b5a78446c 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/larr.hpp
+++ b/include/boost/geometry/srs/projections/proj/larr.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/lask.hpp b/include/boost/geometry/srs/projections/proj/lask.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/lask.hpp
rename to include/boost/geometry/srs/projections/proj/lask.hpp
index 15236c577..881b5a439 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/lask.hpp
+++ b/include/boost/geometry/srs/projections/proj/lask.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/latlong.hpp b/include/boost/geometry/srs/projections/proj/latlong.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/latlong.hpp
rename to include/boost/geometry/srs/projections/proj/latlong.hpp
index e95a71c1e..e585033ff 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/latlong.hpp
+++ b/include/boost/geometry/srs/projections/proj/latlong.hpp
@@ -47,12 +47,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
-#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
+#include <boost/geometry/srs/projections/epsg_traits.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/lcc.hpp b/include/boost/geometry/srs/projections/proj/lcc.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/lcc.hpp
rename to include/boost/geometry/srs/projections/proj/lcc.hpp
index aa078119b..46d4fe8ac 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/lcc.hpp
+++ b/include/boost/geometry/srs/projections/proj/lcc.hpp
@@ -44,15 +44,15 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_msfn.hpp>
+#include <boost/geometry/srs/projections/impl/pj_phi2.hpp>
+#include <boost/geometry/srs/projections/impl/pj_tsfn.hpp>
 
-#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
+#include <boost/geometry/srs/projections/epsg_traits.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/lcca.hpp b/include/boost/geometry/srs/projections/proj/lcca.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/lcca.hpp
rename to include/boost/geometry/srs/projections/proj/lcca.hpp
index 61429efab..65ba1041a 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/lcca.hpp
+++ b/include/boost/geometry/srs/projections/proj/lcca.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/core/ignore_unused.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/loxim.hpp b/include/boost/geometry/srs/projections/proj/loxim.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/loxim.hpp
rename to include/boost/geometry/srs/projections/proj/loxim.hpp
index 78a1e650b..ccf7b88fc 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/loxim.hpp
+++ b/include/boost/geometry/srs/projections/proj/loxim.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/lsat.hpp b/include/boost/geometry/srs/projections/proj/lsat.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/lsat.hpp
rename to include/boost/geometry/srs/projections/proj/lsat.hpp
index 0e2cd8842..859a709f3 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/lsat.hpp
+++ b/include/boost/geometry/srs/projections/proj/lsat.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp b/include/boost/geometry/srs/projections/proj/mbt_fps.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp
rename to include/boost/geometry/srs/projections/proj/mbt_fps.hpp
index 6c571b068..b4c40d392 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp
+++ b/include/boost/geometry/srs/projections/proj/mbt_fps.hpp
@@ -41,11 +41,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp b/include/boost/geometry/srs/projections/proj/mbtfpp.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp
rename to include/boost/geometry/srs/projections/proj/mbtfpp.hpp
index fb57436f9..a413b28f6 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp
+++ b/include/boost/geometry/srs/projections/proj/mbtfpp.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp b/include/boost/geometry/srs/projections/proj/mbtfpq.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp
rename to include/boost/geometry/srs/projections/proj/mbtfpq.hpp
index e90ba2b14..8695adc01 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp
+++ b/include/boost/geometry/srs/projections/proj/mbtfpq.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/merc.hpp b/include/boost/geometry/srs/projections/proj/merc.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/merc.hpp
rename to include/boost/geometry/srs/projections/proj/merc.hpp
index 4d22fc598..bcfaa697e 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/merc.hpp
+++ b/include/boost/geometry/srs/projections/proj/merc.hpp
@@ -43,13 +43,13 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_msfn.hpp>
+#include <boost/geometry/srs/projections/impl/pj_phi2.hpp>
+#include <boost/geometry/srs/projections/impl/pj_tsfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/mill.hpp b/include/boost/geometry/srs/projections/proj/mill.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/mill.hpp
rename to include/boost/geometry/srs/projections/proj/mill.hpp
index ff081af88..adb87cb08 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/mill.hpp
+++ b/include/boost/geometry/srs/projections/proj/mill.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/mod_ster.hpp b/include/boost/geometry/srs/projections/proj/mod_ster.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/mod_ster.hpp
rename to include/boost/geometry/srs/projections/proj/mod_ster.hpp
index 9eab94934..d7bdbef88 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/mod_ster.hpp
+++ b/include/boost/geometry/srs/projections/proj/mod_ster.hpp
@@ -44,12 +44,12 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_zpoly1.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/pj_zpoly1.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/moll.hpp b/include/boost/geometry/srs/projections/proj/moll.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/moll.hpp
rename to include/boost/geometry/srs/projections/proj/moll.hpp
index ca5a5ba8d..c34e50604 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/moll.hpp
+++ b/include/boost/geometry/srs/projections/proj/moll.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/natearth.hpp b/include/boost/geometry/srs/projections/proj/natearth.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/natearth.hpp
rename to include/boost/geometry/srs/projections/proj/natearth.hpp
index 283dc7fbd..ac5e31a1c 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/natearth.hpp
+++ b/include/boost/geometry/srs/projections/proj/natearth.hpp
@@ -54,10 +54,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/nell.hpp b/include/boost/geometry/srs/projections/proj/nell.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/proj/nell.hpp
rename to include/boost/geometry/srs/projections/proj/nell.hpp
index 293c42942..7608a647f 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/nell.hpp
+++ b/include/boost/geometry/srs/projections/proj/nell.hpp
@@ -41,11 +41,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/nell_h.hpp b/include/boost/geometry/srs/projections/proj/nell_h.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/nell_h.hpp
rename to include/boost/geometry/srs/projections/proj/nell_h.hpp
index e0a83d9ff..15a6a0eef 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/nell_h.hpp
+++ b/include/boost/geometry/srs/projections/proj/nell_h.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/nocol.hpp b/include/boost/geometry/srs/projections/proj/nocol.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/nocol.hpp
rename to include/boost/geometry/srs/projections/proj/nocol.hpp
index 4513d2b4e..c4998453d 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/nocol.hpp
+++ b/include/boost/geometry/srs/projections/proj/nocol.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/nsper.hpp b/include/boost/geometry/srs/projections/proj/nsper.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/nsper.hpp
rename to include/boost/geometry/srs/projections/proj/nsper.hpp
index e147d6de4..54bc7680e 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/nsper.hpp
+++ b/include/boost/geometry/srs/projections/proj/nsper.hpp
@@ -44,10 +44,10 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/nzmg.hpp b/include/boost/geometry/srs/projections/proj/nzmg.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/nzmg.hpp
rename to include/boost/geometry/srs/projections/proj/nzmg.hpp
index f67493fd4..927d3b826 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/nzmg.hpp
+++ b/include/boost/geometry/srs/projections/proj/nzmg.hpp
@@ -48,11 +48,11 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_zpoly1.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_zpoly1.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/ob_tran.hpp b/include/boost/geometry/srs/projections/proj/ob_tran.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/ob_tran.hpp
rename to include/boost/geometry/srs/projections/proj/ob_tran.hpp
index ad10acce3..56513abc3 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/ob_tran.hpp
+++ b/include/boost/geometry/srs/projections/proj/ob_tran.hpp
@@ -44,11 +44,11 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/ocea.hpp b/include/boost/geometry/srs/projections/proj/ocea.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/ocea.hpp
rename to include/boost/geometry/srs/projections/proj/ocea.hpp
index c91fdec17..0446eae19 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/ocea.hpp
+++ b/include/boost/geometry/srs/projections/proj/ocea.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/oea.hpp b/include/boost/geometry/srs/projections/proj/oea.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/oea.hpp
rename to include/boost/geometry/srs/projections/proj/oea.hpp
index 89f3ab148..efb7c2f33 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/oea.hpp
+++ b/include/boost/geometry/srs/projections/proj/oea.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/omerc.hpp b/include/boost/geometry/srs/projections/proj/omerc.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/omerc.hpp
rename to include/boost/geometry/srs/projections/proj/omerc.hpp
index 559472df7..a77c80dcd 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/omerc.hpp
+++ b/include/boost/geometry/srs/projections/proj/omerc.hpp
@@ -45,12 +45,12 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_phi2.hpp>
+#include <boost/geometry/srs/projections/impl/pj_tsfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/ortho.hpp b/include/boost/geometry/srs/projections/proj/ortho.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/ortho.hpp
rename to include/boost/geometry/srs/projections/proj/ortho.hpp
index d50a569c8..6e3db45bf 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/ortho.hpp
+++ b/include/boost/geometry/srs/projections/proj/ortho.hpp
@@ -44,10 +44,10 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/poly.hpp b/include/boost/geometry/srs/projections/proj/poly.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/poly.hpp
rename to include/boost/geometry/srs/projections/proj/poly.hpp
index b99cf3351..cdfd60f33 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/poly.hpp
+++ b/include/boost/geometry/srs/projections/proj/poly.hpp
@@ -41,12 +41,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/pj_msfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/putp2.hpp b/include/boost/geometry/srs/projections/proj/putp2.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/putp2.hpp
rename to include/boost/geometry/srs/projections/proj/putp2.hpp
index 6ac104512..815764b74 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/putp2.hpp
+++ b/include/boost/geometry/srs/projections/proj/putp2.hpp
@@ -41,11 +41,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/putp3.hpp b/include/boost/geometry/srs/projections/proj/putp3.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/putp3.hpp
rename to include/boost/geometry/srs/projections/proj/putp3.hpp
index 9ebac580d..d3a713d78 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/putp3.hpp
+++ b/include/boost/geometry/srs/projections/proj/putp3.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/core/ignore_unused.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/putp4p.hpp b/include/boost/geometry/srs/projections/proj/putp4p.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/putp4p.hpp
rename to include/boost/geometry/srs/projections/proj/putp4p.hpp
index f24044b8d..4086c4c17 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/putp4p.hpp
+++ b/include/boost/geometry/srs/projections/proj/putp4p.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/core/ignore_unused.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/putp5.hpp b/include/boost/geometry/srs/projections/proj/putp5.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/putp5.hpp
rename to include/boost/geometry/srs/projections/proj/putp5.hpp
index 3cf3ed6e9..1f9e0858f 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/putp5.hpp
+++ b/include/boost/geometry/srs/projections/proj/putp5.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/core/ignore_unused.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/putp6.hpp b/include/boost/geometry/srs/projections/proj/putp6.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/putp6.hpp
rename to include/boost/geometry/srs/projections/proj/putp6.hpp
index 304a3667a..df62c28ec 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/putp6.hpp
+++ b/include/boost/geometry/srs/projections/proj/putp6.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/core/ignore_unused.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/qsc.hpp b/include/boost/geometry/srs/projections/proj/qsc.hpp
similarity index 98%
rename from include/boost/geometry/extensions/gis/projections/proj/qsc.hpp
rename to include/boost/geometry/srs/projections/proj/qsc.hpp
index 8319b2362..012fb66de 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/qsc.hpp
+++ b/include/boost/geometry/srs/projections/proj/qsc.hpp
@@ -76,10 +76,10 @@
 #include <boost/core/ignore_unused.hpp>
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/robin.hpp b/include/boost/geometry/srs/projections/proj/robin.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/robin.hpp
rename to include/boost/geometry/srs/projections/proj/robin.hpp
index 03754e502..e1ef3432f 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/robin.hpp
+++ b/include/boost/geometry/srs/projections/proj/robin.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/function_overloads.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/function_overloads.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/rouss.hpp b/include/boost/geometry/srs/projections/proj/rouss.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/rouss.hpp
rename to include/boost/geometry/srs/projections/proj/rouss.hpp
index 88d1f6f75..94636ea54 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/rouss.hpp
+++ b/include/boost/geometry/srs/projections/proj/rouss.hpp
@@ -43,11 +43,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/proj_mdist.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/proj_mdist.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/rpoly.hpp b/include/boost/geometry/srs/projections/proj/rpoly.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/rpoly.hpp
rename to include/boost/geometry/srs/projections/proj/rpoly.hpp
index 23cc6b8cd..0e6d08501 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/rpoly.hpp
+++ b/include/boost/geometry/srs/projections/proj/rpoly.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/sconics.hpp b/include/boost/geometry/srs/projections/proj/sconics.hpp
similarity index 98%
rename from include/boost/geometry/extensions/gis/projections/proj/sconics.hpp
rename to include/boost/geometry/srs/projections/proj/sconics.hpp
index b572c0478..4c5c97cbd 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/sconics.hpp
+++ b/include/boost/geometry/srs/projections/proj/sconics.hpp
@@ -44,10 +44,10 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/somerc.hpp b/include/boost/geometry/srs/projections/proj/somerc.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/somerc.hpp
rename to include/boost/geometry/srs/projections/proj/somerc.hpp
index ad66f6aff..c13796750 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/somerc.hpp
+++ b/include/boost/geometry/srs/projections/proj/somerc.hpp
@@ -43,11 +43,11 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/stere.hpp b/include/boost/geometry/srs/projections/proj/stere.hpp
similarity index 98%
rename from include/boost/geometry/extensions/gis/projections/proj/stere.hpp
rename to include/boost/geometry/srs/projections/proj/stere.hpp
index 9d0b96b02..2288f02fc 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/stere.hpp
+++ b/include/boost/geometry/srs/projections/proj/stere.hpp
@@ -44,11 +44,11 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_tsfn.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/sterea.hpp b/include/boost/geometry/srs/projections/proj/sterea.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/proj/sterea.hpp
rename to include/boost/geometry/srs/projections/proj/sterea.hpp
index 0ee33ef29..43785d833 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/sterea.hpp
+++ b/include/boost/geometry/srs/projections/proj/sterea.hpp
@@ -45,13 +45,13 @@
 
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_gauss.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_gauss.hpp>
 
-#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
+#include <boost/geometry/srs/projections/epsg_traits.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/sts.hpp b/include/boost/geometry/srs/projections/proj/sts.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/sts.hpp
rename to include/boost/geometry/srs/projections/proj/sts.hpp
index edcdfebe5..75bbf56c4 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/sts.hpp
+++ b/include/boost/geometry/srs/projections/proj/sts.hpp
@@ -41,11 +41,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/tcc.hpp b/include/boost/geometry/srs/projections/proj/tcc.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/tcc.hpp
rename to include/boost/geometry/srs/projections/proj/tcc.hpp
index 6c4b2791a..4fb5ed075 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/tcc.hpp
+++ b/include/boost/geometry/srs/projections/proj/tcc.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/tcea.hpp b/include/boost/geometry/srs/projections/proj/tcea.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/tcea.hpp
rename to include/boost/geometry/srs/projections/proj/tcea.hpp
index 9e99cdce8..e4e4790de 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/tcea.hpp
+++ b/include/boost/geometry/srs/projections/proj/tcea.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/tmerc.hpp b/include/boost/geometry/srs/projections/proj/tmerc.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/tmerc.hpp
rename to include/boost/geometry/srs/projections/proj/tmerc.hpp
index 06eed675c..c3e7bb3a7 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/tmerc.hpp
+++ b/include/boost/geometry/srs/projections/proj/tmerc.hpp
@@ -43,14 +43,14 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/function_overloads.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/function_overloads.hpp>
+#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
 
-#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
+#include <boost/geometry/srs/projections/epsg_traits.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/tpeqd.hpp b/include/boost/geometry/srs/projections/proj/tpeqd.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/tpeqd.hpp
rename to include/boost/geometry/srs/projections/proj/tpeqd.hpp
index 2cb7160f7..2bfff61f2 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/tpeqd.hpp
+++ b/include/boost/geometry/srs/projections/proj/tpeqd.hpp
@@ -44,11 +44,11 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/urm5.hpp b/include/boost/geometry/srs/projections/proj/urm5.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/proj/urm5.hpp
rename to include/boost/geometry/srs/projections/proj/urm5.hpp
index 69903f7de..d6b08345e 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/urm5.hpp
+++ b/include/boost/geometry/srs/projections/proj/urm5.hpp
@@ -41,11 +41,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/urmfps.hpp b/include/boost/geometry/srs/projections/proj/urmfps.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/urmfps.hpp
rename to include/boost/geometry/srs/projections/proj/urmfps.hpp
index f2498b07b..73eb2634d 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/urmfps.hpp
+++ b/include/boost/geometry/srs/projections/proj/urmfps.hpp
@@ -41,11 +41,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/vandg.hpp b/include/boost/geometry/srs/projections/proj/vandg.hpp
similarity index 97%
rename from include/boost/geometry/extensions/gis/projections/proj/vandg.hpp
rename to include/boost/geometry/srs/projections/proj/vandg.hpp
index 206485c20..03d990d80 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/vandg.hpp
+++ b/include/boost/geometry/srs/projections/proj/vandg.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/vandg2.hpp b/include/boost/geometry/srs/projections/proj/vandg2.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/vandg2.hpp
rename to include/boost/geometry/srs/projections/proj/vandg2.hpp
index b3f424f73..3503c7804 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/vandg2.hpp
+++ b/include/boost/geometry/srs/projections/proj/vandg2.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/vandg4.hpp b/include/boost/geometry/srs/projections/proj/vandg4.hpp
similarity index 96%
rename from include/boost/geometry/extensions/gis/projections/proj/vandg4.hpp
rename to include/boost/geometry/srs/projections/proj/vandg4.hpp
index dd69e25cc..c1b63d9c9 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/vandg4.hpp
+++ b/include/boost/geometry/srs/projections/proj/vandg4.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/wag2.hpp b/include/boost/geometry/srs/projections/proj/wag2.hpp
similarity index 94%
rename from include/boost/geometry/extensions/gis/projections/proj/wag2.hpp
rename to include/boost/geometry/srs/projections/proj/wag2.hpp
index aa9b974d6..d7786ca92 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/wag2.hpp
+++ b/include/boost/geometry/srs/projections/proj/wag2.hpp
@@ -41,11 +41,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/aasincos.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/wag3.hpp b/include/boost/geometry/srs/projections/proj/wag3.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/wag3.hpp
rename to include/boost/geometry/srs/projections/proj/wag3.hpp
index cb176db16..08f23620c 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/wag3.hpp
+++ b/include/boost/geometry/srs/projections/proj/wag3.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/wag7.hpp b/include/boost/geometry/srs/projections/proj/wag7.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/wag7.hpp
rename to include/boost/geometry/srs/projections/proj/wag7.hpp
index 4773905c1..836650092 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/wag7.hpp
+++ b/include/boost/geometry/srs/projections/proj/wag7.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/wink1.hpp b/include/boost/geometry/srs/projections/proj/wink1.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/wink1.hpp
rename to include/boost/geometry/srs/projections/proj/wink1.hpp
index 2da94ee57..1c5f450a7 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/wink1.hpp
+++ b/include/boost/geometry/srs/projections/proj/wink1.hpp
@@ -41,10 +41,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/proj/wink2.hpp b/include/boost/geometry/srs/projections/proj/wink2.hpp
similarity index 95%
rename from include/boost/geometry/extensions/gis/projections/proj/wink2.hpp
rename to include/boost/geometry/srs/projections/proj/wink2.hpp
index 27623e39c..6503f4960 100644
--- a/include/boost/geometry/extensions/gis/projections/proj/wink2.hpp
+++ b/include/boost/geometry/srs/projections/proj/wink2.hpp
@@ -43,10 +43,10 @@
 
 #include <boost/geometry/util/math.hpp>
 
-#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/base_static.hpp>
+#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
+#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/extensions/gis/projections/project_transformer.hpp b/include/boost/geometry/strategies/transform/project_transformer.hpp
similarity index 90%
rename from include/boost/geometry/extensions/gis/projections/project_transformer.hpp
rename to include/boost/geometry/strategies/transform/project_transformer.hpp
index af9a94600..ec8203b3d 100644
--- a/include/boost/geometry/extensions/gis/projections/project_transformer.hpp
+++ b/include/boost/geometry/strategies/transform/project_transformer.hpp
@@ -10,15 +10,15 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_GEOMETRY_STRATEGY_PROJECT_TRANSFORMER_HPP
-#define BOOST_GEOMETRY_STRATEGY_PROJECT_TRANSFORMER_HPP
+#ifndef BOOST_GEOMETRY_STRATEGIES_TRANSFORM_PROJECT_TRANSFORMER_HPP
+#define BOOST_GEOMETRY_STRATEGIES_TRANSFORM_PROJECT_TRANSFORMER_HPP
 
 
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/coordinate_system.hpp>
 #include <boost/geometry/core/tags.hpp>
 
-#include <boost/geometry/extensions/gis/projections/projection.hpp>
+#include <boost/geometry/srs/projection.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 
@@ -76,7 +76,7 @@ private:
         return m_proj.inverse(p1, p2);
     }
 
-    geometry::projection<Proj, CT> m_proj;
+    srs::projection<Proj, CT> m_proj;
 };
 
 
@@ -112,7 +112,7 @@ public:
     }
 
 private:
-    geometry::projection<Proj, CT> m_proj;
+    srs::projection<Proj, CT> m_proj;
 };
 
 
@@ -145,7 +145,7 @@ public:
     }
 
 private:
-    geometry::projection<Proj, CT> m_proj;
+    srs::projection<Proj, CT> m_proj;
 };
 
 
@@ -154,4 +154,4 @@ private:
 }} // namespace boost::geometry
 
 
-#endif // BOOST_GEOMETRY_STRATEGY_PROJECT_TRANSFORMER_HPP
+#endif // BOOST_GEOMETRY_STRATEGIES_TRANSFORM_PROJECT_TRANSFORMER_HPP