162 files changed, 357 insertions, 271 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 990ca74d..4912ae02 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,20 +15,20 @@ include_HEADERS = proj.h proj_experimental.h proj_constants.h proj_api.h geodesi
 
 EXTRA_DIST = bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \
 	bin_geod.cmake bin_nad2bin.cmake bin_proj.cmake bin_projinfo.cmake \
-	lib_proj.cmake CMakeLists.txt bin_geodtest.cmake geodtest.cpp \
-	pj_wkt1_grammar.y pj_wkt2_grammar.y
+	lib_proj.cmake CMakeLists.txt bin_geodtest.cmake tests/geodtest.cpp \
+	pj_wkt1_grammar.y pj_wkt2_grammar.y apps/emess.h
 
-proj_SOURCES = proj.cpp gen_cheb.cpp p_series.cpp
-projinfo_SOURCES = projinfo.cpp
-cs2cs_SOURCES = cs2cs.cpp gen_cheb.cpp p_series.cpp
-cct_SOURCES = cct.cpp proj_strtod.cpp proj_strtod.h optargpm.h
-nad2bin_SOURCES = nad2bin.cpp
-geod_SOURCES = geod.cpp geod_set.cpp geod_interface.cpp geod_interface.h
+proj_SOURCES = apps/proj.cpp apps/gen_cheb.cpp apps/p_series.cpp apps/emess.cpp
+projinfo_SOURCES = apps/projinfo.cpp
+cs2cs_SOURCES = apps/cs2cs.cpp apps/gen_cheb.cpp apps/p_series.cpp apps/emess.cpp
+cct_SOURCES = apps/cct.cpp apps/proj_strtod.cpp apps/proj_strtod.h apps/optargpm.h
+nad2bin_SOURCES = apps/nad2bin.cpp
+geod_SOURCES = apps/geod.cpp apps/geod_set.cpp apps/geod_interface.cpp apps/geod_interface.h apps/emess.cpp
 
-gie_SOURCES = gie.cpp proj_strtod.cpp proj_strtod.h optargpm.h
-multistresstest_SOURCES = multistresstest.cpp
-test228_SOURCES = test228.cpp
-geodtest_SOURCES = geodtest.cpp
+gie_SOURCES = apps/gie.cpp apps/proj_strtod.cpp apps/proj_strtod.h apps/optargpm.h
+multistresstest_SOURCES = tests/multistresstest.cpp
+test228_SOURCES = tests/test228.cpp
+geodtest_SOURCES = tests/geodtest.cpp
 
 cct_LDADD = libproj.la
 cs2cs_LDADD = libproj.la
@@ -48,32 +48,144 @@ libproj_la_LDFLAGS = -no-undefined -version-info 14:1:1
 libproj_la_LIBADD = @SQLITE3_LDFLAGS@
 
 libproj_la_SOURCES = \
-	pj_list.h proj_internal.h proj_math.h projects.h\
-	static.cpp util.cpp metadata.cpp common.cpp crs.cpp datum.cpp coordinatesystem.cpp coordinateoperation.cpp io.cpp \
-	internal.cpp factory.cpp c_api.cpp \
-	PJ_aeqd.cpp PJ_gnom.cpp PJ_laea.cpp PJ_mod_ster.cpp \
-	PJ_nsper.cpp PJ_nzmg.cpp PJ_ortho.cpp PJ_stere.cpp PJ_sterea.cpp \
-	PJ_aea.cpp PJ_bipc.cpp PJ_bonne.cpp PJ_eqdc.cpp PJ_isea.cpp PJ_ccon.cpp \
-	PJ_imw_p.cpp PJ_krovak.cpp PJ_lcc.cpp PJ_poly.cpp \
-	PJ_rpoly.cpp PJ_sconics.cpp proj_rouss.cpp \
-	PJ_cass.cpp PJ_cc.cpp PJ_cea.cpp PJ_eqc.cpp PJ_gall.cpp PJ_geoc.cpp \
-	PJ_labrd.cpp PJ_lsat.cpp PJ_misrsom.cpp PJ_merc.cpp \
-	PJ_mill.cpp PJ_ocea.cpp PJ_omerc.cpp PJ_somerc.cpp \
-	PJ_tcc.cpp PJ_tcea.cpp PJ_times.cpp PJ_tmerc.cpp PJ_tobmerc.cpp \
-	PJ_airy.cpp PJ_aitoff.cpp PJ_august.cpp PJ_bacon.cpp \
-	PJ_bertin1953.cpp PJ_chamb.cpp PJ_hammer.cpp PJ_lagrng.cpp PJ_larr.cpp \
-	PJ_lask.cpp PJ_latlong.cpp PJ_nocol.cpp PJ_ob_tran.cpp PJ_oea.cpp \
-	PJ_tpeqd.cpp PJ_vandg.cpp PJ_vandg2.cpp PJ_vandg4.cpp \
-	PJ_wag7.cpp PJ_lcca.cpp PJ_geos.cpp proj_etmerc.cpp \
-	PJ_boggs.cpp PJ_collg.cpp PJ_comill.cpp PJ_crast.cpp PJ_denoy.cpp \
-	PJ_eck1.cpp PJ_eck2.cpp PJ_eck3.cpp PJ_eck4.cpp \
-	PJ_eck5.cpp PJ_fahey.cpp PJ_fouc_s.cpp PJ_gins8.cpp PJ_gstmerc.cpp \
-	PJ_gn_sinu.cpp PJ_goode.cpp PJ_igh.cpp PJ_hatano.cpp PJ_loxim.cpp \
-	PJ_mbt_fps.cpp PJ_mbtfpp.cpp PJ_mbtfpq.cpp PJ_moll.cpp \
-	PJ_nell.cpp PJ_nell_h.cpp PJ_patterson.cpp PJ_putp2.cpp PJ_putp3.cpp \
-	PJ_putp4p.cpp PJ_putp5.cpp PJ_putp6.cpp PJ_qsc.cpp PJ_robin.cpp \
-	PJ_sch.cpp PJ_sts.cpp PJ_urm5.cpp PJ_urmfps.cpp PJ_wag2.cpp \
-	PJ_wag3.cpp PJ_wink1.cpp PJ_wink2.cpp pj_geocent.cpp \
+	pj_list.h proj_internal.h proj_math.h projects.h \
+	\
+	iso19111/static.cpp \
+	iso19111/util.cpp \
+	iso19111/metadata.cpp \
+	iso19111/common.cpp \
+	iso19111/crs.cpp \
+	iso19111/datum.cpp \
+	iso19111/coordinatesystem.cpp \
+	iso19111/coordinateoperation.cpp \
+	iso19111/io.cpp \
+	iso19111/internal.cpp \
+	iso19111/factory.cpp \
+	iso19111/c_api.cpp \
+	\
+	projections/PJ_aeqd.cpp \
+	projections/PJ_gnom.cpp \
+	projections/PJ_laea.cpp \
+	projections/PJ_mod_ster.cpp \
+	projections/PJ_nsper.cpp \
+	projections/PJ_nzmg.cpp \
+	projections/PJ_ortho.cpp \
+	projections/PJ_stere.cpp \
+	projections/PJ_sterea.cpp \
+	projections/PJ_aea.cpp \
+	projections/PJ_bipc.cpp \
+	projections/PJ_bonne.cpp \
+	projections/PJ_eqdc.cpp \
+	projections/PJ_isea.cpp \
+	projections/PJ_ccon.cpp \
+	projections/PJ_imw_p.cpp \
+	projections/PJ_krovak.cpp \
+	projections/PJ_lcc.cpp \
+	projections/PJ_poly.cpp \
+	projections/PJ_rpoly.cpp \
+	projections/PJ_sconics.cpp \
+	projections/proj_rouss.cpp \
+	projections/PJ_cass.cpp \
+	projections/PJ_cc.cpp \
+	projections/PJ_cea.cpp \
+	projections/PJ_eqc.cpp \
+	projections/PJ_gall.cpp \
+	projections/PJ_labrd.cpp \
+	projections/PJ_lsat.cpp \
+	projections/PJ_misrsom.cpp \
+	projections/PJ_merc.cpp \
+	projections/PJ_mill.cpp \
+	projections/PJ_ocea.cpp \
+	projections/PJ_omerc.cpp \
+	projections/PJ_somerc.cpp \
+	projections/PJ_tcc.cpp \
+	projections/PJ_tcea.cpp \
+	projections/PJ_times.cpp \
+	projections/PJ_tmerc.cpp \
+	projections/PJ_tobmerc.cpp \
+	projections/PJ_airy.cpp \
+	projections/PJ_aitoff.cpp \
+	projections/PJ_august.cpp \
+	projections/PJ_bacon.cpp \
+	projections/PJ_bertin1953.cpp \
+	projections/PJ_chamb.cpp \
+	projections/PJ_hammer.cpp \
+	projections/PJ_lagrng.cpp \
+	projections/PJ_larr.cpp \
+	projections/PJ_lask.cpp \
+	projections/PJ_latlong.cpp \
+	projections/PJ_nocol.cpp \
+	projections/PJ_ob_tran.cpp \
+	projections/PJ_oea.cpp \
+	projections/PJ_tpeqd.cpp \
+	projections/PJ_vandg.cpp \
+	projections/PJ_vandg2.cpp \
+	projections/PJ_vandg4.cpp \
+	projections/PJ_wag7.cpp \
+	projections/PJ_lcca.cpp \
+	projections/PJ_geos.cpp \
+	projections/proj_etmerc.cpp \
+	projections/PJ_boggs.cpp \
+	projections/PJ_collg.cpp \
+	projections/PJ_comill.cpp \
+	projections/PJ_crast.cpp \
+	projections/PJ_denoy.cpp \
+	projections/PJ_eck1.cpp \
+	projections/PJ_eck2.cpp \
+	projections/PJ_eck3.cpp \
+	projections/PJ_eck4.cpp \
+	projections/PJ_eck5.cpp \
+	projections/PJ_fahey.cpp \
+	projections/PJ_fouc_s.cpp \
+	projections/PJ_gins8.cpp \
+	projections/PJ_gstmerc.cpp \
+	projections/PJ_gn_sinu.cpp \
+	projections/PJ_goode.cpp \
+	projections/PJ_igh.cpp \
+	projections/PJ_hatano.cpp \
+	projections/PJ_loxim.cpp \
+	projections/PJ_mbt_fps.cpp \
+	projections/PJ_mbtfpp.cpp \
+	projections/PJ_mbtfpq.cpp \
+	projections/PJ_moll.cpp \
+	projections/PJ_nell.cpp \
+	projections/PJ_nell_h.cpp \
+	projections/PJ_patterson.cpp \
+	projections/PJ_putp2.cpp \
+	projections/PJ_putp3.cpp \
+	projections/PJ_putp4p.cpp \
+	projections/PJ_putp5.cpp \
+	projections/PJ_putp6.cpp \
+	projections/PJ_qsc.cpp \
+	projections/PJ_robin.cpp \
+	projections/PJ_sch.cpp \
+	projections/PJ_sts.cpp \
+	projections/PJ_urm5.cpp \
+	projections/PJ_urmfps.cpp \
+	projections/PJ_wag2.cpp \
+	projections/PJ_wag3.cpp \
+	projections/PJ_wink1.cpp \
+	projections/PJ_wink2.cpp \
+	projections/PJ_healpix.cpp \
+	projections/PJ_natearth.cpp \
+	projections/PJ_natearth2.cpp \
+	projections/PJ_calcofi.cpp \
+	projections/PJ_eqearth.cpp \
+	\
+	conversions/PJ_axisswap.cpp \
+	conversions/PJ_cart.cpp \
+	conversions/PJ_geoc.cpp \
+	conversions/pj_geocent.cpp \
+	conversions/PJ_unitconvert.cpp \
+	\
+	transformations/PJ_affine.cpp \
+	transformations/PJ_deformation.cpp \
+	transformations/PJ_helmert.cpp \
+	transformations/PJ_hgridshift.cpp \
+	transformations/PJ_horner.cpp \
+	transformations/PJ_molodensky.cpp \
+	transformations/PJ_vgridshift.cpp \
+	\
 	aasincos.cpp adjlon.cpp bch2bps.cpp bchgen.cpp \
 	biveval.cpp dmstor.cpp mk_cheby.cpp pj_auth.cpp \
 	pj_deriv.cpp pj_ell_set.cpp pj_ellps.cpp pj_errno.cpp \
@@ -83,19 +195,17 @@ libproj_la_SOURCES = \
 	pj_qsfn.cpp pj_strerrno.cpp \
 	pj_tsfn.cpp pj_units.cpp pj_ctx.cpp pj_log.cpp pj_zpoly1.cpp rtodms.cpp \
 	vector1.cpp pj_release.cpp pj_gauss.cpp \
-	PJ_healpix.cpp PJ_natearth.cpp PJ_natearth2.cpp PJ_calcofi.cpp pj_fileapi.cpp \
-	PJ_eqearth.cpp \
+	pj_fileapi.cpp \
 	\
 	pj_gc_reader.cpp pj_gridcatalog.cpp \
-	nad_cvt.cpp nad_init.cpp nad_intr.cpp emess.cpp emess.h \
+	nad_cvt.cpp nad_init.cpp nad_intr.cpp \
 	pj_apply_gridshift.cpp pj_datums.cpp pj_datum_set.cpp pj_transform.cpp \
 	geocent.cpp geocent.h pj_utils.cpp pj_gridinfo.cpp pj_gridlist.cpp \
 	jniproj.cpp pj_mutex.cpp pj_initcache.cpp pj_apply_vgridshift.cpp geodesic.cpp \
 	pj_strtod.cpp pj_math.cpp \
 	\
-	proj_4D_api.cpp PJ_cart.cpp PJ_pipeline.cpp PJ_horner.cpp PJ_helmert.cpp \
-	PJ_vgridshift.cpp PJ_hgridshift.cpp PJ_unitconvert.cpp PJ_molodensky.cpp \
-	PJ_deformation.cpp pj_internal.cpp PJ_axisswap.cpp PJ_affine.cpp \
+	proj_4D_api.cpp PJ_pipeline.cpp \
+	pj_internal.cpp \
 	pj_wkt_parser.hpp pj_wkt_parser.cpp \
 	pj_wkt1_parser.h pj_wkt1_parser.cpp \
 	pj_wkt1_generated_parser.h pj_wkt1_generated_parser.c \
diff --git a/src/cct.cpp b/src/apps/cct.cpp
index 046257da..046257da 100644
--- a/src/cct.cpp
+++ b/src/apps/cct.cpp
diff --git a/src/cs2cs.cpp b/src/apps/cs2cs.cpp
index f63bedcc..f63bedcc 100644
--- a/src/cs2cs.cpp
+++ b/src/apps/cs2cs.cpp
diff --git a/src/emess.cpp b/src/apps/emess.cpp
index 144e9e23..144e9e23 100644
--- a/src/emess.cpp
+++ b/src/apps/emess.cpp
diff --git a/src/emess.h b/src/apps/emess.h
index d552ec90..4c6f6783 100644
--- a/src/emess.h
+++ b/src/apps/emess.h
@@ -11,7 +11,7 @@ struct EMESS {
 
 #ifdef EMESS_ROUTINE	/* use type */
 /* for emess procedure */
-struct EMESS PROJ_DLL emess_dat = { nullptr, nullptr, 0 };
+struct EMESS emess_dat = { nullptr, nullptr, 0 };
 
 #ifdef sun /* Archaic SunOs 4.1.1, etc. */
 extern char *sys_errlist[];
@@ -20,10 +20,10 @@ extern char *sys_errlist[];
 
 #else	/* for for calling procedures */
 
-extern struct EMESS PROJ_DLL emess_dat;
+extern struct EMESS emess_dat;
 
 #endif /* use type */
 
-void PROJ_DLL emess(int, const char *, ...);
+void emess(int, const char *, ...);
 
 #endif /* end EMESS_H */
diff --git a/src/gen_cheb.cpp b/src/apps/gen_cheb.cpp
index 4ba514d4..4ba514d4 100644
--- a/src/gen_cheb.cpp
+++ b/src/apps/gen_cheb.cpp
diff --git a/src/geod.cpp b/src/apps/geod.cpp
index 7b6367c6..7b6367c6 100644
--- a/src/geod.cpp
+++ b/src/apps/geod.cpp
diff --git a/src/geod_interface.cpp b/src/apps/geod_interface.cpp
index a30377ac..a30377ac 100644
--- a/src/geod_interface.cpp
+++ b/src/apps/geod_interface.cpp
diff --git a/src/geod_interface.h b/src/apps/geod_interface.h
index 255d505a..255d505a 100644
--- a/src/geod_interface.h
+++ b/src/apps/geod_interface.h
diff --git a/src/geod_set.cpp b/src/apps/geod_set.cpp
index b9e9c42f..b9e9c42f 100644
--- a/src/geod_set.cpp
+++ b/src/apps/geod_set.cpp
diff --git a/src/gie.cpp b/src/apps/gie.cpp
index 3e4770a2..3e4770a2 100644
--- a/src/gie.cpp
+++ b/src/apps/gie.cpp
diff --git a/src/nad2bin.cpp b/src/apps/nad2bin.cpp
index ff8f2ebd..ff8f2ebd 100644
--- a/src/nad2bin.cpp
+++ b/src/apps/nad2bin.cpp
diff --git a/src/optargpm.h b/src/apps/optargpm.h
index 035c6f92..035c6f92 100644
--- a/src/optargpm.h
+++ b/src/apps/optargpm.h
diff --git a/src/p_series.cpp b/src/apps/p_series.cpp
index cddea888..cddea888 100644
--- a/src/p_series.cpp
+++ b/src/apps/p_series.cpp
diff --git a/src/proj.cpp b/src/apps/proj.cpp
index b93fb04d..b93fb04d 100644
--- a/src/proj.cpp
+++ b/src/apps/proj.cpp
diff --git a/src/proj_strtod.cpp b/src/apps/proj_strtod.cpp
index b8edc6a3..b8edc6a3 100644
--- a/src/proj_strtod.cpp
+++ b/src/apps/proj_strtod.cpp
diff --git a/src/proj_strtod.h b/src/apps/proj_strtod.h
index 38c2d1f4..38c2d1f4 100644
--- a/src/proj_strtod.h
+++ b/src/apps/proj_strtod.h
diff --git a/src/projinfo.cpp b/src/apps/projinfo.cpp
index d604365a..d604365a 100644
--- a/src/projinfo.cpp
+++ b/src/apps/projinfo.cpp
diff --git a/src/bin_cct.cmake b/src/bin_cct.cmake
index 11643bca..e400caf3 100644
--- a/src/bin_cct.cmake
+++ b/src/bin_cct.cmake
@@ -1,5 +1,5 @@
-set(CCT_SRC cct.cpp proj_strtod.cpp proj_strtod.h)
-set(CCT_INCLUDE optargpm.h)
+set(CCT_SRC apps/cct.cpp apps/proj_strtod.cpp apps/proj_strtod.h)
+set(CCT_INCLUDE apps/optargpm.h)
 
 source_group("Source Files\\Bin" FILES ${CCT_SRC})
 
diff --git a/src/bin_cs2cs.cmake b/src/bin_cs2cs.cmake
index 70d3b04d..c9543e89 100644
--- a/src/bin_cs2cs.cmake
+++ b/src/bin_cs2cs.cmake
@@ -1,6 +1,8 @@
-set(CS2CS_SRC cs2cs.cpp
-              gen_cheb.cpp 
-              p_series.cpp)
+set(CS2CS_SRC apps/cs2cs.cpp
+              apps/gen_cheb.cpp 
+              apps/p_series.cpp
+              apps/emess.cpp
+)
 
 source_group("Source Files\\Bin" FILES ${CS2CS_SRC})
 
diff --git a/src/bin_geod.cmake b/src/bin_geod.cmake
index fe0e5c08..049da318 100644
--- a/src/bin_geod.cmake
+++ b/src/bin_geod.cmake
@@ -1,6 +1,9 @@
-set(GEOD_SRC geod.cpp
-             geod_set.cpp geod_interface.cpp )
-set(GEOD_INCLUDE geod_interface.h)
+set(GEOD_SRC apps/geod.cpp
+             apps/geod_set.cpp
+             apps/geod_interface.cpp
+             apps/emess.cpp
+)
+set(GEOD_INCLUDE apps/geod_interface.h)
 
 source_group("Source Files\\Bin" FILES ${GEOD_SRC} ${GEOD_INCLUDE})
 
diff --git a/src/bin_geodtest.cmake b/src/bin_geodtest.cmake
index bfd6cf99..31de499d 100644
--- a/src/bin_geodtest.cmake
+++ b/src/bin_geodtest.cmake
@@ -1,4 +1,4 @@
-set(GEODTEST_SRC geodtest.cpp )
+set(GEODTEST_SRC tests/geodtest.cpp )
 set(GEODTEST_INCLUDE)
 
 source_group("Source Files\\Bin" FILES ${GEODTEST_SRC} ${GEODTEST_INCLUDE})
diff --git a/src/bin_gie.cmake b/src/bin_gie.cmake
index f59319fc..497315f9 100644
--- a/src/bin_gie.cmake
+++ b/src/bin_gie.cmake
@@ -1,5 +1,7 @@
-set(GIE_SRC gie.cpp proj_strtod.cpp proj_strtod.h)
-set(GIE_INCLUDE optargpm.h)
+set(GIE_SRC apps/gie.cpp
+            apps/proj_strtod.cpp
+            apps/proj_strtod.h)
+set(GIE_INCLUDE apps/optargpm.h)
 
 source_group("Source Files\\Bin" FILES ${GIE_SRC})
 
diff --git a/src/bin_nad2bin.cmake b/src/bin_nad2bin.cmake
index 3e1fa422..271aac93 100644
--- a/src/bin_nad2bin.cmake
+++ b/src/bin_nad2bin.cmake
@@ -3,7 +3,7 @@ if(WIN32 AND BUILD_LIBPROJ_SHARED)
 endif(WIN32 AND BUILD_LIBPROJ_SHARED)
 
 
-set(NAD2BIN_SRC nad2bin.cpp)
+set(NAD2BIN_SRC apps/nad2bin.cpp)
 source_group("Source Files\\Bin" FILES ${NAD2BIN_SRC})
 
 #Executable
diff --git a/src/bin_proj.cmake b/src/bin_proj.cmake
index 5911aa50..4bd690ff 100644
--- a/src/bin_proj.cmake
+++ b/src/bin_proj.cmake
@@ -1,6 +1,8 @@
-set(PROJ_SRC proj.cpp 
-             gen_cheb.cpp 
-             p_series.cpp)
+set(PROJ_SRC apps/proj.cpp 
+             apps/gen_cheb.cpp 
+             apps/p_series.cpp
+             apps/emess.cpp
+)
 
 source_group("Source Files\\Bin" FILES ${PROJ_SRC})
 
diff --git a/src/bin_projinfo.cmake b/src/bin_projinfo.cmake
index a422a16d..ea6f1006 100644
--- a/src/bin_projinfo.cmake
+++ b/src/bin_projinfo.cmake
@@ -1,4 +1,4 @@
-set(PROJINFO_SRC projinfo.cpp)
+set(PROJINFO_SRC apps/projinfo.cpp)
 
 source_group("Source Files\\Bin" FILES ${PROJINFO_SRC})
 
diff --git a/src/PJ_axisswap.cpp b/src/conversions/PJ_axisswap.cpp
index 8714ec85..8714ec85 100644
--- a/src/PJ_axisswap.cpp
+++ b/src/conversions/PJ_axisswap.cpp
diff --git a/src/PJ_cart.cpp b/src/conversions/PJ_cart.cpp
index 6fed9985..6fed9985 100644
--- a/src/PJ_cart.cpp
+++ b/src/conversions/PJ_cart.cpp
diff --git a/src/PJ_geoc.cpp b/src/conversions/PJ_geoc.cpp
index 0455fada..0455fada 100644
--- a/src/PJ_geoc.cpp
+++ b/src/conversions/PJ_geoc.cpp
diff --git a/src/PJ_unitconvert.cpp b/src/conversions/PJ_unitconvert.cpp
index b25fd5d2..b25fd5d2 100644
--- a/src/PJ_unitconvert.cpp
+++ b/src/conversions/PJ_unitconvert.cpp
diff --git a/src/pj_geocent.cpp b/src/conversions/pj_geocent.cpp
index 0e9d725e..0e9d725e 100644
--- a/src/pj_geocent.cpp
+++ b/src/conversions/pj_geocent.cpp
diff --git a/src/c_api.cpp b/src/iso19111/c_api.cpp
index d0b5d720..d0b5d720 100644
--- a/src/c_api.cpp
+++ b/src/iso19111/c_api.cpp
diff --git a/src/common.cpp b/src/iso19111/common.cpp
index bd690924..bd690924 100644
--- a/src/common.cpp
+++ b/src/iso19111/common.cpp
diff --git a/src/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp
index 442a9b78..442a9b78 100644
--- a/src/coordinateoperation.cpp
+++ b/src/iso19111/coordinateoperation.cpp
diff --git a/src/coordinatesystem.cpp b/src/iso19111/coordinatesystem.cpp
index a3ad04e0..a3ad04e0 100644
--- a/src/coordinatesystem.cpp
+++ b/src/iso19111/coordinatesystem.cpp
diff --git a/src/crs.cpp b/src/iso19111/crs.cpp
index a05470ff..a05470ff 100644
--- a/src/crs.cpp
+++ b/src/iso19111/crs.cpp
diff --git a/src/datum.cpp b/src/iso19111/datum.cpp
index 16e86296..16e86296 100644
--- a/src/datum.cpp
+++ b/src/iso19111/datum.cpp
diff --git a/src/factory.cpp b/src/iso19111/factory.cpp
index 47d31db9..47d31db9 100644
--- a/src/factory.cpp
+++ b/src/iso19111/factory.cpp
diff --git a/src/internal.cpp b/src/iso19111/internal.cpp
index c43605d1..c43605d1 100644
--- a/src/internal.cpp
+++ b/src/iso19111/internal.cpp
diff --git a/src/io.cpp b/src/iso19111/io.cpp
index fe3680fb..fe3680fb 100644
--- a/src/io.cpp
+++ b/src/iso19111/io.cpp
diff --git a/src/metadata.cpp b/src/iso19111/metadata.cpp
index 2be9dac3..2be9dac3 100644
--- a/src/metadata.cpp
+++ b/src/iso19111/metadata.cpp
diff --git a/src/static.cpp b/src/iso19111/static.cpp
index 5de046f1..5de046f1 100644
--- a/src/static.cpp
+++ b/src/iso19111/static.cpp
diff --git a/src/util.cpp b/src/iso19111/util.cpp
index ac6357a2..ac6357a2 100644
--- a/src/util.cpp
+++ b/src/iso19111/util.cpp
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index 7be6302b..237f26ec 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -54,219 +54,179 @@ endif()
 ##############################################
 ###  library source list and include_list  ###
 ##############################################
-SET(SRC_LIBPROJ_PJ
-        nad_init.cpp
-        PJ_aea.cpp
-        PJ_aeqd.cpp
-        PJ_affine.cpp
-        PJ_airy.cpp
-        PJ_aitoff.cpp
-        PJ_august.cpp
-        PJ_axisswap.cpp
-        PJ_bacon.cpp
-        PJ_bertin1953.cpp
-        PJ_bipc.cpp
-        PJ_boggs.cpp
-        PJ_bonne.cpp
-        PJ_calcofi.cpp
-        PJ_cart.cpp
-        PJ_cass.cpp
-        PJ_cc.cpp
-        PJ_ccon.cpp
-        PJ_cea.cpp
-        PJ_chamb.cpp
-        PJ_collg.cpp
-        PJ_comill.cpp
-        PJ_crast.cpp
-        PJ_deformation.cpp
-        PJ_denoy.cpp
-        PJ_eck1.cpp
-        PJ_eck2.cpp
-        PJ_eck3.cpp
-        PJ_eck4.cpp
-        PJ_eck5.cpp
-        PJ_eqc.cpp
-        PJ_eqdc.cpp
-        PJ_eqearth.cpp
-        PJ_fahey.cpp
-        PJ_fouc_s.cpp
-        PJ_gall.cpp
-        PJ_geoc.cpp
-        PJ_geos.cpp
-        PJ_gins8.cpp
-        PJ_gnom.cpp
-        PJ_gn_sinu.cpp
-        PJ_goode.cpp
-        PJ_gstmerc.cpp
-        PJ_hammer.cpp
-        PJ_hatano.cpp
-        PJ_helmert.cpp
-        PJ_hgridshift.cpp
-        PJ_horner.cpp
-        PJ_igh.cpp
-        PJ_isea.cpp
-        PJ_imw_p.cpp
-        PJ_krovak.cpp
-        PJ_labrd.cpp
-        PJ_laea.cpp
-        PJ_lagrng.cpp
-        PJ_larr.cpp
-        PJ_lask.cpp
-        PJ_latlong.cpp
-        PJ_lcca.cpp
-        PJ_lcc.cpp
-        PJ_loxim.cpp
-        PJ_lsat.cpp
-        PJ_misrsom.cpp
-        PJ_mbt_fps.cpp
-        PJ_mbtfpp.cpp
-        PJ_mbtfpq.cpp
-        PJ_merc.cpp
-        PJ_mill.cpp
-        PJ_mod_ster.cpp
-        PJ_moll.cpp
-        PJ_molodensky.cpp
-        PJ_natearth.cpp
-        PJ_natearth2.cpp
-        PJ_nell.cpp
-        PJ_nell_h.cpp
-        PJ_nocol.cpp
-        PJ_nsper.cpp
-        PJ_nzmg.cpp
-        PJ_ob_tran.cpp
-        PJ_ocea.cpp
-        PJ_oea.cpp
-        PJ_omerc.cpp
-        PJ_ortho.cpp
-        PJ_patterson.cpp
-        PJ_pipeline.cpp
-        PJ_poly.cpp
-        PJ_putp2.cpp
-        PJ_putp3.cpp
-        PJ_putp4p.cpp
-        PJ_putp5.cpp
-        PJ_putp6.cpp
-        PJ_qsc.cpp
-        PJ_robin.cpp
-        PJ_rpoly.cpp
-        PJ_sch.cpp
-        PJ_sconics.cpp
-        PJ_somerc.cpp
-        PJ_sterea.cpp
-        PJ_stere.cpp
-        PJ_sts.cpp
-        PJ_tcc.cpp
-        PJ_tcea.cpp
-        PJ_times.cpp
-        PJ_tmerc.cpp
-        PJ_tobmerc.cpp
-        PJ_tpeqd.cpp
-        PJ_unitconvert.cpp
-        PJ_urm5.cpp
-        PJ_urmfps.cpp
-        PJ_vandg.cpp
-        PJ_vandg2.cpp
-        PJ_vandg4.cpp
-        PJ_vgridshift.cpp
-        PJ_wag2.cpp
-        PJ_wag3.cpp
-        PJ_wag7.cpp
-        PJ_wink1.cpp
-        PJ_wink2.cpp
-        proj_etmerc.cpp
+
+SET(SRC_LIBPROJ_PROJECTIONS
+        projections/PJ_aeqd.cpp
+        projections/PJ_gnom.cpp
+        projections/PJ_laea.cpp
+        projections/PJ_mod_ster.cpp
+        projections/PJ_nsper.cpp
+        projections/PJ_nzmg.cpp
+        projections/PJ_ortho.cpp
+        projections/PJ_stere.cpp
+        projections/PJ_sterea.cpp
+        projections/PJ_aea.cpp
+        projections/PJ_bipc.cpp
+        projections/PJ_bonne.cpp
+        projections/PJ_eqdc.cpp
+        projections/PJ_isea.cpp
+        projections/PJ_ccon.cpp
+        projections/PJ_imw_p.cpp
+        projections/PJ_krovak.cpp
+        projections/PJ_lcc.cpp
+        projections/PJ_poly.cpp
+        projections/PJ_rpoly.cpp
+        projections/PJ_sconics.cpp
+        projections/proj_rouss.cpp
+        projections/PJ_cass.cpp
+        projections/PJ_cc.cpp
+        projections/PJ_cea.cpp
+        projections/PJ_eqc.cpp
+        projections/PJ_gall.cpp
+        projections/PJ_labrd.cpp
+        projections/PJ_lsat.cpp
+        projections/PJ_misrsom.cpp
+        projections/PJ_merc.cpp
+        projections/PJ_mill.cpp
+        projections/PJ_ocea.cpp
+        projections/PJ_omerc.cpp
+        projections/PJ_somerc.cpp
+        projections/PJ_tcc.cpp
+        projections/PJ_tcea.cpp
+        projections/PJ_times.cpp
+        projections/PJ_tmerc.cpp
+        projections/PJ_tobmerc.cpp
+        projections/PJ_airy.cpp
+        projections/PJ_aitoff.cpp
+        projections/PJ_august.cpp
+        projections/PJ_bacon.cpp
+        projections/PJ_bertin1953.cpp
+        projections/PJ_chamb.cpp
+        projections/PJ_hammer.cpp
+        projections/PJ_lagrng.cpp
+        projections/PJ_larr.cpp
+        projections/PJ_lask.cpp
+        projections/PJ_latlong.cpp
+        projections/PJ_nocol.cpp
+        projections/PJ_ob_tran.cpp
+        projections/PJ_oea.cpp
+        projections/PJ_tpeqd.cpp
+        projections/PJ_vandg.cpp
+        projections/PJ_vandg2.cpp
+        projections/PJ_vandg4.cpp
+        projections/PJ_wag7.cpp
+        projections/PJ_lcca.cpp
+        projections/PJ_geos.cpp
+        projections/proj_etmerc.cpp
+        projections/PJ_boggs.cpp
+        projections/PJ_collg.cpp
+        projections/PJ_comill.cpp
+        projections/PJ_crast.cpp
+        projections/PJ_denoy.cpp
+        projections/PJ_eck1.cpp
+        projections/PJ_eck2.cpp
+        projections/PJ_eck3.cpp
+        projections/PJ_eck4.cpp
+        projections/PJ_eck5.cpp
+        projections/PJ_fahey.cpp
+        projections/PJ_fouc_s.cpp
+        projections/PJ_gins8.cpp
+        projections/PJ_gstmerc.cpp
+        projections/PJ_gn_sinu.cpp
+        projections/PJ_goode.cpp
+        projections/PJ_igh.cpp
+        projections/PJ_hatano.cpp
+        projections/PJ_loxim.cpp
+        projections/PJ_mbt_fps.cpp
+        projections/PJ_mbtfpp.cpp
+        projections/PJ_mbtfpq.cpp
+        projections/PJ_moll.cpp
+        projections/PJ_nell.cpp
+        projections/PJ_nell_h.cpp
+        projections/PJ_patterson.cpp
+        projections/PJ_putp2.cpp
+        projections/PJ_putp3.cpp
+        projections/PJ_putp4p.cpp
+        projections/PJ_putp5.cpp
+        projections/PJ_putp6.cpp
+        projections/PJ_qsc.cpp
+        projections/PJ_robin.cpp
+        projections/PJ_sch.cpp
+        projections/PJ_sts.cpp
+        projections/PJ_urm5.cpp
+        projections/PJ_urmfps.cpp
+        projections/PJ_wag2.cpp
+        projections/PJ_wag3.cpp
+        projections/PJ_wink1.cpp
+        projections/PJ_wink2.cpp
+        projections/PJ_healpix.cpp
+        projections/PJ_natearth.cpp
+        projections/PJ_natearth2.cpp
+        projections/PJ_calcofi.cpp
+        projections/PJ_eqearth.cpp
+)
+
+SET(SRC_LIBPROJ_CONVERSIONS
+        conversions/PJ_axisswap.cpp
+        conversions/PJ_cart.cpp
+        conversions/PJ_geoc.cpp
+        conversions/pj_geocent.cpp
+        conversions/PJ_unitconvert.cpp
+)
+
+SET(SRC_LIBPROJ_TRANSFORMATIONS
+        transformations/PJ_affine.cpp
+        transformations/PJ_deformation.cpp
+        transformations/PJ_helmert.cpp
+        transformations/PJ_hgridshift.cpp
+        transformations/PJ_horner.cpp
+        transformations/PJ_molodensky.cpp
+        transformations/PJ_vgridshift.cpp
+)
+
+SET(SRC_LIBPROJ_ISO19111
+        iso19111/static.cpp
+        iso19111/util.cpp
+        iso19111/metadata.cpp
+        iso19111/common.cpp
+        iso19111/crs.cpp
+        iso19111/datum.cpp
+        iso19111/coordinatesystem.cpp
+        iso19111/coordinateoperation.cpp
+        iso19111/io.cpp
+        iso19111/internal.cpp
+        iso19111/factory.cpp
+        iso19111/c_api.cpp
 )
 
 SET(SRC_LIBPROJ_CORE
-        aasincos.cpp
-        adjlon.cpp
-        bch2bps.cpp
-        bchgen.cpp
-        biveval.cpp
-        dmstor.cpp
-        emess.cpp
-        emess.h
-        geocent.cpp
-        geocent.h
-        geodesic.cpp
-        mk_cheby.cpp
-        nad_cvt.cpp
-        nad_init.cpp
-        nad_intr.cpp
-        pj_apply_gridshift.cpp
-        pj_apply_vgridshift.cpp
-        pj_auth.cpp
-        pj_ctx.cpp
+        pj_list.h proj_internal.h proj_math.h projects.h
+        aasincos.cpp adjlon.cpp bch2bps.cpp bchgen.cpp
+        biveval.cpp dmstor.cpp mk_cheby.cpp pj_auth.cpp
+        pj_deriv.cpp pj_ell_set.cpp pj_ellps.cpp pj_errno.cpp
+        pj_factors.cpp pj_fwd.cpp pj_init.cpp pj_inv.cpp
+        pj_list.cpp pj_malloc.cpp pj_mlfn.cpp pj_msfn.cpp proj_mdist.cpp
+        pj_open_lib.cpp pj_param.cpp pj_phi2.cpp pj_pr_list.cpp
+        pj_qsfn.cpp pj_strerrno.cpp
+        pj_tsfn.cpp pj_units.cpp pj_ctx.cpp pj_log.cpp pj_zpoly1.cpp rtodms.cpp
+        vector1.cpp pj_release.cpp pj_gauss.cpp
         pj_fileapi.cpp
-        pj_datum_set.cpp
-        pj_datums.cpp
-        pj_deriv.cpp
-        pj_ell_set.cpp
-        pj_ellps.cpp
-        pj_errno.cpp
-        pj_factors.cpp
-        pj_fwd.cpp
-        pj_gauss.cpp
-        pj_gc_reader.cpp
-        pj_geocent.cpp
-        pj_gridcatalog.cpp
-        pj_gridinfo.cpp
-        pj_gridlist.cpp
-        PJ_healpix.cpp
-        pj_init.cpp
-        pj_initcache.cpp
-        pj_inv.cpp
-        pj_list.cpp
-        pj_list.h
-        pj_log.cpp
-        pj_malloc.cpp
-        pj_math.cpp
-        pj_mlfn.cpp
-        pj_msfn.cpp
-        pj_mutex.cpp
-        proj_4D_api.cpp
+        pj_gc_reader.cpp pj_gridcatalog.cpp
+        nad_cvt.cpp nad_init.cpp nad_intr.cpp
+        pj_apply_gridshift.cpp pj_datums.cpp pj_datum_set.cpp pj_transform.cpp
+        geocent.cpp geocent.h pj_utils.cpp pj_gridinfo.cpp pj_gridlist.cpp
+        jniproj.cpp pj_mutex.cpp pj_initcache.cpp pj_apply_vgridshift.cpp geodesic.cpp
+        pj_strtod.cpp pj_math.cpp
+        proj_4D_api.cpp PJ_pipeline.cpp
         pj_internal.cpp
-        proj_internal.h
-        pj_open_lib.cpp
-        pj_param.cpp
-        pj_phi2.cpp
-        pj_pr_list.cpp
-        pj_qsfn.cpp
-        pj_release.cpp
-        pj_strerrno.cpp
-        pj_transform.cpp
-        pj_tsfn.cpp
-        pj_units.cpp
-        pj_utils.cpp
-        pj_zpoly1.cpp
-        proj_mdist.cpp
-        proj_math.h
-        proj_rouss.cpp
-        rtodms.cpp
-        vector1.cpp
-        pj_strtod.cpp
-        pj_wkt1_generated_parser.c
-        pj_wkt2_generated_parser.c
+        pj_wkt_parser.hpp pj_wkt_parser.cpp
+        pj_wkt1_parser.h pj_wkt1_parser.cpp
+        pj_wkt1_generated_parser.h pj_wkt1_generated_parser.c
+        pj_wkt2_parser.h pj_wkt2_parser.cpp
+        pj_wkt2_generated_parser.h pj_wkt2_generated_parser.c
         ${CMAKE_CURRENT_BINARY_DIR}/proj_config.h
 )
 
-set(SRC_LIBPROJ_CPP
-        static.cpp
-        common.cpp
-        coordinateoperation.cpp
-        coordinatesystem.cpp
-        crs.cpp
-        datum.cpp
-        io.cpp
-        metadata.cpp
-        util.cpp
-        internal.cpp
-        factory.cpp
-        c_api.cpp
-        pj_wkt_parser.cpp
-        pj_wkt1_parser.cpp
-        pj_wkt2_parser.cpp
-)
-
 set(HEADERS_LIBPROJ
         proj_api.h
         proj.h
@@ -278,8 +238,10 @@ set(HEADERS_LIBPROJ
 # Group source files for IDE source explorers (e.g. Visual Studio)
 source_group("Header Files" FILES ${HEADERS_LIBPROJ})
 source_group("Source Files\\Core" FILES ${SRC_LIBPROJ_CORE})
-source_group("Source Files\\PJ" FILES ${SRC_LIBPROJ_PJ})
-source_group("Source Files\\C++" FILES ${SRC_LIBPROJ_CPP})
+source_group("Source Files\\Conversions" FILES ${SRC_LIBPROJ_CONVERSIONS})
+source_group("Source Files\\Projections" FILES ${SRC_LIBPROJ_PROJECTIONS})
+source_group("Source Files\\Transformations" FILES ${SRC_LIBPROJ_TRANSFORMATIONS})
+source_group("Source Files\\ISO19111" FILES ${SRC_LIBPROJ_ISO19111})
 
 include_directories(${CMAKE_SOURCE_DIR}/include)
 
@@ -313,7 +275,12 @@ endif(JNI_SUPPORT)
 #################################################
 ## targets: libproj and proj_config.h
 #################################################
-set(ALL_LIBPROJ_SOURCES ${SRC_LIBPROJ_PJ} ${SRC_LIBPROJ_CORE} ${SRC_LIBPROJ_CPP})
+set(ALL_LIBPROJ_SOURCES ${SRC_LIBPROJ_CORE}
+                        ${SRC_LIBPROJ_CONVERSIONS}
+                        ${SRC_LIBPROJ_PROJECTIONS}
+                        ${SRC_LIBPROJ_TRANSFORMATIONS}
+                        ${SRC_LIBPROJ_ISO19111}
+)
 set(ALL_LIBPROJ_HEADERS ${HEADERS_LIBPROJ} )
 
 # Core targets configuration
diff --git a/src/PJ_aea.cpp b/src/projections/PJ_aea.cpp
index c4a4a72a..c4a4a72a 100644
--- a/src/PJ_aea.cpp
+++ b/src/projections/PJ_aea.cpp
diff --git a/src/PJ_aeqd.cpp b/src/projections/PJ_aeqd.cpp
index 1a350d90..1a350d90 100644
--- a/src/PJ_aeqd.cpp
+++ b/src/projections/PJ_aeqd.cpp
diff --git a/src/PJ_airy.cpp b/src/projections/PJ_airy.cpp
index 0eb5efd7..0eb5efd7 100644
--- a/src/PJ_airy.cpp
+++ b/src/projections/PJ_airy.cpp
diff --git a/src/PJ_aitoff.cpp b/src/projections/PJ_aitoff.cpp
index effd2c29..effd2c29 100644
--- a/src/PJ_aitoff.cpp
+++ b/src/projections/PJ_aitoff.cpp
diff --git a/src/PJ_august.cpp b/src/projections/PJ_august.cpp
index b5a21ef7..b5a21ef7 100644
--- a/src/PJ_august.cpp
+++ b/src/projections/PJ_august.cpp
diff --git a/src/PJ_bacon.cpp b/src/projections/PJ_bacon.cpp
index 6c6350fe..6c6350fe 100644
--- a/src/PJ_bacon.cpp
+++ b/src/projections/PJ_bacon.cpp
diff --git a/src/PJ_bertin1953.cpp b/src/projections/PJ_bertin1953.cpp
index 2203d6f1..2203d6f1 100644
--- a/src/PJ_bertin1953.cpp
+++ b/src/projections/PJ_bertin1953.cpp
diff --git a/src/PJ_bipc.cpp b/src/projections/PJ_bipc.cpp
index 19a6bbe1..19a6bbe1 100644
--- a/src/PJ_bipc.cpp
+++ b/src/projections/PJ_bipc.cpp
diff --git a/src/PJ_boggs.cpp b/src/projections/PJ_boggs.cpp
index 119357c0..119357c0 100644
--- a/src/PJ_boggs.cpp
+++ b/src/projections/PJ_boggs.cpp
diff --git a/src/PJ_bonne.cpp b/src/projections/PJ_bonne.cpp
index 385c1c4b..385c1c4b 100644
--- a/src/PJ_bonne.cpp
+++ b/src/projections/PJ_bonne.cpp
diff --git a/src/PJ_calcofi.cpp b/src/projections/PJ_calcofi.cpp
index e81e4d2a..e81e4d2a 100644
--- a/src/PJ_calcofi.cpp
+++ b/src/projections/PJ_calcofi.cpp
diff --git a/src/PJ_cass.cpp b/src/projections/PJ_cass.cpp
index c831558c..c831558c 100644
--- a/src/PJ_cass.cpp
+++ b/src/projections/PJ_cass.cpp
diff --git a/src/PJ_cc.cpp b/src/projections/PJ_cc.cpp
index 152e6e4a..152e6e4a 100644
--- a/src/PJ_cc.cpp
+++ b/src/projections/PJ_cc.cpp
diff --git a/src/PJ_ccon.cpp b/src/projections/PJ_ccon.cpp
index 4f7dedb4..4f7dedb4 100644
--- a/src/PJ_ccon.cpp
+++ b/src/projections/PJ_ccon.cpp
diff --git a/src/PJ_cea.cpp b/src/projections/PJ_cea.cpp
index f8275b62..f8275b62 100644
--- a/src/PJ_cea.cpp
+++ b/src/projections/PJ_cea.cpp
diff --git a/src/PJ_chamb.cpp b/src/projections/PJ_chamb.cpp
index a490e817..a490e817 100644
--- a/src/PJ_chamb.cpp
+++ b/src/projections/PJ_chamb.cpp
diff --git a/src/PJ_collg.cpp b/src/projections/PJ_collg.cpp
index 7904de29..7904de29 100644
--- a/src/PJ_collg.cpp
+++ b/src/projections/PJ_collg.cpp
diff --git a/src/PJ_comill.cpp b/src/projections/PJ_comill.cpp
index b6e0192e..b6e0192e 100644
--- a/src/PJ_comill.cpp
+++ b/src/projections/PJ_comill.cpp
diff --git a/src/PJ_crast.cpp b/src/projections/PJ_crast.cpp
index 4e4dee8b..4e4dee8b 100644
--- a/src/PJ_crast.cpp
+++ b/src/projections/PJ_crast.cpp
diff --git a/src/PJ_denoy.cpp b/src/projections/PJ_denoy.cpp
index 5c337c45..5c337c45 100644
--- a/src/PJ_denoy.cpp
+++ b/src/projections/PJ_denoy.cpp
diff --git a/src/PJ_eck1.cpp b/src/projections/PJ_eck1.cpp
index 88a7430c..88a7430c 100644
--- a/src/PJ_eck1.cpp
+++ b/src/projections/PJ_eck1.cpp
diff --git a/src/PJ_eck2.cpp b/src/projections/PJ_eck2.cpp
index f76ab4ec..f76ab4ec 100644
--- a/src/PJ_eck2.cpp
+++ b/src/projections/PJ_eck2.cpp
diff --git a/src/PJ_eck3.cpp b/src/projections/PJ_eck3.cpp
index 90376631..90376631 100644
--- a/src/PJ_eck3.cpp
+++ b/src/projections/PJ_eck3.cpp
diff --git a/src/PJ_eck4.cpp b/src/projections/PJ_eck4.cpp
index 4fa4c21f..4fa4c21f 100644
--- a/src/PJ_eck4.cpp
+++ b/src/projections/PJ_eck4.cpp
diff --git a/src/PJ_eck5.cpp b/src/projections/PJ_eck5.cpp
index f9f28460..f9f28460 100644
--- a/src/PJ_eck5.cpp
+++ b/src/projections/PJ_eck5.cpp
diff --git a/src/PJ_eqc.cpp b/src/projections/PJ_eqc.cpp
index 3fdb6dc0..3fdb6dc0 100644
--- a/src/PJ_eqc.cpp
+++ b/src/projections/PJ_eqc.cpp
diff --git a/src/PJ_eqdc.cpp b/src/projections/PJ_eqdc.cpp
index 0831fca4..0831fca4 100644
--- a/src/PJ_eqdc.cpp
+++ b/src/projections/PJ_eqdc.cpp
diff --git a/src/PJ_eqearth.cpp b/src/projections/PJ_eqearth.cpp
index e5c1f974..e5c1f974 100644
--- a/src/PJ_eqearth.cpp
+++ b/src/projections/PJ_eqearth.cpp
diff --git a/src/PJ_fahey.cpp b/src/projections/PJ_fahey.cpp
index 85e0ab69..85e0ab69 100644
--- a/src/PJ_fahey.cpp
+++ b/src/projections/PJ_fahey.cpp
diff --git a/src/PJ_fouc_s.cpp b/src/projections/PJ_fouc_s.cpp
index c5e711de..c5e711de 100644
--- a/src/PJ_fouc_s.cpp
+++ b/src/projections/PJ_fouc_s.cpp
diff --git a/src/PJ_gall.cpp b/src/projections/PJ_gall.cpp
index a8697482..a8697482 100644
--- a/src/PJ_gall.cpp
+++ b/src/projections/PJ_gall.cpp
diff --git a/src/PJ_geos.cpp b/src/projections/PJ_geos.cpp
index 90fb01ab..90fb01ab 100644
--- a/src/PJ_geos.cpp
+++ b/src/projections/PJ_geos.cpp
diff --git a/src/PJ_gins8.cpp b/src/projections/PJ_gins8.cpp
index cc422437..cc422437 100644
--- a/src/PJ_gins8.cpp
+++ b/src/projections/PJ_gins8.cpp
diff --git a/src/PJ_gn_sinu.cpp b/src/projections/PJ_gn_sinu.cpp
index 530de229..530de229 100644
--- a/src/PJ_gn_sinu.cpp
+++ b/src/projections/PJ_gn_sinu.cpp
diff --git a/src/PJ_gnom.cpp b/src/projections/PJ_gnom.cpp
index a4b5e35d..a4b5e35d 100644
--- a/src/PJ_gnom.cpp
+++ b/src/projections/PJ_gnom.cpp
diff --git a/src/PJ_goode.cpp b/src/projections/PJ_goode.cpp
index c79d125e..c79d125e 100644
--- a/src/PJ_goode.cpp
+++ b/src/projections/PJ_goode.cpp
diff --git a/src/PJ_gstmerc.cpp b/src/projections/PJ_gstmerc.cpp
index 9b819bac..9b819bac 100644
--- a/src/PJ_gstmerc.cpp
+++ b/src/projections/PJ_gstmerc.cpp
diff --git a/src/PJ_hammer.cpp b/src/projections/PJ_hammer.cpp
index d4caa656..d4caa656 100644
--- a/src/PJ_hammer.cpp
+++ b/src/projections/PJ_hammer.cpp
diff --git a/src/PJ_hatano.cpp b/src/projections/PJ_hatano.cpp
index 019671cc..019671cc 100644
--- a/src/PJ_hatano.cpp
+++ b/src/projections/PJ_hatano.cpp
diff --git a/src/PJ_healpix.cpp b/src/projections/PJ_healpix.cpp
index 7f0b3e83..7f0b3e83 100644
--- a/src/PJ_healpix.cpp
+++ b/src/projections/PJ_healpix.cpp
diff --git a/src/PJ_igh.cpp b/src/projections/PJ_igh.cpp
index e3576861..e3576861 100644
--- a/src/PJ_igh.cpp
+++ b/src/projections/PJ_igh.cpp
diff --git a/src/PJ_imw_p.cpp b/src/projections/PJ_imw_p.cpp
index 012c5caa..012c5caa 100644
--- a/src/PJ_imw_p.cpp
+++ b/src/projections/PJ_imw_p.cpp
diff --git a/src/PJ_isea.cpp b/src/projections/PJ_isea.cpp
index 522e6813..522e6813 100644
--- a/src/PJ_isea.cpp
+++ b/src/projections/PJ_isea.cpp
diff --git a/src/PJ_krovak.cpp b/src/projections/PJ_krovak.cpp
index 9ecffb89..9ecffb89 100644
--- a/src/PJ_krovak.cpp
+++ b/src/projections/PJ_krovak.cpp
diff --git a/src/PJ_labrd.cpp b/src/projections/PJ_labrd.cpp
index d3930243..d3930243 100644
--- a/src/PJ_labrd.cpp
+++ b/src/projections/PJ_labrd.cpp
diff --git a/src/PJ_laea.cpp b/src/projections/PJ_laea.cpp
index dd02c75a..dd02c75a 100644
--- a/src/PJ_laea.cpp
+++ b/src/projections/PJ_laea.cpp
diff --git a/src/PJ_lagrng.cpp b/src/projections/PJ_lagrng.cpp
index 8c0150aa..8c0150aa 100644
--- a/src/PJ_lagrng.cpp
+++ b/src/projections/PJ_lagrng.cpp
diff --git a/src/PJ_larr.cpp b/src/projections/PJ_larr.cpp
index e4d5d240..e4d5d240 100644
--- a/src/PJ_larr.cpp
+++ b/src/projections/PJ_larr.cpp
diff --git a/src/PJ_lask.cpp b/src/projections/PJ_lask.cpp
index 46f23edb..46f23edb 100644
--- a/src/PJ_lask.cpp
+++ b/src/projections/PJ_lask.cpp
diff --git a/src/PJ_latlong.cpp b/src/projections/PJ_latlong.cpp
index 1331d59a..1331d59a 100644
--- a/src/PJ_latlong.cpp
+++ b/src/projections/PJ_latlong.cpp
diff --git a/src/PJ_lcc.cpp b/src/projections/PJ_lcc.cpp
index 7d6e3f57..7d6e3f57 100644
--- a/src/PJ_lcc.cpp
+++ b/src/projections/PJ_lcc.cpp
diff --git a/src/PJ_lcca.cpp b/src/projections/PJ_lcca.cpp
index 70b5dff9..70b5dff9 100644
--- a/src/PJ_lcca.cpp
+++ b/src/projections/PJ_lcca.cpp
diff --git a/src/PJ_loxim.cpp b/src/projections/PJ_loxim.cpp
index f68e844a..f68e844a 100644
--- a/src/PJ_loxim.cpp
+++ b/src/projections/PJ_loxim.cpp
diff --git a/src/PJ_lsat.cpp b/src/projections/PJ_lsat.cpp
index a0eca1bd..a0eca1bd 100644
--- a/src/PJ_lsat.cpp
+++ b/src/projections/PJ_lsat.cpp
diff --git a/src/PJ_mbt_fps.cpp b/src/projections/PJ_mbt_fps.cpp
index 66ed9458..66ed9458 100644
--- a/src/PJ_mbt_fps.cpp
+++ b/src/projections/PJ_mbt_fps.cpp
diff --git a/src/PJ_mbtfpp.cpp b/src/projections/PJ_mbtfpp.cpp
index 276a43eb..276a43eb 100644
--- a/src/PJ_mbtfpp.cpp
+++ b/src/projections/PJ_mbtfpp.cpp
diff --git a/src/PJ_mbtfpq.cpp b/src/projections/PJ_mbtfpq.cpp
index b7c0eb16..b7c0eb16 100644
--- a/src/PJ_mbtfpq.cpp
+++ b/src/projections/PJ_mbtfpq.cpp
diff --git a/src/PJ_merc.cpp b/src/projections/PJ_merc.cpp
index 1998234e..1998234e 100644
--- a/src/PJ_merc.cpp
+++ b/src/projections/PJ_merc.cpp
diff --git a/src/PJ_mill.cpp b/src/projections/PJ_mill.cpp
index 3ea9636f..3ea9636f 100644
--- a/src/PJ_mill.cpp
+++ b/src/projections/PJ_mill.cpp
diff --git a/src/PJ_misrsom.cpp b/src/projections/PJ_misrsom.cpp
index c84b96e3..c84b96e3 100644
--- a/src/PJ_misrsom.cpp
+++ b/src/projections/PJ_misrsom.cpp
diff --git a/src/PJ_mod_ster.cpp b/src/projections/PJ_mod_ster.cpp
index 7c4f363b..7c4f363b 100644
--- a/src/PJ_mod_ster.cpp
+++ b/src/projections/PJ_mod_ster.cpp
diff --git a/src/PJ_moll.cpp b/src/projections/PJ_moll.cpp
index c877a1bb..c877a1bb 100644
--- a/src/PJ_moll.cpp
+++ b/src/projections/PJ_moll.cpp
diff --git a/src/PJ_natearth.cpp b/src/projections/PJ_natearth.cpp
index 27a6b137..27a6b137 100644
--- a/src/PJ_natearth.cpp
+++ b/src/projections/PJ_natearth.cpp
diff --git a/src/PJ_natearth2.cpp b/src/projections/PJ_natearth2.cpp
index f6aba671..f6aba671 100644
--- a/src/PJ_natearth2.cpp
+++ b/src/projections/PJ_natearth2.cpp
diff --git a/src/PJ_nell.cpp b/src/projections/PJ_nell.cpp
index 2a7ea32c..2a7ea32c 100644
--- a/src/PJ_nell.cpp
+++ b/src/projections/PJ_nell.cpp
diff --git a/src/PJ_nell_h.cpp b/src/projections/PJ_nell_h.cpp
index 28c3ace7..28c3ace7 100644
--- a/src/PJ_nell_h.cpp
+++ b/src/projections/PJ_nell_h.cpp
diff --git a/src/PJ_nocol.cpp b/src/projections/PJ_nocol.cpp
index 541d08b2..541d08b2 100644
--- a/src/PJ_nocol.cpp
+++ b/src/projections/PJ_nocol.cpp
diff --git a/src/PJ_nsper.cpp b/src/projections/PJ_nsper.cpp
index f93010f8..f93010f8 100644
--- a/src/PJ_nsper.cpp
+++ b/src/projections/PJ_nsper.cpp
diff --git a/src/PJ_nzmg.cpp b/src/projections/PJ_nzmg.cpp
index bf0862fb..bf0862fb 100644
--- a/src/PJ_nzmg.cpp
+++ b/src/projections/PJ_nzmg.cpp
diff --git a/src/PJ_ob_tran.cpp b/src/projections/PJ_ob_tran.cpp
index d34059a9..d34059a9 100644
--- a/src/PJ_ob_tran.cpp
+++ b/src/projections/PJ_ob_tran.cpp
diff --git a/src/PJ_ocea.cpp b/src/projections/PJ_ocea.cpp
index 0576ace7..0576ace7 100644
--- a/src/PJ_ocea.cpp
+++ b/src/projections/PJ_ocea.cpp
diff --git a/src/PJ_oea.cpp b/src/projections/PJ_oea.cpp
index 0c401b2f..0c401b2f 100644
--- a/src/PJ_oea.cpp
+++ b/src/projections/PJ_oea.cpp
diff --git a/src/PJ_omerc.cpp b/src/projections/PJ_omerc.cpp
index ead07128..ead07128 100644
--- a/src/PJ_omerc.cpp
+++ b/src/projections/PJ_omerc.cpp
diff --git a/src/PJ_ortho.cpp b/src/projections/PJ_ortho.cpp
index 6ea55248..6ea55248 100644
--- a/src/PJ_ortho.cpp
+++ b/src/projections/PJ_ortho.cpp
diff --git a/src/PJ_patterson.cpp b/src/projections/PJ_patterson.cpp
index 0d19414e..0d19414e 100644
--- a/src/PJ_patterson.cpp
+++ b/src/projections/PJ_patterson.cpp
diff --git a/src/PJ_poly.cpp b/src/projections/PJ_poly.cpp
index a970fdb1..a970fdb1 100644
--- a/src/PJ_poly.cpp
+++ b/src/projections/PJ_poly.cpp
diff --git a/src/PJ_putp2.cpp b/src/projections/PJ_putp2.cpp
index d7a847c8..d7a847c8 100644
--- a/src/PJ_putp2.cpp
+++ b/src/projections/PJ_putp2.cpp
diff --git a/src/PJ_putp3.cpp b/src/projections/PJ_putp3.cpp
index 98bb2ff0..98bb2ff0 100644
--- a/src/PJ_putp3.cpp
+++ b/src/projections/PJ_putp3.cpp
diff --git a/src/PJ_putp4p.cpp b/src/projections/PJ_putp4p.cpp
index 608fc76e..608fc76e 100644
--- a/src/PJ_putp4p.cpp
+++ b/src/projections/PJ_putp4p.cpp
diff --git a/src/PJ_putp5.cpp b/src/projections/PJ_putp5.cpp
index 79e2ad15..79e2ad15 100644
--- a/src/PJ_putp5.cpp
+++ b/src/projections/PJ_putp5.cpp
diff --git a/src/PJ_putp6.cpp b/src/projections/PJ_putp6.cpp
index 1186b18b..1186b18b 100644
--- a/src/PJ_putp6.cpp
+++ b/src/projections/PJ_putp6.cpp
diff --git a/src/PJ_qsc.cpp b/src/projections/PJ_qsc.cpp
index b50a7c95..b50a7c95 100644
--- a/src/PJ_qsc.cpp
+++ b/src/projections/PJ_qsc.cpp
diff --git a/src/PJ_robin.cpp b/src/projections/PJ_robin.cpp
index 987977ae..987977ae 100644
--- a/src/PJ_robin.cpp
+++ b/src/projections/PJ_robin.cpp
diff --git a/src/PJ_rpoly.cpp b/src/projections/PJ_rpoly.cpp
index a34f6171..a34f6171 100644
--- a/src/PJ_rpoly.cpp
+++ b/src/projections/PJ_rpoly.cpp
diff --git a/src/PJ_sch.cpp b/src/projections/PJ_sch.cpp
index 5a2f944b..5a2f944b 100644
--- a/src/PJ_sch.cpp
+++ b/src/projections/PJ_sch.cpp
diff --git a/src/PJ_sconics.cpp b/src/projections/PJ_sconics.cpp
index 1d19a13d..1d19a13d 100644
--- a/src/PJ_sconics.cpp
+++ b/src/projections/PJ_sconics.cpp
diff --git a/src/PJ_somerc.cpp b/src/projections/PJ_somerc.cpp
index 15d2e765..15d2e765 100644
--- a/src/PJ_somerc.cpp
+++ b/src/projections/PJ_somerc.cpp
diff --git a/src/PJ_stere.cpp b/src/projections/PJ_stere.cpp
index 1502b2a6..1502b2a6 100644
--- a/src/PJ_stere.cpp
+++ b/src/projections/PJ_stere.cpp
diff --git a/src/PJ_sterea.cpp b/src/projections/PJ_sterea.cpp
index bb498068..bb498068 100644
--- a/src/PJ_sterea.cpp
+++ b/src/projections/PJ_sterea.cpp
diff --git a/src/PJ_sts.cpp b/src/projections/PJ_sts.cpp
index 9f889611..9f889611 100644
--- a/src/PJ_sts.cpp
+++ b/src/projections/PJ_sts.cpp
diff --git a/src/PJ_tcc.cpp b/src/projections/PJ_tcc.cpp
index 64fdc182..64fdc182 100644
--- a/src/PJ_tcc.cpp
+++ b/src/projections/PJ_tcc.cpp
diff --git a/src/PJ_tcea.cpp b/src/projections/PJ_tcea.cpp
index d30f3df0..d30f3df0 100644
--- a/src/PJ_tcea.cpp
+++ b/src/projections/PJ_tcea.cpp
diff --git a/src/PJ_times.cpp b/src/projections/PJ_times.cpp
index e8b4499f..e8b4499f 100644
--- a/src/PJ_times.cpp
+++ b/src/projections/PJ_times.cpp
diff --git a/src/PJ_tmerc.cpp b/src/projections/PJ_tmerc.cpp
index 5a2dacbd..5a2dacbd 100644
--- a/src/PJ_tmerc.cpp
+++ b/src/projections/PJ_tmerc.cpp
diff --git a/src/PJ_tobmerc.cpp b/src/projections/PJ_tobmerc.cpp
index 9c939f0b..9c939f0b 100644
--- a/src/PJ_tobmerc.cpp
+++ b/src/projections/PJ_tobmerc.cpp
diff --git a/src/PJ_tpeqd.cpp b/src/projections/PJ_tpeqd.cpp
index 2720327a..2720327a 100644
--- a/src/PJ_tpeqd.cpp
+++ b/src/projections/PJ_tpeqd.cpp
diff --git a/src/PJ_urm5.cpp b/src/projections/PJ_urm5.cpp
index 0e3c7e3c..0e3c7e3c 100644
--- a/src/PJ_urm5.cpp
+++ b/src/projections/PJ_urm5.cpp
diff --git a/src/PJ_urmfps.cpp b/src/projections/PJ_urmfps.cpp
index 7103222a..7103222a 100644
--- a/src/PJ_urmfps.cpp
+++ b/src/projections/PJ_urmfps.cpp
diff --git a/src/PJ_vandg.cpp b/src/projections/PJ_vandg.cpp
index d148e210..d148e210 100644
--- a/src/PJ_vandg.cpp
+++ b/src/projections/PJ_vandg.cpp
diff --git a/src/PJ_vandg2.cpp b/src/projections/PJ_vandg2.cpp
index 61d50044..61d50044 100644
--- a/src/PJ_vandg2.cpp
+++ b/src/projections/PJ_vandg2.cpp
diff --git a/src/PJ_vandg4.cpp b/src/projections/PJ_vandg4.cpp
index d9a53c87..d9a53c87 100644
--- a/src/PJ_vandg4.cpp
+++ b/src/projections/PJ_vandg4.cpp
diff --git a/src/PJ_wag2.cpp b/src/projections/PJ_wag2.cpp
index 1bee737a..1bee737a 100644
--- a/src/PJ_wag2.cpp
+++ b/src/projections/PJ_wag2.cpp
diff --git a/src/PJ_wag3.cpp b/src/projections/PJ_wag3.cpp
index bb1b4d49..bb1b4d49 100644
--- a/src/PJ_wag3.cpp
+++ b/src/projections/PJ_wag3.cpp
diff --git a/src/PJ_wag7.cpp b/src/projections/PJ_wag7.cpp
index c8807f12..c8807f12 100644
--- a/src/PJ_wag7.cpp
+++ b/src/projections/PJ_wag7.cpp
diff --git a/src/PJ_wink1.cpp b/src/projections/PJ_wink1.cpp
index de2f55ee..de2f55ee 100644
--- a/src/PJ_wink1.cpp
+++ b/src/projections/PJ_wink1.cpp
diff --git a/src/PJ_wink2.cpp b/src/projections/PJ_wink2.cpp
index 74a47283..74a47283 100644
--- a/src/PJ_wink2.cpp
+++ b/src/projections/PJ_wink2.cpp
diff --git a/src/proj_etmerc.cpp b/src/projections/proj_etmerc.cpp
index 05f86f37..05f86f37 100644
--- a/src/proj_etmerc.cpp
+++ b/src/projections/proj_etmerc.cpp
diff --git a/src/proj_rouss.cpp b/src/projections/proj_rouss.cpp
index 3b4428bc..3b4428bc 100644
--- a/src/proj_rouss.cpp
+++ b/src/projections/proj_rouss.cpp
diff --git a/src/geodtest.cpp b/src/tests/geodtest.cpp
index 6b3ea8b2..6b3ea8b2 100644
--- a/src/geodtest.cpp
+++ b/src/tests/geodtest.cpp
diff --git a/src/multistresstest.cpp b/src/tests/multistresstest.cpp
index 234783b3..234783b3 100644
--- a/src/multistresstest.cpp
+++ b/src/tests/multistresstest.cpp
diff --git a/src/test228.cpp b/src/tests/test228.cpp
index fcacd7c9..fcacd7c9 100644
--- a/src/test228.cpp
+++ b/src/tests/test228.cpp
diff --git a/src/PJ_affine.cpp b/src/transformations/PJ_affine.cpp
index e2b668d3..e2b668d3 100644
--- a/src/PJ_affine.cpp
+++ b/src/transformations/PJ_affine.cpp
diff --git a/src/PJ_deformation.cpp b/src/transformations/PJ_deformation.cpp
index 6c30f21c..6c30f21c 100644
--- a/src/PJ_deformation.cpp
+++ b/src/transformations/PJ_deformation.cpp
diff --git a/src/PJ_helmert.cpp b/src/transformations/PJ_helmert.cpp
index 4a3abf4e..4a3abf4e 100644
--- a/src/PJ_helmert.cpp
+++ b/src/transformations/PJ_helmert.cpp
diff --git a/src/PJ_hgridshift.cpp b/src/transformations/PJ_hgridshift.cpp
index f0e57251..f0e57251 100644
--- a/src/PJ_hgridshift.cpp
+++ b/src/transformations/PJ_hgridshift.cpp
diff --git a/src/PJ_horner.cpp b/src/transformations/PJ_horner.cpp
index 73977de6..73977de6 100644
--- a/src/PJ_horner.cpp
+++ b/src/transformations/PJ_horner.cpp
diff --git a/src/PJ_molodensky.cpp b/src/transformations/PJ_molodensky.cpp
index 91743fda..91743fda 100644
--- a/src/PJ_molodensky.cpp
+++ b/src/transformations/PJ_molodensky.cpp
diff --git a/src/PJ_vgridshift.cpp b/src/transformations/PJ_vgridshift.cpp
index b3da906d..b3da906d 100644
--- a/src/PJ_vgridshift.cpp
+++ b/src/transformations/PJ_vgridshift.cpp