diff --git a/example_extensions/Jamfile.v2 b/extensions/example/Jamfile.v2
similarity index 100%
rename from example_extensions/Jamfile.v2
rename to extensions/example/Jamfile.v2
diff --git a/example_extensions/boost.vsprops b/extensions/example/boost.vsprops
similarity index 100%
rename from example_extensions/boost.vsprops
rename to extensions/example/boost.vsprops
diff --git a/example_extensions/experimental/geometry_of.cpp b/extensions/example/experimental/geometry_of.cpp
similarity index 100%
rename from example_extensions/experimental/geometry_of.cpp
rename to extensions/example/experimental/geometry_of.cpp
diff --git a/example_extensions/experimental/geometry_of.sln b/extensions/example/experimental/geometry_of.sln
similarity index 100%
rename from example_extensions/experimental/geometry_of.sln
rename to extensions/example/experimental/geometry_of.sln
diff --git a/example_extensions/experimental/geometry_of.vcproj b/extensions/example/experimental/geometry_of.vcproj
similarity index 100%
rename from example_extensions/experimental/geometry_of.vcproj
rename to extensions/example/experimental/geometry_of.vcproj
diff --git a/example_extensions/gis/Jamfile.v2 b/extensions/example/gis/Jamfile.v2
similarity index 100%
rename from example_extensions/gis/Jamfile.v2
rename to extensions/example/gis/Jamfile.v2
diff --git a/example_extensions/gis/io/shapelib/shapelib.cpp b/extensions/example/gis/io/shapelib/shapelib.cpp
similarity index 100%
rename from example_extensions/gis/io/shapelib/shapelib.cpp
rename to extensions/example/gis/io/shapelib/shapelib.cpp
diff --git a/example_extensions/gis/io/shapelib/shapelib.sln b/extensions/example/gis/io/shapelib/shapelib.sln
similarity index 100%
rename from example_extensions/gis/io/shapelib/shapelib.sln
rename to extensions/example/gis/io/shapelib/shapelib.sln
diff --git a/example_extensions/gis/io/shapelib/shapelib.vcproj b/extensions/example/gis/io/shapelib/shapelib.vcproj
similarity index 100%
rename from example_extensions/gis/io/shapelib/shapelib.vcproj
rename to extensions/example/gis/io/shapelib/shapelib.vcproj
diff --git a/example_extensions/gis/io/shapelib/shapelib.vsprops b/extensions/example/gis/io/shapelib/shapelib.vsprops
similarity index 100%
rename from example_extensions/gis/io/shapelib/shapelib.vsprops
rename to extensions/example/gis/io/shapelib/shapelib.vsprops
diff --git a/example_extensions/gis/latlong/Jamfile.v2 b/extensions/example/gis/latlong/Jamfile.v2
similarity index 100%
rename from example_extensions/gis/latlong/Jamfile.v2
rename to extensions/example/gis/latlong/Jamfile.v2
diff --git a/example_extensions/gis/latlong/distance_example.cpp b/extensions/example/gis/latlong/distance_example.cpp
similarity index 100%
rename from example_extensions/gis/latlong/distance_example.cpp
rename to extensions/example/gis/latlong/distance_example.cpp
diff --git a/example_extensions/gis/latlong/distance_example.vcproj b/extensions/example/gis/latlong/distance_example.vcproj
similarity index 100%
rename from example_extensions/gis/latlong/distance_example.vcproj
rename to extensions/example/gis/latlong/distance_example.vcproj
diff --git a/example_extensions/gis/latlong/latlong_examples.sln b/extensions/example/gis/latlong/latlong_examples.sln
similarity index 100%
rename from example_extensions/gis/latlong/latlong_examples.sln
rename to extensions/example/gis/latlong/latlong_examples.sln
diff --git a/example_extensions/gis/latlong/point_ll_example.cpp b/extensions/example/gis/latlong/point_ll_example.cpp
similarity index 100%
rename from example_extensions/gis/latlong/point_ll_example.cpp
rename to extensions/example/gis/latlong/point_ll_example.cpp
diff --git a/example_extensions/gis/latlong/point_ll_example.vcproj b/extensions/example/gis/latlong/point_ll_example.vcproj
similarity index 100%
rename from example_extensions/gis/latlong/point_ll_example.vcproj
rename to extensions/example/gis/latlong/point_ll_example.vcproj
diff --git a/example_extensions/gis/osgeo4w-libraries.vsprops b/extensions/example/gis/osgeo4w-libraries.vsprops
similarity index 100%
rename from example_extensions/gis/osgeo4w-libraries.vsprops
rename to extensions/example/gis/osgeo4w-libraries.vsprops
diff --git a/example_extensions/gis/projections/Jamfile.v2 b/extensions/example/gis/projections/Jamfile.v2
similarity index 100%
rename from example_extensions/gis/projections/Jamfile.v2
rename to extensions/example/gis/projections/Jamfile.v2
diff --git a/example_extensions/gis/projections/p01_example.vcproj b/extensions/example/gis/projections/p01_example.vcproj
similarity index 100%
rename from example_extensions/gis/projections/p01_example.vcproj
rename to extensions/example/gis/projections/p01_example.vcproj
diff --git a/example_extensions/gis/projections/p01_projection_example.cpp b/extensions/example/gis/projections/p01_projection_example.cpp
similarity index 100%
rename from example_extensions/gis/projections/p01_projection_example.cpp
rename to extensions/example/gis/projections/p01_projection_example.cpp
diff --git a/example_extensions/gis/projections/p02_example.vcproj b/extensions/example/gis/projections/p02_example.vcproj
similarity index 100%
rename from example_extensions/gis/projections/p02_example.vcproj
rename to extensions/example/gis/projections/p02_example.vcproj
diff --git a/example_extensions/gis/projections/p02_projfactory_example.cpp b/extensions/example/gis/projections/p02_projfactory_example.cpp
similarity index 100%
rename from example_extensions/gis/projections/p02_projfactory_example.cpp
rename to extensions/example/gis/projections/p02_projfactory_example.cpp
diff --git a/example_extensions/gis/projections/p03_example.vcproj b/extensions/example/gis/projections/p03_example.vcproj
similarity index 100%
rename from example_extensions/gis/projections/p03_example.vcproj
rename to extensions/example/gis/projections/p03_example.vcproj
diff --git a/example_extensions/gis/projections/p03_projmap_example.cpp b/extensions/example/gis/projections/p03_projmap_example.cpp
similarity index 100%
rename from example_extensions/gis/projections/p03_projmap_example.cpp
rename to extensions/example/gis/projections/p03_projmap_example.cpp
diff --git a/example_extensions/gis/projections/p04_example.cpp b/extensions/example/gis/projections/p04_example.cpp
similarity index 100%
rename from example_extensions/gis/projections/p04_example.cpp
rename to extensions/example/gis/projections/p04_example.cpp
diff --git a/example_extensions/gis/projections/p04_example.vcproj b/extensions/example/gis/projections/p04_example.vcproj
similarity index 100%
rename from example_extensions/gis/projections/p04_example.vcproj
rename to extensions/example/gis/projections/p04_example.vcproj
diff --git a/example_extensions/gis/projections/p05_example.cpp b/extensions/example/gis/projections/p05_example.cpp
similarity index 100%
rename from example_extensions/gis/projections/p05_example.cpp
rename to extensions/example/gis/projections/p05_example.cpp
diff --git a/example_extensions/gis/projections/p05_example.vcproj b/extensions/example/gis/projections/p05_example.vcproj
similarity index 100%
rename from example_extensions/gis/projections/p05_example.vcproj
rename to extensions/example/gis/projections/p05_example.vcproj
diff --git a/example_extensions/gis/projections/projection_examples.sln b/extensions/example/gis/projections/projection_examples.sln
similarity index 100%
rename from example_extensions/gis/projections/projection_examples.sln
rename to extensions/example/gis/projections/projection_examples.sln
diff --git a/example_extensions/units/08_units_example.cpp b/extensions/example/units/08_units_example.cpp
similarity index 100%
rename from example_extensions/units/08_units_example.cpp
rename to extensions/example/units/08_units_example.cpp
diff --git a/example_extensions/units/08_units_example.vcproj b/extensions/example/units/08_units_example.vcproj
similarity index 100%
rename from example_extensions/units/08_units_example.vcproj
rename to extensions/example/units/08_units_example.vcproj