diff --git a/BaseLib/BuildInfo.h.in b/BaseLib/BuildInfo.h.in
index 52f8f03753817674544a8ca221fb4dc2f7fe0f6b..4a6b12c45b87f0b607cf801fefc8e08d8fae3e1f 100644
--- a/BaseLib/BuildInfo.h.in
+++ b/BaseLib/BuildInfo.h.in
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file BuildInfo.h.in
diff --git a/BaseLib/CPUTime.cpp b/BaseLib/CPUTime.cpp
index b208e318fe2c5929e183e5edf6e9f96ab520888b..1a26d9aaaf93b253d28aa905e65249d8b454bc5a 100644
--- a/BaseLib/CPUTime.cpp
+++ b/BaseLib/CPUTime.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CPUTime.cpp
diff --git a/BaseLib/CPUTime.h b/BaseLib/CPUTime.h
index ee0def63d419b944e890c9b02882355cbef61600..f9f727c5d32b49f81340d5dc8d3fb70c06228560 100644
--- a/BaseLib/CPUTime.h
+++ b/BaseLib/CPUTime.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CPUTime.h
diff --git a/BaseLib/Configure.h.in b/BaseLib/Configure.h.in
index 46912c6db137a828bff11ae79b22ecee598b631c..f042ad5e435700c2529c94fd60ce548dd580c879 100644
--- a/BaseLib/Configure.h.in
+++ b/BaseLib/Configure.h.in
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Configure.h.in
diff --git a/BaseLib/DateTools.cpp b/BaseLib/DateTools.cpp
index 18040eac3a1b57a07a38969f60d0a07df3d0e3dd..275696f798f22218d2993a07b09569f820d64e2b 100644
--- a/BaseLib/DateTools.cpp
+++ b/BaseLib/DateTools.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file DateTools.cpp
diff --git a/BaseLib/DateTools.h b/BaseLib/DateTools.h
index 5eb32f8a3adc170e6f6a9a7d8931e23399a40422..10856c06f0015d8dc223a0d48e19306c0ee057ca 100644
--- a/BaseLib/DateTools.h
+++ b/BaseLib/DateTools.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file DateTools.h
diff --git a/BaseLib/FileFinder.h b/BaseLib/FileFinder.h
index 13c924249dabeb0a801b6933f922f364d2f55a27..30b175abca5726b987b701c37f83a2d0e0da8ecd 100644
--- a/BaseLib/FileFinder.h
+++ b/BaseLib/FileFinder.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FileFinder.h
diff --git a/BaseLib/FileTools.h b/BaseLib/FileTools.h
index b2aa210b2783d852834fad8c9451ebf41fca545e..1020374ad38f64142ebef83c9f357767d16d547c 100644
--- a/BaseLib/FileTools.h
+++ b/BaseLib/FileTools.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FileTools.h
diff --git a/BaseLib/LogogSimpleFormatter.h b/BaseLib/LogogSimpleFormatter.h
index 9c1fa64b74a9e9928294aa283908d31859dd46a8..61b10482e23e444aec1f152381f2c45496fc508c 100644
--- a/BaseLib/LogogSimpleFormatter.h
+++ b/BaseLib/LogogSimpleFormatter.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file LogogSimpleFormatter.h
diff --git a/BaseLib/MemWatch.cpp b/BaseLib/MemWatch.cpp
index 42c573420c75f7bda1cb00b206dd131e47664809..537b127fb065fa26baa0b444445fe1724d91bc06 100644
--- a/BaseLib/MemWatch.cpp
+++ b/BaseLib/MemWatch.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file MemWatch.cpp
diff --git a/BaseLib/MemWatch.h b/BaseLib/MemWatch.h
index a9b1d50a2ba81ef79df9dab50f3c176d1981c815..d34d29426edb20c9776a83a5940b3f860ec52a5e 100644
--- a/BaseLib/MemWatch.h
+++ b/BaseLib/MemWatch.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file MemWatch.h
diff --git a/BaseLib/RunTime.cpp b/BaseLib/RunTime.cpp
index 8a37ea72f0ee0689fbbc9a5d8eae9309d7dbd4d7..fe517531f49ad14c0c90e18307e646258d6416e9 100644
--- a/BaseLib/RunTime.cpp
+++ b/BaseLib/RunTime.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file RunTime.cpp
diff --git a/BaseLib/RunTime.h b/BaseLib/RunTime.h
index 4c46056864a6e24c84119ec34af039777fafe848..bfcc113c17503938bf5e3804379e03d4bc78a443 100644
--- a/BaseLib/RunTime.h
+++ b/BaseLib/RunTime.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file RunTime.h
diff --git a/BaseLib/StringTools.cpp b/BaseLib/StringTools.cpp
index 769641eabfcbc0d0aa1cb2584733b0b4b9f41e03..3fdc8c31c888ca0ce8bc5c109ec77c774e1919c1 100644
--- a/BaseLib/StringTools.cpp
+++ b/BaseLib/StringTools.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file StringTools.cpp
diff --git a/BaseLib/StringTools.h b/BaseLib/StringTools.h
index c692af98a951c133651a06f76c14bf2253537779..81683a79c63b927c75cd256f09b890d5a00c9d50 100644
--- a/BaseLib/StringTools.h
+++ b/BaseLib/StringTools.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file StringTools.h
diff --git a/BaseLib/TimeMeasurementBase.h b/BaseLib/TimeMeasurementBase.h
index 1f27e28fc3a6092b9ff2ab06b37aeebeaf148f3e..e2020f3b5eed9206e0ea45edf1a2e81d33d9f1bc 100644
--- a/BaseLib/TimeMeasurementBase.h
+++ b/BaseLib/TimeMeasurementBase.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file TimeMeasurementBase.h
diff --git a/BaseLib/binarySearch.cpp b/BaseLib/binarySearch.cpp
index 9fa6acaa248bdc3bddfb264ef890ba8a0a8bd310..ffef64da65ec57fea0e7a7c8ce88eb6d2615656c 100644
--- a/BaseLib/binarySearch.cpp
+++ b/BaseLib/binarySearch.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file binarySearch.cpp
diff --git a/BaseLib/binarySearch.h b/BaseLib/binarySearch.h
index b17ae0e4d9c010974f50bfdfcd9f20f3930b6792..c5ba2dd11de911e1d36700c9beda2a740974b619 100644
--- a/BaseLib/binarySearch.h
+++ b/BaseLib/binarySearch.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file binarySearch.h
diff --git a/BaseLib/printList.h b/BaseLib/printList.h
index ee1898932638e6371e8ec4822e92ed207dd9ecd5..4a2cda3ab1b35b6730a43284d10d1c17c88ee58d 100644
--- a/BaseLib/printList.h
+++ b/BaseLib/printList.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file printList.h
diff --git a/BaseLib/quicksort.h b/BaseLib/quicksort.h
index 31309efacb87803291865738020cd1236610da1f..aed83fd662437272f1cb0497492646deeb4bf200 100644
--- a/BaseLib/quicksort.h
+++ b/BaseLib/quicksort.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file quicksort.h
diff --git a/BaseLib/swap.h b/BaseLib/swap.h
index c9698fd6ab0b616a305c5f44d038e96a4d742a99..0dc1bbd27df0821ac134f17bfa7544f915110146 100644
--- a/BaseLib/swap.h
+++ b/BaseLib/swap.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file swap.h
diff --git a/BaseLib/uniqueInsert.h b/BaseLib/uniqueInsert.h
index 4323a43621889d7514212006addcedd66c9b0d5d..c5a9c238cba61bd2b5ef3bf225b0df0b8e3fa0e0 100644
--- a/BaseLib/uniqueInsert.h
+++ b/BaseLib/uniqueInsert.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file uniqueListInsert.h
diff --git a/BaseLib/wait.h b/BaseLib/wait.h
index 438b403ec7059646cde762b48e4acd0fc5d75e10..bc31d57bac060659258b0100394fce2693202f39 100644
--- a/BaseLib/wait.h
+++ b/BaseLib/wait.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file wait.h
diff --git a/FemLib/DistributionInfo.cpp b/FemLib/DistributionInfo.cpp
index a3eba7947755474dcceecf79010567260c182e09..991eadd35be10dffe86989d5625b53f6c719eed5 100644
--- a/FemLib/DistributionInfo.cpp
+++ b/FemLib/DistributionInfo.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file DistributionInfo.cpp
diff --git a/FemLib/DistributionInfo.h b/FemLib/DistributionInfo.h
index 28f5759ef957c9a8d02ebdbf3e9aa7c68afe039e..cae33fd4d7ae4b197e1cdc66eeaf3768dea03f5b 100644
--- a/FemLib/DistributionInfo.h
+++ b/FemLib/DistributionInfo.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file DistributionInfo.h
diff --git a/FemLib/FEMCondition.cpp b/FemLib/FEMCondition.cpp
index 5fe31c6fd8770312ef00027dea9b3f370bd51baa..0ed42c09b084d9837587bc705f1241c900993de7 100644
--- a/FemLib/FEMCondition.cpp
+++ b/FemLib/FEMCondition.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FEMCondition.cpp
diff --git a/FemLib/FEMCondition.h b/FemLib/FEMCondition.h
index 41c76ee3dcf34a139cb0a2d8189b553dedd00fbd..d0593a1c9678bbd0de330c3ffc8aae2bf151284b 100644
--- a/FemLib/FEMCondition.h
+++ b/FemLib/FEMCondition.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FEMCondition.h
diff --git a/FemLib/FEMEnums.cpp b/FemLib/FEMEnums.cpp
index 6a6894cacf7b3ca5d5fb75ce6d3018ade36823ce..591fc665ba26105ea858a04ad95c25d9ace0776b 100644
--- a/FemLib/FEMEnums.cpp
+++ b/FemLib/FEMEnums.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FEMEnums.cpp
diff --git a/FemLib/FEMEnums.h b/FemLib/FEMEnums.h
index d767cb74edfe626201aca4135f6603244db65b67..5e12def788ecf756a9c83b788eb31c98f08c858d 100644
--- a/FemLib/FEMEnums.h
+++ b/FemLib/FEMEnums.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FEMEnums.h
diff --git a/FemLib/GeoInfo.cpp b/FemLib/GeoInfo.cpp
index 2b53648d41d128d9b7821eb51be54c3eaf59c2a3..1c4bf455b4397058ab74669519f90ca553f989d6 100644
--- a/FemLib/GeoInfo.cpp
+++ b/FemLib/GeoInfo.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GeoInfo.cpp
diff --git a/FemLib/GeoInfo.h b/FemLib/GeoInfo.h
index 0631101e6cad6dbb920a062e163b6f565cf2eab0..7be1ca707a6e901f97759e3b575c6e19b1453c1d 100644
--- a/FemLib/GeoInfo.h
+++ b/FemLib/GeoInfo.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GeoInfo.h
diff --git a/FemLib/ProcessInfo.cpp b/FemLib/ProcessInfo.cpp
index 3d1df1cc252ef720438a6d38de6a7ef6b3dd9301..5e86f75b348ada2b2b538cdba1cd457b2f1702b1 100644
--- a/FemLib/ProcessInfo.cpp
+++ b/FemLib/ProcessInfo.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file ProcessInfo.cpp
diff --git a/FemLib/ProcessInfo.h b/FemLib/ProcessInfo.h
index 876a84983a938b72d546316f567862eb2c40d609..4789c954b0602da73b4a4c395623020f80faada6 100644
--- a/FemLib/ProcessInfo.h
+++ b/FemLib/ProcessInfo.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file ProcessInfo.h
diff --git a/FileIO/ImportFileTypes.h b/FileIO/ImportFileTypes.h
index 9b4551ee02413d3e141ce2043e1f2824bf2a551d..84cdfc099de29016189c133e6bf85b19bbebea8f 100644
--- a/FileIO/ImportFileTypes.h
+++ b/FileIO/ImportFileTypes.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file ImportFileTypes.h
@@ -55,23 +55,23 @@ public:
 	{
 		if (t==ImportFileType::FEFLOW)
 			return "FEFLOW files (*.fem)";
-		else if (t==ImportFileType::GMS) 
+		else if (t==ImportFileType::GMS)
 			return "GMS files (*.txt *.3dm)";
-		else if (t==ImportFileType::GMSH) 
+		else if (t==ImportFileType::GMSH)
 			return "GMSH mesh files (*.msh)";
-		else if (t==ImportFileType::NETCDF) 
+		else if (t==ImportFileType::NETCDF)
 			return "NetCDF files (*.nc)";
-		else if (t==ImportFileType::OGS) 
+		else if (t==ImportFileType::OGS)
 			return "OpenGeosys files (*.gsp *.gml *.vtu *.stn);;GeoSys legacy files (*.gli *.msh);;GeoSys FEM Conditions (*.cnd *.bc *.ic *.st);;All files (* *.*)";
-		else if (t==ImportFileType::PETREL) 
+		else if (t==ImportFileType::PETREL)
 			return "Petrel files (*)";
-		else if (t==ImportFileType::RASTER) 
+		else if (t==ImportFileType::RASTER)
 			return "Raster files (*.asc *.grd *.bmp *.jpg *.png *.tif)";
-		else if (t==ImportFileType::SHAPE) 
+		else if (t==ImportFileType::SHAPE)
 			return "ESRI Shape files (*.shp)";
-		else if (t==ImportFileType::TETGEN) 
+		else if (t==ImportFileType::TETGEN)
 			return "TetGen node files (*.node)";
-		else if (t==ImportFileType::VTK) 
+		else if (t==ImportFileType::VTK)
 			return "VTK files (*.vtk *.vti *.vtr *.vts *.vtp *.vtu)";
 		else return "All files (*.*)";
 }
diff --git a/FileIO/Legacy/MeshIO.cpp b/FileIO/Legacy/MeshIO.cpp
index 082182c6771595b56c49c6b7f408924483415103..31068bc462903879985cec25a96b073c8fc725c4 100644
--- a/FileIO/Legacy/MeshIO.cpp
+++ b/FileIO/Legacy/MeshIO.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file MeshIO.cpp
diff --git a/FileIO/Legacy/MeshIO.h b/FileIO/Legacy/MeshIO.h
index d78462b0bd3f23cc9ee406f027f7cddd660291b2..46d94cc3bf9dd2c4a7394e5fee2fbc56ba697820 100644
--- a/FileIO/Legacy/MeshIO.h
+++ b/FileIO/Legacy/MeshIO.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file MeshIO.h
diff --git a/FileIO/MeshIO/TetGenInterface.cpp b/FileIO/MeshIO/TetGenInterface.cpp
index 87faa8a7205c363c658c04b1292fde337dd3889a..144f98e693bf5961544fb166581f0d241ecab79e 100644
--- a/FileIO/MeshIO/TetGenInterface.cpp
+++ b/FileIO/MeshIO/TetGenInterface.cpp
@@ -15,6 +15,9 @@
 // BaseLib
 #include "StringTools.h"
 
+// BaseLib/logog
+#include "logog.hpp"
+
 // FileIO
 #include "TetGenInterface.h"
 
@@ -44,11 +47,9 @@ MeshLib::Mesh* TetGenInterface::readTetGenMesh (std::string const& nodes_fname,
 	if (!ins_nodes || !ins_ele)
 	{
 		if (!ins_nodes)
-			std::cout << "TetGenInterface::readTetGenMesh failed to open " <<
-			nodes_fname << std::endl;
+			ERR ("TetGenInterface::readTetGenMesh failed to open %s", nodes_fname.c_str());
 		if (!ins_ele)
-			std::cout << "TetGenInterface::readTetGenMesh failed to open " <<
-			ele_fname << std::endl;
+			ERR ("TetGenInterface::readTetGenMesh failed to open %s", ele_fname.c_str());
 		return NULL;
 	}
 
@@ -124,8 +125,7 @@ bool TetGenInterface::parseNodesFileHeader(std::string &line,
 		n_nodes = str2number<size_t> (line.substr(pos_beg, pos_end - pos_beg));
 	else
 	{
-		std::cout << "TetGenInterface::parseNodesFileHeader could not correct read TetGen mesh header - number of nodes"
-		          << std::endl;
+		ERR("TetGenInterface::parseNodesFileHeader(): could not correct read TetGen mesh header - number of nodes");
 		return false;
 	}
 	// dimension
@@ -169,8 +169,7 @@ bool TetGenInterface::parseNodes(std::ifstream& ins, size_t n_nodes, size_t dim)
 					if (k == 0 && id == 0)
 						_zero_based_idx = true;
 				} else {
-					std::cout << "error reading id of node " << k
-									<< " in TetGenInterface::parseNodes" << std::endl;
+					ERR("TetGenInterface::parseNodes(): error reading id of node %d", k);
 					return false;
 				}
 				// read coordinates
@@ -182,8 +181,7 @@ bool TetGenInterface::parseNodes(std::ifstream& ins, size_t n_nodes, size_t dim)
 						coordinates[i] = str2number<double> (
 										line.substr(pos_beg, pos_end - pos_beg));
 					else {
-						std::cout << "error reading coordinate " << i << " of node " << k
-										<< " in TetGenInterface::parseNodes" << std::endl;
+						ERR("TetGenInterface::parseNodes(): error reading coordinate %d of node %d", i, k);
 						return false;
 					}
 				}
@@ -193,7 +191,7 @@ bool TetGenInterface::parseNodes(std::ifstream& ins, size_t n_nodes, size_t dim)
 				// read attributes and boundary markers ... - at the moment we do not use this information
 			}
 		} else {
-			std::cout << "error reading node " << k << " in TetGenInterface::parseNodes" << std::endl;
+			ERR("TetGenInterface::parseNodes(): error reading node %d, stream error", k);
 			return false;
 		}
 	}
@@ -246,11 +244,8 @@ bool TetGenInterface::parseElementsFileHeader(std::string &line,
 	pos_end = line.find_first_of(" ", pos_beg);
 	if (pos_beg != std::string::npos && pos_end != std::string::npos)
 		n_tets = str2number<size_t> (line.substr(pos_beg, pos_end - pos_beg));
-	else
-	{
-		std::cout <<
-		"TetGenInterface::parseElementsFileHeader could not correct read TetGen mesh header - number of tetrahedras"
-		          << std::endl;
+	else {
+		ERR("TetGenInterface::parseElementsFileHeader(): could not correct read TetGen mesh header - number of tetrahedras");
 		return false;
 	}
 	// nodes per tet - either 4 or 10
@@ -292,8 +287,7 @@ bool TetGenInterface::parseElements(std::ifstream& ins, size_t n_tets, size_t n_
 				if (pos_beg != std::string::npos && pos_end != std::string::npos)
 					id = str2number<size_t>(line.substr(pos_beg, pos_end - pos_beg));
 				else {
-					std::cout << "error reading id of tetrahedra " << k <<
-					" in TetGenInterface::parseElements" << std::endl;
+					ERR("TetGenInterface::parseElements(): error reading id of tetrahedra %d", k);
 					return false;
 				}
 				// read node ids
@@ -308,8 +302,7 @@ bool TetGenInterface::parseElements(std::ifstream& ins, size_t n_tets, size_t n_
 						ids[i] = str2number<std::size_t>(line.substr(pos_beg, pos_end - pos_beg));
 					else
 					{
-						std::cout << "error reading node " << i << " of tetrahedra " << k <<
-							" in TetGenInterface::parseElements" << std::endl;
+						ERR("TetGenInterface::parseElements(): error reading node %d of tetrahedra %d", i, k);
 						return false;
 					}
 				}
@@ -328,8 +321,7 @@ bool TetGenInterface::parseElements(std::ifstream& ins, size_t n_tets, size_t n_
 					if (pos_beg != std::string::npos && pos_end != std::string::npos)
 						region = str2number<unsigned> (line.substr(pos_beg, pos_end - pos_beg));
 					else {
-						std::cout << "error reading region attribute of tetrahedra " << k
-										<< " in TetGenInterface::parseElements" << std::endl;
+						ERR("TetGenInterface::parseElements(): error reading region attribute of tetrahedra %d", k);
 						return false;
 					}
 				}
@@ -340,7 +332,7 @@ bool TetGenInterface::parseElements(std::ifstream& ins, size_t n_tets, size_t n_
 		}
 		else
 		{
-			std::cout << "error reading node " << k << " in TetGenInterface::parseElements" << std::endl;
+			ERR("TetGenInterface::parseElements(): error reading node %d", k);
 			return false;
 		}
 	}
diff --git a/FileIO/Writer.cpp b/FileIO/Writer.cpp
index 103519ea19fc2eada26acb7b1380848b08d59dbc..a4a6fad561dc0750c5c7c4347a7100f58d0f199d 100644
--- a/FileIO/Writer.cpp
+++ b/FileIO/Writer.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Writer.cpp
diff --git a/FileIO/Writer.h b/FileIO/Writer.h
index 61bb04de3954adf5e790f8fc67840188f7a6f430..e52f938c40e9c3e50e8a45edd2ebd976473b345e 100644
--- a/FileIO/Writer.h
+++ b/FileIO/Writer.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Writer.h
diff --git a/FileIO/XmlIO/XMLInterface.cpp b/FileIO/XmlIO/XMLInterface.cpp
index a25cb40cf086f47489e0157c89ec71a1ace9c9bf..e2d47f5be6cf81cc2c43f97285ca306dbbb18979 100644
--- a/FileIO/XmlIO/XMLInterface.cpp
+++ b/FileIO/XmlIO/XMLInterface.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XMLInterface.cpp
diff --git a/FileIO/XmlIO/XMLInterface.h b/FileIO/XmlIO/XMLInterface.h
index d9720480ce7200d1f9465c672e5848460b2d17bb..52d35334c27846482cf124b8fb4699b9c2c8e4a7 100644
--- a/FileIO/XmlIO/XMLInterface.h
+++ b/FileIO/XmlIO/XMLInterface.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XMLInterface.h
diff --git a/FileIO/XmlIO/XmlCndInterface.cpp b/FileIO/XmlIO/XmlCndInterface.cpp
index 8110c364cedce0dbcc61770bdbdeb6f8d5cb4927..31c10c19dd78f05310a5c332e62cf411574c46df 100644
--- a/FileIO/XmlIO/XmlCndInterface.cpp
+++ b/FileIO/XmlIO/XmlCndInterface.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XmlCndInterface.cpp
diff --git a/FileIO/XmlIO/XmlCndInterface.h b/FileIO/XmlIO/XmlCndInterface.h
index b9698adefc6cbf767f41c1ac464d2e96322b9730..117840046acd0b5cb2e69607c1ba0ce9ffc4e16c 100644
--- a/FileIO/XmlIO/XmlCndInterface.h
+++ b/FileIO/XmlIO/XmlCndInterface.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XmlCndInterface.h
diff --git a/FileIO/XmlIO/XmlGmlInterface.cpp b/FileIO/XmlIO/XmlGmlInterface.cpp
index c176b2095c1d3c5632fc917a8f23e1ca6f0fbacd..67c3ebf6c54b98041256acaa3848d685cc66fc23 100644
--- a/FileIO/XmlIO/XmlGmlInterface.cpp
+++ b/FileIO/XmlIO/XmlGmlInterface.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XmlGmlInterface.cpp
diff --git a/FileIO/XmlIO/XmlGmlInterface.h b/FileIO/XmlIO/XmlGmlInterface.h
index dc7a0a93c6697629692605909baf12b7a1a01a1e..815635c350c830d285b01e93658c7dae753c6852 100644
--- a/FileIO/XmlIO/XmlGmlInterface.h
+++ b/FileIO/XmlIO/XmlGmlInterface.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XmlGmlInterface.h
diff --git a/FileIO/XmlIO/XmlGspInterface.cpp b/FileIO/XmlIO/XmlGspInterface.cpp
index 82d7d7e463be0bce7dec6c6f0cd626d1365724bc..bbe1339768c514a6cafc3f3a86945aff1b5c4dea 100644
--- a/FileIO/XmlIO/XmlGspInterface.cpp
+++ b/FileIO/XmlIO/XmlGspInterface.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XmlGspInterface.cpp
diff --git a/FileIO/XmlIO/XmlGspInterface.h b/FileIO/XmlIO/XmlGspInterface.h
index 6436c28a63c6127bd50ef73ddbbe83e3821391c0..00d44df26e23045705295d40c7b792f3f1f7b145 100644
--- a/FileIO/XmlIO/XmlGspInterface.h
+++ b/FileIO/XmlIO/XmlGspInterface.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XmlGspInterface.h
diff --git a/FileIO/XmlIO/XmlLutReader.h b/FileIO/XmlIO/XmlLutReader.h
index b5318e18f36e5cd1b95806a1649db10b8af0696e..0d05c14de635e4bee8fca3a2dd075af9590ca1e2 100644
--- a/FileIO/XmlIO/XmlLutReader.h
+++ b/FileIO/XmlIO/XmlLutReader.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XmlLutReader.h
diff --git a/FileIO/XmlIO/XmlStnInterface.cpp b/FileIO/XmlIO/XmlStnInterface.cpp
index 317d9b44f77b771093d35f7fe7b8587ab0ebcf7b..52a0f085ebb6cabdc9ff1dba1aef43fc4755abaa 100644
--- a/FileIO/XmlIO/XmlStnInterface.cpp
+++ b/FileIO/XmlIO/XmlStnInterface.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XmlStnInterface.cpp
@@ -130,7 +130,7 @@ void XmlStnInterface::readStations( const QDomNode &stationsRoot,
 				        new GeoLib::Station(
 							strtod((station.attribute("x")).toStdString().c_str(), 0),
 				            strtod((station.attribute("y")).toStdString().c_str(), 0),
-				            zVal, 
+				            zVal,
 							stationName);
 				s->setStationValue(stationValue);
 				if (!sensor_data_file_name.empty())
diff --git a/FileIO/XmlIO/XmlStnInterface.h b/FileIO/XmlIO/XmlStnInterface.h
index 9c141cecc148adba50918783c332ff4b27ead3dc..334c39f0abae673d9d126c0bed059e60b6f63ed6 100644
--- a/FileIO/XmlIO/XmlStnInterface.h
+++ b/FileIO/XmlIO/XmlStnInterface.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file XmlStnInterface.h
diff --git a/GeoLib/AxisAlignedBoundingBox.cpp b/GeoLib/AxisAlignedBoundingBox.cpp
index 54303928994552eab24285434e2387375b65f44d..b4dd113cab6c573d515e9f2b14c273fa53e2b241 100644
--- a/GeoLib/AxisAlignedBoundingBox.cpp
+++ b/GeoLib/AxisAlignedBoundingBox.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file AxisAlignedBoundingBox.cpp
diff --git a/GeoLib/AxisAlignedBoundingBox.h b/GeoLib/AxisAlignedBoundingBox.h
index aedbaefce7f57b214e904621a1b608c59fc51863..98c0bef38a8ef8c04bf1c57d3ab65663e82b0328 100644
--- a/GeoLib/AxisAlignedBoundingBox.h
+++ b/GeoLib/AxisAlignedBoundingBox.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file AxisAlignedBoundingBox.h
diff --git a/GeoLib/BruteForceClosestPair.cpp b/GeoLib/BruteForceClosestPair.cpp
index 2ebc87c435ec5eeff7fc33a611493c16c285a73e..63d5f7a5d8b34e3c910095ee9220a6e22d05e50e 100644
--- a/GeoLib/BruteForceClosestPair.cpp
+++ b/GeoLib/BruteForceClosestPair.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file BruteForceClosestPair.cpp
diff --git a/GeoLib/BruteForceClosestPair.h b/GeoLib/BruteForceClosestPair.h
index d7ba5be84c754ca503ce7942c9c9957f2b8749ae..0f4d7f73c4b2d960f632cbde9b1f2d414988d136 100644
--- a/GeoLib/BruteForceClosestPair.h
+++ b/GeoLib/BruteForceClosestPair.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file BruteForceClosestPair.h
diff --git a/GeoLib/ClosestPair.h b/GeoLib/ClosestPair.h
index 708241d0f8dae257900f6056eaf607703faecf84..254636edddf382e825d98e8ccb0e7549d9203689 100644
--- a/GeoLib/ClosestPair.h
+++ b/GeoLib/ClosestPair.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file ClosestPair.h
diff --git a/GeoLib/Color.cpp b/GeoLib/Color.cpp
index 06ec5f8d2c5de1f376f0b1ce7dbc2248a63e23f3..7a4e92a821deaa9bc96bcbdce4b1909f902a197f 100644
--- a/GeoLib/Color.cpp
+++ b/GeoLib/Color.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Color.cpp
diff --git a/GeoLib/Color.h b/GeoLib/Color.h
index 05be5f9ba85e8483fdf3ad62823bc9a4e395bd9e..e1c477c9f82f0209a88e63e4a7eb1ab1b6cf193c 100644
--- a/GeoLib/Color.h
+++ b/GeoLib/Color.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Color.h
diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp
index 64410892dab9780ce2eaab67cbc4a8666ad585ce..10ab4ba9785278b0e6496580e3d06b94aa8f0281 100644
--- a/GeoLib/GEOObjects.cpp
+++ b/GeoLib/GEOObjects.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GEOObjects.cpp
diff --git a/GeoLib/GEOObjects.h b/GeoLib/GEOObjects.h
index daa411228e7405942e843770fff2a7e9b26dd482..56d7c5d5a241c8ab3c225bf704e41ba8cf25c127 100644
--- a/GeoLib/GEOObjects.h
+++ b/GeoLib/GEOObjects.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GEOObjects.h
diff --git a/GeoLib/GeoObject.h b/GeoLib/GeoObject.h
index 7f63a0e15474794bd627f0ccb4e3d9604729458b..59c45c1fbcf3e126e70ce9efee951fe087d4e668 100644
--- a/GeoLib/GeoObject.h
+++ b/GeoLib/GeoObject.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GeoObject.h
diff --git a/GeoLib/GeoType.cpp b/GeoLib/GeoType.cpp
index 814f787c973718f8952036f4146bc35474cc5a31..69c88df327844fae146cd9e96c0184f8944e299a 100644
--- a/GeoLib/GeoType.cpp
+++ b/GeoLib/GeoType.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GeoType.cpp
diff --git a/GeoLib/GeoType.h b/GeoLib/GeoType.h
index a54e696475c0480a500c7dcb161b6b84ec25d2db..83e5ab7553cf6049bbd5edaf46c5f94b0af41d83 100644
--- a/GeoLib/GeoType.h
+++ b/GeoLib/GeoType.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GeoType.h
diff --git a/GeoLib/Grid.h b/GeoLib/Grid.h
index 9a26353f6fbf63c598428216b94633ad81a071b8..0982d4ed1315b6b1b93cc45dfc3336230f97fff6 100644
--- a/GeoLib/Grid.h
+++ b/GeoLib/Grid.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Grid.h
diff --git a/GeoLib/OctTree.h b/GeoLib/OctTree.h
index b160ff503740211bfa9a50cc48678e30793d7c64..47c382e4664a5276b7a4b48f9e12e06617c19b2f 100644
--- a/GeoLib/OctTree.h
+++ b/GeoLib/OctTree.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file  OctTree.h
diff --git a/GeoLib/Point.cpp b/GeoLib/Point.cpp
index 8032f2dc4d87e8fdb89f695313e9c951ef47a91a..abdd9590de73bb0a0761eaaf4c708d2482a700ba 100644
--- a/GeoLib/Point.cpp
+++ b/GeoLib/Point.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Point.cpp
diff --git a/GeoLib/Point.h b/GeoLib/Point.h
index 8f8911fbeeead48ec2f2ce713bc2d3d4d22f07fb..e793ef5b3e7fc818cf679838c210f9ee628d96a4 100644
--- a/GeoLib/Point.h
+++ b/GeoLib/Point.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Point.h
diff --git a/GeoLib/PointVec.cpp b/GeoLib/PointVec.cpp
index 99827a9e49ecf546246618a26c86ffcab583d96c..355e7f6db9c994014c6c493b6a1bbb4b7142efe5 100644
--- a/GeoLib/PointVec.cpp
+++ b/GeoLib/PointVec.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file PointVec.cpp
diff --git a/GeoLib/PointVec.h b/GeoLib/PointVec.h
index f90393b30e5e0c381a9ba2463fb16355abd512f5..2a573a940ed328d9977df5791fd0d2602579bcb1 100644
--- a/GeoLib/PointVec.h
+++ b/GeoLib/PointVec.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file PointVec.h
diff --git a/GeoLib/PolylineVec.h b/GeoLib/PolylineVec.h
index 3a091f0896d669280e3426280637be93b628226d..37a84edc30a52d410a34225550579589dbd7bc26 100644
--- a/GeoLib/PolylineVec.h
+++ b/GeoLib/PolylineVec.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file PolylineVec.h
diff --git a/GeoLib/PropertyBounds.h b/GeoLib/PropertyBounds.h
index 30726ec2f2088368c2af3bf82668aa7f3e3864e6..1c29fe54568ef824b5caa133ae40ddd3515831bd 100644
--- a/GeoLib/PropertyBounds.h
+++ b/GeoLib/PropertyBounds.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file PropertyBounds.h
diff --git a/GeoLib/Raster.cpp b/GeoLib/Raster.cpp
index 753a148bdd3a15b6f7c854baa8734d3fd698f633..8571c4f9e6e64804d577cbeb2bcd3396a72df703 100644
--- a/GeoLib/Raster.cpp
+++ b/GeoLib/Raster.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Raster.cpp
diff --git a/GeoLib/Raster.h b/GeoLib/Raster.h
index 4121556031abe53508276578a2a562e079b7f547..c9c59f25cf8dae03b50824d1b6aa43f599dbcd39 100644
--- a/GeoLib/Raster.h
+++ b/GeoLib/Raster.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Raster.h
diff --git a/GeoLib/SensorData.cpp b/GeoLib/SensorData.cpp
index 464d5252e6943ace65c824ea7f053620da5e1fa8..ecbb0080375fc51abd8d56ba786d26686f2e5735 100644
--- a/GeoLib/SensorData.cpp
+++ b/GeoLib/SensorData.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file SensorData.cpp
diff --git a/GeoLib/SensorData.h b/GeoLib/SensorData.h
index 29ce87790a745190a296909c21080fd9b9d593d9..cec97d39a13e273b4ebada4ae24d0df596a5f695 100644
--- a/GeoLib/SensorData.h
+++ b/GeoLib/SensorData.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file SensorData.h
diff --git a/GeoLib/Station.cpp b/GeoLib/Station.cpp
index fa8205bccf74d9a3493c649de087da3ac017a2af..1c730e5769d87c80c13860abccc986935353302f 100644
--- a/GeoLib/Station.cpp
+++ b/GeoLib/Station.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Station.cpp
diff --git a/GeoLib/Station.h b/GeoLib/Station.h
index 4333eaf814d5bf137dd17dedf6b2ddc727d91580..5e116b158cba38f2f4e27e0f5d93e23883c28107 100644
--- a/GeoLib/Station.h
+++ b/GeoLib/Station.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Station.h
@@ -31,8 +31,8 @@ namespace GeoLib
  *
  * \brief A Station (observation site) is basically a Point with some additional information.
  *
- * Additional information is largely optional (except for a name, but even this may be empty). 
- * It may include a name, a stratigraphy (only for the derived class StationBore), 
+ * Additional information is largely optional (except for a name, but even this may be empty).
+ * It may include a name, a stratigraphy (only for the derived class StationBore),
  * time series data from data loggers (as a SensorData-object), etc.
  *
  * Notes concerning the property-system used in this class:
diff --git a/GeoLib/Surface.cpp b/GeoLib/Surface.cpp
index c7583525e44fcb741bd8e087bca2dc63047e0330..da05652762027916c792f4a23a69e67c033cbce1 100644
--- a/GeoLib/Surface.cpp
+++ b/GeoLib/Surface.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Surface.cpp
diff --git a/GeoLib/Surface.h b/GeoLib/Surface.h
index 55f5e1709aa2999c2fee281bdf8ca10ddc642e7e..a0c6aa11642c8a75360326f9988eb8b3660d8da0 100644
--- a/GeoLib/Surface.h
+++ b/GeoLib/Surface.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Surface.h
diff --git a/GeoLib/SurfaceVec.h b/GeoLib/SurfaceVec.h
index 9549cd37fb74549dad7f98971fd420c13f8980a4..b93634cba8a97869a5ded77f426f785e53fb034e 100644
--- a/GeoLib/SurfaceVec.h
+++ b/GeoLib/SurfaceVec.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file SurfaceVec.h
diff --git a/GeoLib/TemplatePoint.h b/GeoLib/TemplatePoint.h
index d022ac03358d7d1fc791eea27dd93224388767fb..b7cf19eae4ad71005f3a9269353e0977e5f58336 100644
--- a/GeoLib/TemplatePoint.h
+++ b/GeoLib/TemplatePoint.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file TemplatePoint.h
diff --git a/GeoLib/TemplateVec.h b/GeoLib/TemplateVec.h
index 4cfae7251badb86db0df48b91c797ab85a2297f2..75eba1647b3d2f66a3ab2a0213fcbcc523977bce 100644
--- a/GeoLib/TemplateVec.h
+++ b/GeoLib/TemplateVec.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file TemplateVec.h
diff --git a/GeoLib/Triangle.cpp b/GeoLib/Triangle.cpp
index 89e1ee1131e28b58072677c16b4826773bcc9ec8..7b8d8e68b170032293e720caff59d8eabafc8b44 100644
--- a/GeoLib/Triangle.cpp
+++ b/GeoLib/Triangle.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Triangle.cpp
diff --git a/GeoLib/Triangle.h b/GeoLib/Triangle.h
index ce0176ac6cf9c3c8200fe4ccd7bf7825af429ed8..690d835d9a9453388ef5dbf968c6ad75caa230ce 100644
--- a/GeoLib/Triangle.h
+++ b/GeoLib/Triangle.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Triangle.h
diff --git a/MathLib/AnalyticalGeometry.cpp b/MathLib/AnalyticalGeometry.cpp
index c50b0fc9d8e4fd161063c8c3ecb4c748dddfb860..4b993369c08732acf6ea4909106a609828fe0b9d 100644
--- a/MathLib/AnalyticalGeometry.cpp
+++ b/MathLib/AnalyticalGeometry.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file AnalyticalGeometry.cpp
diff --git a/MathLib/AnalyticalGeometry.h b/MathLib/AnalyticalGeometry.h
index 20aa333834327e79c53e1b503a82d9314d898f5a..e37efa8cbd123905d21c0589a219b45ed0596856 100644
--- a/MathLib/AnalyticalGeometry.h
+++ b/MathLib/AnalyticalGeometry.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file AnalyticalGeometry.h
diff --git a/MathLib/EarClippingTriangulation.cpp b/MathLib/EarClippingTriangulation.cpp
index 5b07fe2785c2e145f3849a7ede78381c613da203..4d0369a26c2df7eacaa57132225ff53d9cb5a317 100644
--- a/MathLib/EarClippingTriangulation.cpp
+++ b/MathLib/EarClippingTriangulation.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file EarClippingTriangulation.cpp
diff --git a/MathLib/EarClippingTriangulation.h b/MathLib/EarClippingTriangulation.h
index f91fc2464993c7a2e6ca9529586fa060b5cb873e..ac7947154540f20593072d90a7edaea488de2345 100644
--- a/MathLib/EarClippingTriangulation.h
+++ b/MathLib/EarClippingTriangulation.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file EarClippingTriangulation.h
diff --git a/MathLib/InterpolationAlgorithms/LinearIntervalInterpolation.h b/MathLib/InterpolationAlgorithms/LinearIntervalInterpolation.h
index a42564b7d9b14cae40dd999fb24d83a0867ab80a..50f37968f496c432dac80620eb66b77cf9fd137e 100644
--- a/MathLib/InterpolationAlgorithms/LinearIntervalInterpolation.h
+++ b/MathLib/InterpolationAlgorithms/LinearIntervalInterpolation.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file  LinearIntervalInterpolation.h
diff --git a/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp b/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp
index 53222c5e5e0d6b28b0f18c1a0f3daf057626ae65..4374c0f4b928244c84bdb3c1ee78be85b3bc1648 100644
--- a/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp
+++ b/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file PiecewiseLinearInterpolation.cpp
diff --git a/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h b/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h
index c0c1091134d18376292b5a4f5e147acf17563e2b..352925adc1dd1c4de68db485d0846e55a2dc0857 100644
--- a/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h
+++ b/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file PiecewiseLinearInterpolation.h
diff --git a/MathLib/LinAlg/Dense/Matrix.h b/MathLib/LinAlg/Dense/Matrix.h
index ecc0db91bdedef415ad7d06231302b63ae4e42d1..6987dc668c3a80e576d31f95ec4c3776feb5a75d 100644
--- a/MathLib/LinAlg/Dense/Matrix.h
+++ b/MathLib/LinAlg/Dense/Matrix.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Matrix.h
diff --git a/MathLib/LinAlg/MatrixBase.h b/MathLib/LinAlg/MatrixBase.h
index adb32d1ecda51ec49366277a9760d1e2fb4c682d..f645c57233444a91fdd5d4a78b437db8c3a303a8 100644
--- a/MathLib/LinAlg/MatrixBase.h
+++ b/MathLib/LinAlg/MatrixBase.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file MatrixBase.h
diff --git a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
index 3a99423765552d570adb0b261a8c174607cebcf7..5a72112b27e014d2ec2199254b3292c52b646a36 100644
--- a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
+++ b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file generateDiagPrecond.cpp
diff --git a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.h b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.h
index e1e31441a2524b14f9629063964ddf5880a9933c..6254af4d13599739b52cfaba505c87aa30ec8b3f 100644
--- a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.h
+++ b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file generateDiagPrecond.h
diff --git a/MathLib/LinAlg/Solvers/BiCGStab.cpp b/MathLib/LinAlg/Solvers/BiCGStab.cpp
index c6dee865205e42700bf484f5a822a45c8d5422ed..308bc1432b3f492f6658cacf2de5169761b566aa 100644
--- a/MathLib/LinAlg/Solvers/BiCGStab.cpp
+++ b/MathLib/LinAlg/Solvers/BiCGStab.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file BiCGStab.cpp
diff --git a/MathLib/LinAlg/Solvers/BiCGStab.h b/MathLib/LinAlg/Solvers/BiCGStab.h
index 6d6f8139baa61a058ac951457d004b4810c6389a..39ed242134807067304534f000993e5c52ee8b1b 100644
--- a/MathLib/LinAlg/Solvers/BiCGStab.h
+++ b/MathLib/LinAlg/Solvers/BiCGStab.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file BiCGStab.h
diff --git a/MathLib/LinAlg/Solvers/CG.cpp b/MathLib/LinAlg/Solvers/CG.cpp
index a65d7898e7a63f147cc599ec0062162ccd886de7..7113d5f6d9bf1ed4d6894ab7e57b565b44259dc4 100644
--- a/MathLib/LinAlg/Solvers/CG.cpp
+++ b/MathLib/LinAlg/Solvers/CG.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CG.cpp
diff --git a/MathLib/LinAlg/Solvers/CG.h b/MathLib/LinAlg/Solvers/CG.h
index d10e1a84765fd0ddd28f61b918e27000792dd063..7903b018ad06afcc02c5be520e3b70d612313d5e 100644
--- a/MathLib/LinAlg/Solvers/CG.h
+++ b/MathLib/LinAlg/Solvers/CG.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CG.h
diff --git a/MathLib/LinAlg/Solvers/CGParallel.cpp b/MathLib/LinAlg/Solvers/CGParallel.cpp
index 769f01e62c55ef0aee44eaba05d6a4b2ed29eeff..762ca139828a388b7ddd87ad3ab5886e4591430c 100644
--- a/MathLib/LinAlg/Solvers/CGParallel.cpp
+++ b/MathLib/LinAlg/Solvers/CGParallel.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CGParallel.cpp
diff --git a/MathLib/LinAlg/Solvers/DenseDirectLinearSolver.h b/MathLib/LinAlg/Solvers/DenseDirectLinearSolver.h
index a37b6531b8b7176540bd17f476541cd766c98897..1f32c7d789a2053188073622c6e84b109ff16d31 100644
--- a/MathLib/LinAlg/Solvers/DenseDirectLinearSolver.h
+++ b/MathLib/LinAlg/Solvers/DenseDirectLinearSolver.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file DenseDirectLinearSolver.h
diff --git a/MathLib/LinAlg/Solvers/DirectLinearSolver.h b/MathLib/LinAlg/Solvers/DirectLinearSolver.h
index 10838d6a08695a13a7c90868946677f2e1c2d797..39670d1287917bc9aa9a21ce195406373047e069 100644
--- a/MathLib/LinAlg/Solvers/DirectLinearSolver.h
+++ b/MathLib/LinAlg/Solvers/DirectLinearSolver.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file DirectLinearSolver.h
diff --git a/MathLib/LinAlg/Solvers/GMRes.cpp b/MathLib/LinAlg/Solvers/GMRes.cpp
index 460f5629e08518b5d298e714405bf490eb2257f9..70b5424a7ef9fa1bdfded11872c06b6d4f9c0517 100644
--- a/MathLib/LinAlg/Solvers/GMRes.cpp
+++ b/MathLib/LinAlg/Solvers/GMRes.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GMRes.cpp
diff --git a/MathLib/LinAlg/Solvers/GMRes.h b/MathLib/LinAlg/Solvers/GMRes.h
index 518cac6bd0ef9ee9edec69d13899c84f4e535867..5f29966a7e107743bc63aef9168b6a7e554a1010 100644
--- a/MathLib/LinAlg/Solvers/GMRes.h
+++ b/MathLib/LinAlg/Solvers/GMRes.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GMRes.h
diff --git a/MathLib/LinAlg/Solvers/GaussAlgorithm.cpp b/MathLib/LinAlg/Solvers/GaussAlgorithm.cpp
index d40fd5f8b181bef7228e0b87ffdd20a22c7bb0e4..461ca920c61463203612adeeec5efff51b3518c8 100644
--- a/MathLib/LinAlg/Solvers/GaussAlgorithm.cpp
+++ b/MathLib/LinAlg/Solvers/GaussAlgorithm.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GaussAlgorithm.cpp
diff --git a/MathLib/LinAlg/Solvers/GaussAlgorithm.h b/MathLib/LinAlg/Solvers/GaussAlgorithm.h
index b8f4dc153c2f94818b0e7d140a80c851a7646a27..b12ab4d305c33f2987221851b402464e290ead39 100644
--- a/MathLib/LinAlg/Solvers/GaussAlgorithm.h
+++ b/MathLib/LinAlg/Solvers/GaussAlgorithm.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file GaussAlgorithm.h
diff --git a/MathLib/LinAlg/Solvers/IterativeLinearSolver.h b/MathLib/LinAlg/Solvers/IterativeLinearSolver.h
index ddb6ed5b54f9924fbd37ef276f0842c6e9ffdd50..6186fcb45c87a279c8612fd37105fd0892b52f50 100644
--- a/MathLib/LinAlg/Solvers/IterativeLinearSolver.h
+++ b/MathLib/LinAlg/Solvers/IterativeLinearSolver.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file IterativeLinearSolver.h
diff --git a/MathLib/LinAlg/Solvers/LinearSolver.h b/MathLib/LinAlg/Solvers/LinearSolver.h
index 23a4f06b195910072c034ae6951e80eebdebe0e7..fce545ebc634aaf099a58eedc38039fa85e653e0 100644
--- a/MathLib/LinAlg/Solvers/LinearSolver.h
+++ b/MathLib/LinAlg/Solvers/LinearSolver.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file LinearSolver.h
diff --git a/MathLib/LinAlg/Solvers/TriangularSolve.cpp b/MathLib/LinAlg/Solvers/TriangularSolve.cpp
index 711cbecd69b25d093ce9441da889c1f636e1021a..4abdbcd140c07019f8322bde88b8af0d9ede309d 100644
--- a/MathLib/LinAlg/Solvers/TriangularSolve.cpp
+++ b/MathLib/LinAlg/Solvers/TriangularSolve.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file TriangularSolve.cpp
diff --git a/MathLib/LinAlg/Solvers/TriangularSolve.h b/MathLib/LinAlg/Solvers/TriangularSolve.h
index 7ece972e2a5c92b005ac752361698b81bca41bb2..234ced0c65d0592a7568fbf1ea2201a67fb5cc24 100644
--- a/MathLib/LinAlg/Solvers/TriangularSolve.h
+++ b/MathLib/LinAlg/Solvers/TriangularSolve.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file TriangularSolve.h
diff --git a/MathLib/LinAlg/Solvers/solver.h b/MathLib/LinAlg/Solvers/solver.h
index 23907dbf200d2042628e2f3903d3e5b6b2dd62cc..26b474a14256fb5e0b30e17ce2c0a8e7cf5f8d4c 100644
--- a/MathLib/LinAlg/Solvers/solver.h
+++ b/MathLib/LinAlg/Solvers/solver.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file solver.h
diff --git a/MathLib/LinAlg/Sparse/CRSMatrix.h b/MathLib/LinAlg/Sparse/CRSMatrix.h
index ac2d3b179e57903e6018e8574960156b78466dd0..e40b46d6f35f0323be7a92937006ba9bc0c69a18 100644
--- a/MathLib/LinAlg/Sparse/CRSMatrix.h
+++ b/MathLib/LinAlg/Sparse/CRSMatrix.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CRSMatrix.h
diff --git a/MathLib/LinAlg/Sparse/CRSMatrixOpenMP.h b/MathLib/LinAlg/Sparse/CRSMatrixOpenMP.h
index eb19ea7ff883fb213fce01a9da6aa3cb232e399b..cd874ec552e75b82314898b8936e6589aefc6028 100644
--- a/MathLib/LinAlg/Sparse/CRSMatrixOpenMP.h
+++ b/MathLib/LinAlg/Sparse/CRSMatrixOpenMP.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CRSMatrixOpenMP.h
diff --git a/MathLib/LinAlg/Sparse/CRSMatrixPThreads.h b/MathLib/LinAlg/Sparse/CRSMatrixPThreads.h
index 7d92dc3c2e5b6ccc5a13d25ec3595eb97ce5a593..e75b77c1339068176adfb865503b86733cbaf6e6 100644
--- a/MathLib/LinAlg/Sparse/CRSMatrixPThreads.h
+++ b/MathLib/LinAlg/Sparse/CRSMatrixPThreads.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CRSMatrixPThreads.h
diff --git a/MathLib/LinAlg/Sparse/CRSSymMatrix.h b/MathLib/LinAlg/Sparse/CRSSymMatrix.h
index 1ff579f5e331634f4ec7a7c763d492de13f4fe0e..5049c781bd12286f36f2631bedc8189bb6c0821a 100644
--- a/MathLib/LinAlg/Sparse/CRSSymMatrix.h
+++ b/MathLib/LinAlg/Sparse/CRSSymMatrix.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CRSSymMatrix.h
diff --git a/MathLib/LinAlg/Sparse/CRSTranspose.h b/MathLib/LinAlg/Sparse/CRSTranspose.h
index 91121669cb22adc465df38ea35ccfc53fbf58543..95d84853ccd1704c7cc2a4a13f751f243afb6efe 100644
--- a/MathLib/LinAlg/Sparse/CRSTranspose.h
+++ b/MathLib/LinAlg/Sparse/CRSTranspose.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CRSTranspose.h
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp
index 972f1c21b3537c5278fa7590745f2e375338521c..849ea3384c7e3d61bfa72bd4f6c5d9739294248e 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file AdjMat.cpp
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h
index a0fa1fa07faff509388598de4e2d555c8f1978f2..f80af5f1b205fd371328a53a7345ceebdf24f963 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file AdjMat.h
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp
index 96c7af055e9e8ae9f0e967198fd5cc382e7597f9..e147ac155d70653e1a6d6facbc0c5b3cdbfbac79 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CRSMatrixReordered.cpp
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h
index 5fcc079b65b40f877028d9c3e82ebccd505db567..34d1c35b41a2070929acffe262f283fb9c86458f 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CRSMatrixReordered.h
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.cpp b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.cpp
index f00f8a4c1cc3d44dca7bfd887e9871dcee377ae0..834c5e4b5032f2eb4c8ad372f1082241a17fe02c 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.cpp
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CRSMatrixReorderedOpenMP.cpp
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.h
index 7e6988750c2eb471fb81eb3bed912dee07c8d6b4..15d857e2d1de564184f53b7a54ebd1c35f470efd 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.h
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file CRSMatrixReorderedOpenMP.h
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.cpp b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.cpp
index 45054a8f35b9e1dd9fe53fd26866b64fc5cb205c..cd6bc82442c77884a4290579bcb15c7280e4e6d7 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.cpp
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Cluster.cpp
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h
index 8fc573ac5704ff4ae8d5036e3207bfc3f39d459e..ded1dfb3b391327e3e9231070b4b1096514a153e 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Cluster.h
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/ClusterBase.cpp b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/ClusterBase.cpp
index 1a123c865de49eaaec61dd2ffd46136c8f4b2165..7ef1eb64cace6db6bafa72c7289d239ebc8e748c 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/ClusterBase.cpp
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/ClusterBase.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file ClusterBase.cpp
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/ClusterBase.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/ClusterBase.h
index 69510dbff32a67c677d05082565dc911373cf22f..31b4e55b9904beb6832e3d15165029ead3532fb9 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/ClusterBase.h
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/ClusterBase.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file ClusterBase.h
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.cpp b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.cpp
index 20b2a1b1c02730984e9c0ea14489dddbe6f10376..fd5f31beb5c15ac59b1589763be8f6fd26f6ac76 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.cpp
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Separator.cpp
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.h
index 6062b26c5bc71e42d94a48b15a36f16ac2ef9c5e..9e27fe47e2502a480cb7f30fa4ea87b66784fe91 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.h
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Separator.h
diff --git a/MathLib/LinAlg/Sparse/amuxCRS.cpp b/MathLib/LinAlg/Sparse/amuxCRS.cpp
index 178311d3a882e2782d51a4da737899b264f79f5d..b57a3cdc8415016321563ff80d8edb21bc6ceb6f 100644
--- a/MathLib/LinAlg/Sparse/amuxCRS.cpp
+++ b/MathLib/LinAlg/Sparse/amuxCRS.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file amuxCRS.cpp
diff --git a/MathLib/LinAlg/Sparse/amuxCRS.h b/MathLib/LinAlg/Sparse/amuxCRS.h
index 0adf588862ab3c488f0aff28ce5fde6645ed0445..9f0d75cef4e1cc6aaa20d97610ad6e8b733c6fcf 100644
--- a/MathLib/LinAlg/Sparse/amuxCRS.h
+++ b/MathLib/LinAlg/Sparse/amuxCRS.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file amuxCRS.h
diff --git a/MathLib/LinAlg/VectorNorms.h b/MathLib/LinAlg/VectorNorms.h
index 7d843f367805a5afa60d978bf7d8e5971e89c4f9..271353f7b742bc18eade40f0d161013467882056 100644
--- a/MathLib/LinAlg/VectorNorms.h
+++ b/MathLib/LinAlg/VectorNorms.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file VectorNorms.h
diff --git a/MathLib/MathTools.cpp b/MathLib/MathTools.cpp
index 66db48c65d6a91c0ddbafb268580c81d9f3cc216..528dbdda2d9dc23e49f1975b7e7710642f42aecb 100644
--- a/MathLib/MathTools.cpp
+++ b/MathLib/MathTools.cpp
@@ -1,8 +1,8 @@
 	/**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file MathTools.cpp
diff --git a/MathLib/MathTools.h b/MathLib/MathTools.h
index e3465289074354c7dee1f850394c5c3d811e4cb8..ecd3dd5b07a5c2e4d4340b57c1884b792e908742 100644
--- a/MathLib/MathTools.h
+++ b/MathLib/MathTools.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file MathTools.h
diff --git a/MathLib/Vector3.h b/MathLib/Vector3.h
index 5f942d4da33e0343f59456c8d1dc4772e8393bbe..463ba34a5fee5e22c6edab4977869f4fa23bea16 100644
--- a/MathLib/Vector3.h
+++ b/MathLib/Vector3.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Vector3.h
diff --git a/MathLib/max.h b/MathLib/max.h
index 319f363fb780d0bbb8b7ea2844c120c3c45eedd1..055f705fbf141575a53ac43c381d514135d5178c 100644
--- a/MathLib/max.h
+++ b/MathLib/max.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file max.h
diff --git a/MathLib/sparse.h b/MathLib/sparse.h
index 68f0a32b7ac2645f39abb241800d94870fe551b0..62f5bbcc11304b038fd870b5ad40590275dd6443 100644
--- a/MathLib/sparse.h
+++ b/MathLib/sparse.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file sparse.h
diff --git a/MathLib/vector_io.h b/MathLib/vector_io.h
index a4bb54a6009c8da82f394a80443cc59a7072c509..5312804a21487fd879fe8372b0a051a8736f1e3e 100644
--- a/MathLib/vector_io.h
+++ b/MathLib/vector_io.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file vector_io.h
diff --git a/MeshLib/Elements/Cell.cpp b/MeshLib/Elements/Cell.cpp
index 280f34f6eb82f309658b7a4d865c03fe6a2f865b..7ed7b117115e01368345c49b489a1816118d54ef 100644
--- a/MeshLib/Elements/Cell.cpp
+++ b/MeshLib/Elements/Cell.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Cell.cpp
diff --git a/MeshLib/Elements/Cell.h b/MeshLib/Elements/Cell.h
index e14797f487ae5b08755d53e4195a6b60a61743b6..9f28ea3d7ecfc672884c4f59ab40a5bbdfbbec96 100644
--- a/MeshLib/Elements/Cell.h
+++ b/MeshLib/Elements/Cell.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Cell.h
diff --git a/MeshLib/Elements/Edge.cpp b/MeshLib/Elements/Edge.cpp
index dc024ad92ac281b2f731c015057e0b31c506fa9e..2722b9a13def6939e8fcc2d48f97c7df5e5531d3 100644
--- a/MeshLib/Elements/Edge.cpp
+++ b/MeshLib/Elements/Edge.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Edge.cpp
diff --git a/MeshLib/Elements/Edge.h b/MeshLib/Elements/Edge.h
index a14be496b32a881f11019bca7ccd8498d4fd327a..4d78168ff2b5756a88c6473b70abdb7e50e2aa89 100644
--- a/MeshLib/Elements/Edge.h
+++ b/MeshLib/Elements/Edge.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Edge.h
diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp
index e3bef2d317633bb4fa7dbd66e759f873adc273b4..ca7bc18a3c255e4f6dc6c485cbb438c1b911b848 100644
--- a/MeshLib/Elements/Element.cpp
+++ b/MeshLib/Elements/Element.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Element.cpp
@@ -108,7 +108,7 @@ unsigned Element::getNodeIDinElement(const MeshLib::Node* node) const
 {
 	const unsigned nNodes (this->getNNodes());
 	for (unsigned i(0); i<nNodes; i++)
-		if (node == _nodes[i]) 
+		if (node == _nodes[i])
 			return i;
 	return std::numeric_limits<unsigned>::max();
 }
diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index 7ac7218b746a1991ec77a85fea2068efc45f7fd8..2b896aa6a1dc3dcbef40c23a0113575a13bff4d7 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Element.h
@@ -136,7 +136,7 @@ public:
 	 */
 	virtual Element* reviseElement() const = 0;
 
-	/** 
+	/**
 	 * Computes the length / area / volumen of this element. This is automatically
 	 * done at initalisation time but can be repeated by calling this function at any time.
 	 */
diff --git a/MeshLib/Elements/Face.cpp b/MeshLib/Elements/Face.cpp
index 42b092981a65297861f5ae77b1415dad5e1df6a3..b0c745b43f639681ba103196701e49fdabeb6e06 100644
--- a/MeshLib/Elements/Face.cpp
+++ b/MeshLib/Elements/Face.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Face.cpp
diff --git a/MeshLib/Elements/Face.h b/MeshLib/Elements/Face.h
index 3fb1a126084cd0d6c86131da3db463dc206d81f0..f310b952daf1fb582d0010addc898f0bbe7e2f1f 100644
--- a/MeshLib/Elements/Face.h
+++ b/MeshLib/Elements/Face.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Face.h
diff --git a/MeshLib/Elements/FemElem.cpp b/MeshLib/Elements/FemElem.cpp
index 0c0dd9fe540216d98771cedf1bce4a24262c9101..d4695a597f2ffb6085dea46dc87314e19eed2a9d 100644
--- a/MeshLib/Elements/FemElem.cpp
+++ b/MeshLib/Elements/FemElem.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FemElem.cpp
diff --git a/MeshLib/Elements/FemElem.h b/MeshLib/Elements/FemElem.h
index 01c137a4a13a3657784f017b91f4e54923860cbc..cfe740709f1868d2f13cef100c8ebdc8e32cc2c4 100644
--- a/MeshLib/Elements/FemElem.h
+++ b/MeshLib/Elements/FemElem.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FemElem.h
diff --git a/MeshLib/Elements/Hex.cpp b/MeshLib/Elements/Hex.cpp
index 7b0dae8a288a4675bfb965f81153f8fc6b733301..2ec5bf0a108bb6eb511677c2db295787f5ad3c5e 100644
--- a/MeshLib/Elements/Hex.cpp
+++ b/MeshLib/Elements/Hex.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Hex.cpp
@@ -137,7 +137,7 @@ unsigned Hex::identifyFace(Node* nodes[3]) const
 		unsigned flag(0);
 		for (unsigned j=0; j<4; j++)
 			for (unsigned k=0; k<3; k++)
-				if (_nodes[_face_nodes[i][j]] == nodes[k]) 
+				if (_nodes[_face_nodes[i][j]] == nodes[k])
 					flag++;
 		if (flag==3)
 			return i;
diff --git a/MeshLib/Elements/Hex.h b/MeshLib/Elements/Hex.h
index 3f1cc3e27825633edc74c8347f6d79503dee7350..14943ec47a3b1f5f95f75c57dfa68a3c330417cd 100644
--- a/MeshLib/Elements/Hex.h
+++ b/MeshLib/Elements/Hex.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Hex.h
diff --git a/MeshLib/Elements/Prism.cpp b/MeshLib/Elements/Prism.cpp
index a88089ea26c5a4073b54f4590b58903c04e17810..76198ffdfb127d58fc124388014c101cf2b4f729 100644
--- a/MeshLib/Elements/Prism.cpp
+++ b/MeshLib/Elements/Prism.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Prism.cpp
@@ -142,7 +142,7 @@ unsigned Prism::identifyFace(Node* nodes[3]) const
 		unsigned flag(0);
 		for (unsigned j=0; j<4; j++)
 			for (unsigned k=0; k<3; k++)
-				if (_face_nodes[i][j] != 99 && _nodes[_face_nodes[i][j]] == nodes[k]) 
+				if (_face_nodes[i][j] != 99 && _nodes[_face_nodes[i][j]] == nodes[k])
 					flag++;
 		if (flag==3)
 			return i;
diff --git a/MeshLib/Elements/Prism.h b/MeshLib/Elements/Prism.h
index 6167377f25cc3ca6dea85a6db8235ac5fee54e87..785283715fb1db3c70157c1ced2d6133ef7f4f3a 100644
--- a/MeshLib/Elements/Prism.h
+++ b/MeshLib/Elements/Prism.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Prism.h
diff --git a/MeshLib/Elements/Pyramid.cpp b/MeshLib/Elements/Pyramid.cpp
index 8f782e89d1158754817b772da2ba981125a88d71..89bbe6753bb36738d6ba520f0e832353e41bba39 100644
--- a/MeshLib/Elements/Pyramid.cpp
+++ b/MeshLib/Elements/Pyramid.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Pyramid.cpp
@@ -141,7 +141,7 @@ unsigned Pyramid::identifyFace(Node* nodes[3]) const
 		unsigned flag(0);
 		for (unsigned j=0; j<4; j++)
 			for (unsigned k=0; k<3; k++)
-				if (_face_nodes[i][j] != 99 && _nodes[_face_nodes[i][j]] == nodes[k]) 
+				if (_face_nodes[i][j] != 99 && _nodes[_face_nodes[i][j]] == nodes[k])
 					flag++;
 		if (flag==3)
 			return i;
diff --git a/MeshLib/Elements/Pyramid.h b/MeshLib/Elements/Pyramid.h
index 4b2f33241f2d72f478fba74c6a9a7e02308c025c..97d818035bb80325571784703fdc28838067654e 100644
--- a/MeshLib/Elements/Pyramid.h
+++ b/MeshLib/Elements/Pyramid.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Pyramid.h
diff --git a/MeshLib/Elements/Quad.cpp b/MeshLib/Elements/Quad.cpp
index ba5cecd10d62736a31d2f97e8fcd9b107dd74781..cc2515c3529883b85acd68c16fee80c816461922 100644
--- a/MeshLib/Elements/Quad.cpp
+++ b/MeshLib/Elements/Quad.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Quad.cpp
@@ -97,7 +97,7 @@ unsigned Quad::identifyFace(Node* nodes[3]) const
 		unsigned flag(0);
 		for (unsigned j=0; j<2; j++)
 			for (unsigned k=0; k<2; k++)
-				if (_nodes[_edge_nodes[i][j]] == nodes[k]) 
+				if (_nodes[_edge_nodes[i][j]] == nodes[k])
 					flag++;
 		if (flag==2)
 			return i;
diff --git a/MeshLib/Elements/Quad.h b/MeshLib/Elements/Quad.h
index 1b7a885ab2f2d8d264fe2d7f1c605c0e04365319..e5a8d798b4cfa3793775805a4a9ddaea4199fbb5 100644
--- a/MeshLib/Elements/Quad.h
+++ b/MeshLib/Elements/Quad.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Quad.h
diff --git a/MeshLib/Elements/Tet.cpp b/MeshLib/Elements/Tet.cpp
index 2d2fe6770932e21ec4d0bb11fd36d7310fb381c8..c34f03c58ed7a94942a744499ec81300d40e9c50 100644
--- a/MeshLib/Elements/Tet.cpp
+++ b/MeshLib/Elements/Tet.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Tet.cpp
@@ -127,7 +127,7 @@ unsigned Tet::identifyFace(Node* nodes[3]) const
 		unsigned flag(0);
 		for (unsigned j=0; j<3; j++)
 			for (unsigned k=0; k<3; k++)
-				if (_nodes[_face_nodes[i][j]] == nodes[k]) 
+				if (_nodes[_face_nodes[i][j]] == nodes[k])
 					flag++;
 		if (flag==3)
 			return i;
diff --git a/MeshLib/Elements/Tet.h b/MeshLib/Elements/Tet.h
index 8563ad41c2400e6d4f20fcc3caf8f5c90687d14d..4958fcea391183309a0e27388592f11e5ef27694 100644
--- a/MeshLib/Elements/Tet.h
+++ b/MeshLib/Elements/Tet.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Tet.h
diff --git a/MeshLib/Elements/Tet10.cpp b/MeshLib/Elements/Tet10.cpp
index 55e8fa6029a173dc90a48a5449bfd6ae17da1686..feb22899c9a11392dcebcf3622b2e436707bf7ac 100644
--- a/MeshLib/Elements/Tet10.cpp
+++ b/MeshLib/Elements/Tet10.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Tet10.cpp
diff --git a/MeshLib/Elements/Tet10.h b/MeshLib/Elements/Tet10.h
index f2928c9310cbb1c329ca22e34d34683570311db7..a33a86d24e3aec2a17341e23fcdbf9aea587d33f 100644
--- a/MeshLib/Elements/Tet10.h
+++ b/MeshLib/Elements/Tet10.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Tet10.h
diff --git a/MeshLib/Elements/Tet4.cpp b/MeshLib/Elements/Tet4.cpp
index 97cf0102228663cc46daee525fbd3fb39513443a..da76c503b605a7340813bae344e14ba8135f3672 100644
--- a/MeshLib/Elements/Tet4.cpp
+++ b/MeshLib/Elements/Tet4.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Tet4.cpp
diff --git a/MeshLib/Elements/Tet4.h b/MeshLib/Elements/Tet4.h
index 10ea31ec0ae80611b5e7abd15a8aef09f084d1da..71586cf95812fa4c53b2469506e9b9c09aab6f4b 100644
--- a/MeshLib/Elements/Tet4.h
+++ b/MeshLib/Elements/Tet4.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Tet4.h
diff --git a/MeshLib/Elements/Tri.cpp b/MeshLib/Elements/Tri.cpp
index e3d51768685ed36e32f94dc2bf384900c9e0739a..4ff9fb8561ebff2f4700ce63046338cbee4d3083 100644
--- a/MeshLib/Elements/Tri.cpp
+++ b/MeshLib/Elements/Tri.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Tri.cpp
@@ -94,7 +94,7 @@ unsigned Tri::identifyFace(Node* nodes[3]) const
 		unsigned flag(0);
 		for (unsigned j=0; j<2; j++)
 			for (unsigned k=0; k<2; k++)
-				if (_nodes[_edge_nodes[i][j]] == nodes[k]) 
+				if (_nodes[_edge_nodes[i][j]] == nodes[k])
 					flag++;
 		if (flag==2)
 			return i;
diff --git a/MeshLib/Elements/Tri.h b/MeshLib/Elements/Tri.h
index 77961bc57a3010469111e7d382b0e5346421653e..b4cc0da6d9afa249bf02345f55586e73a94c8936 100644
--- a/MeshLib/Elements/Tri.h
+++ b/MeshLib/Elements/Tri.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Tri.h
diff --git a/MeshLib/FemMesh.cpp b/MeshLib/FemMesh.cpp
index 185fd531a217cf79b817166cb40e4dc0ab1e3292..085ecacd89e83884f6e06004f437fbaaeb8791ea 100644
--- a/MeshLib/FemMesh.cpp
+++ b/MeshLib/FemMesh.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FemMesh.cpp
diff --git a/MeshLib/FemMesh.h b/MeshLib/FemMesh.h
index 7926a04b653795622a7c497c6c54d220328b45ff..4a771607a6915ae36f73478dfe30906b76c3ff25 100644
--- a/MeshLib/FemMesh.h
+++ b/MeshLib/FemMesh.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FemMesh.h
diff --git a/MeshLib/FemNode.cpp b/MeshLib/FemNode.cpp
index 06612d1a720283d744be9f74381691e5fb38faa0..c028ddf7ba24e49538cb0796d1745dc38d081dc5 100644
--- a/MeshLib/FemNode.cpp
+++ b/MeshLib/FemNode.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FemNode.cpp
diff --git a/MeshLib/FemNode.h b/MeshLib/FemNode.h
index cc8d6785d9f60af02c1c381e2679e898d9c36885..a89b6a9a802b9b7feb038908f0d4bbe157f2ea9b 100644
--- a/MeshLib/FemNode.h
+++ b/MeshLib/FemNode.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file FemNode.h
diff --git a/MeshLib/Mesh.cpp b/MeshLib/Mesh.cpp
index 1346ed09d74923e35e9798903beea74dfcd339c0..f11cf4d36e5a812dd1c053fdfc4d3a506eb5dd0c 100644
--- a/MeshLib/Mesh.cpp
+++ b/MeshLib/Mesh.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Mesh.cpp
diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h
index c499bf8aa3f85c0fc0a410461de3b0dd9c8cd3f8..30889c6ddc943dc8b09ebde4d05d2606ef536fdd 100644
--- a/MeshLib/Mesh.h
+++ b/MeshLib/Mesh.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Mesh.h
diff --git a/MeshLib/MshEnums.cpp b/MeshLib/MshEnums.cpp
index ac21c6a19cb7d6cc106d4fa3056903c40d1e88c2..b46809b5d7347b2765b8e09703371e844b885b40 100644
--- a/MeshLib/MshEnums.cpp
+++ b/MeshLib/MshEnums.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file MshEnums.cpp
diff --git a/MeshLib/MshEnums.h b/MeshLib/MshEnums.h
index baf5465baec167e04c727f8503d3e819495386ec..437fddffed41de42741e634e0c200282df3be5d6 100644
--- a/MeshLib/MshEnums.h
+++ b/MeshLib/MshEnums.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file MshEnums.h
diff --git a/MeshLib/Node.cpp b/MeshLib/Node.cpp
index 4d3b6f83f5e96d912778bf3fee7d6a5ca37cb18a..629fa7f973e5bce87f227ec3ece490aa9390195b 100644
--- a/MeshLib/Node.cpp
+++ b/MeshLib/Node.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Node.cpp
diff --git a/MeshLib/Node.h b/MeshLib/Node.h
index 61936ff13086b054065888713318b8b174944b91..0acb30279b720100ef4ea0b608f4d36dbc453e7f 100644
--- a/MeshLib/Node.h
+++ b/MeshLib/Node.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file Node.h
@@ -37,7 +37,7 @@ class Node : public GeoLib::PointWithID
 	/* friend functions: */
 	friend MeshLib::Mesh* MshEditor::removeMeshNodes(MeshLib::Mesh* mesh, const std::vector<std::size_t> &nodes);
 #ifdef OGS_BUILD_GUI
-	friend int MshLayerMapper::LayerMapping(MeshLib::Mesh* msh, const std::string &rasterfile, const unsigned nLayers, 
+	friend int MshLayerMapper::LayerMapping(MeshLib::Mesh* msh, const std::string &rasterfile, const unsigned nLayers,
 		                                    const unsigned layer_id, bool removeNoDataValues);
 	friend MeshLib::Mesh* MshLayerMapper::blendLayersWithSurface(MeshLib::Mesh* mesh, const unsigned nLayers, const std::string &dem_raster);
 #endif
diff --git a/OGS/ProjectData.cpp b/OGS/ProjectData.cpp
index df98bf5de59f7a56d26ec039da5ca577fa13de0e..00f485d6e67c881b7b0b979b28bef5c22e08875c 100644
--- a/OGS/ProjectData.cpp
+++ b/OGS/ProjectData.cpp
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file ProjectData.cpp
diff --git a/OGS/ProjectData.h b/OGS/ProjectData.h
index 354c148a2c46969cd7e75de525d76e312c67f966..7792f42b7730405bc53ed6bef56d831307da0269 100644
--- a/OGS/ProjectData.h
+++ b/OGS/ProjectData.h
@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.com)
+ * Copyright (c) 2012, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.com/LICENSE.txt
+ *              http://www.opengeosys.org/project/license
  *
  *
  * \file ProjectData.h
diff --git a/SimpleTests/MeshTests/CollapseMeshNodes.cpp b/SimpleTests/MeshTests/CollapseMeshNodes.cpp
index ee44736e2088a4aa288366480f328231f6cb9542..8145e97dde8f0be64c1e49f5a188bf4d134eace1 100644
--- a/SimpleTests/MeshTests/CollapseMeshNodes.cpp
+++ b/SimpleTests/MeshTests/CollapseMeshNodes.cpp
@@ -13,6 +13,7 @@
 #include "MemWatch.h"
 #include "RunTime.h"
 #include "tclap/CmdLine.h"
+#include "LogogSimpleFormatter.h"
 
 // BaseLib/logog
 #include "logog.hpp"
@@ -24,23 +25,10 @@
 #include "Legacy/MeshIO.h"
 #include "MeshCoarsener.h"
 
-
-/**
- * new formatter for logog
- */
-class FormatterCustom : public logog::FormatterGCC
-{
-    virtual TOPIC_FLAGS GetTopicFlags( const logog::Topic &topic )
-    {
-        return ( Formatter::GetTopicFlags( topic ) &
-                 ~( TOPIC_FILE_NAME_FLAG | TOPIC_LINE_NUMBER_FLAG ));
-    }
-};
-
 int main(int argc, char *argv[])
 {
 	LOGOG_INITIALIZE();
-	FormatterCustom *custom_format (new FormatterCustom);
+	BaseLib::LogogSimpleFormatter *custom_format (new BaseLib::LogogSimpleFormatter);
 	logog::Cout *logogCout(new logog::Cout);
 	logogCout->SetFormatter(*custom_format);
 
diff --git a/SimpleTests/MeshTests/MeshSearchTest.cpp b/SimpleTests/MeshTests/MeshSearchTest.cpp
index e8b7f7066e112290f5e889df77028f068a39f076..c70c22f042c95fdab8d874569540445c9edc1c02 100644
--- a/SimpleTests/MeshTests/MeshSearchTest.cpp
+++ b/SimpleTests/MeshTests/MeshSearchTest.cpp
@@ -13,6 +13,7 @@
 #include "MemWatch.h"
 #include "RunTime.h"
 #include "tclap/CmdLine.h"
+#include "LogogSimpleFormatter.h"
 
 // BaseLib/logog
 #include "logog.hpp"
@@ -26,18 +27,6 @@
 #include "Mesh.h"
 #include "Legacy/MeshIO.h"
 
-/**
- * new formatter for logog
- */
-class FormatterCustom : public logog::FormatterGCC
-{
-    virtual TOPIC_FLAGS GetTopicFlags( const logog::Topic &topic )
-    {
-        return ( Formatter::GetTopicFlags( topic ) &
-                 ~( TOPIC_FILE_NAME_FLAG | TOPIC_LINE_NUMBER_FLAG ));
-    }
-};
-
 void testMeshGridAlgorithm(MeshLib::Mesh const*const mesh,
 				std::vector<GeoLib::Point*>& pnts_for_search,
 				std::vector<size_t> &idx_found_nodes, bool contiguous)
@@ -106,7 +95,7 @@ int main(int argc, char *argv[])
 {
 	LOGOG_INITIALIZE();
 	logog::Cout* logog_cout (new logog::Cout);
-	FormatterCustom *custom_format (new FormatterCustom);
+	BaseLib::LogogSimpleFormatter *custom_format (new BaseLib::LogogSimpleFormatter);
 	logog_cout->SetFormatter(*custom_format);
 
 	TCLAP::CmdLine cmd("Simple mesh search test", ' ', "0.1");
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index d22d40589e22879ad16ab37f009ff3e592b0dbe2..99f059df0f98c9a3d75e4f53e920f6196d6994e6 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -12,10 +12,5 @@ INCLUDE(GetCompilerInfoString)
 # Suppress warning on setting policies
 CMAKE_POLICY(SET CMP0011 OLD)
 
-# Suppress warning on add_subdirectory(dir) where dir contains no CMakeLists.txt
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.7)
-	CMAKE_POLICY(SET CMP0014 OLD)
-ENDIF ()
-
 # Get the hostname
 SITE_NAME(HOSTNAME)
diff --git a/scripts/cmake/CheckTypeSizes.cmake b/scripts/cmake/CheckTypeSizes.cmake
index c73aed8b3d4821145907c76678d62fbd1834cf52..4d9f23b54b1e5625997e2be48ee0c893a4c081a7 100644
--- a/scripts/cmake/CheckTypeSizes.cmake
+++ b/scripts/cmake/CheckTypeSizes.cmake
@@ -3,4 +3,15 @@ INCLUDE (CheckTypeSize)
 CHECK_TYPE_SIZE(int SIZEOF_INT)
 CHECK_TYPE_SIZE(long SIZEOF_LONG)
 CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
-CHECK_TYPE_SIZE("void *" SIZEOF_VOID_P)
\ No newline at end of file
+CHECK_TYPE_SIZE("void *" SIZEOF_VOID_P)
+
+# Sets Bits variables
+# check 64 bit
+IF( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+	SET( HAVE_64_BIT 0 )
+	SET( BITS 32 )
+ELSE()
+	SET( HAVE_64_BIT 1 )
+	ADD_DEFINITIONS(-DHAVE_64_BIT)
+	SET( BITS 64)
+ENDIF()
\ No newline at end of file