diff --git a/makefile b/makefile
index 51b85221f93b4961383de58ba7bb1d4467a6bdc9..f05972414ec066186a03669c6907470799f0389a 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 ########################################################################
 #
-#  Copyright 2015 Johns Hopkins University
+#  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Contact: turbulence@pha.jhu.edu
-# Website: http://turbulence.pha.jhu.edu/
+# Contact: Cristian.Lalescu@ds.mpg.de
 #
 ########################################################################
 
diff --git a/src/Morton_shuffler.cpp b/src/Morton_shuffler.cpp
index 99c4f73f74ef45fe244003def4312080f154d207..02f07637fbb0cbea1d5426678de184aaafa683cc 100644
--- a/src/Morton_shuffler.cpp
+++ b/src/Morton_shuffler.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/Morton_shuffler.hpp b/src/Morton_shuffler.hpp
index 4c6d3444dc3e55543fb968c3d9ae2105f448c321..a1e83b86c69417575e1dab3b02ef0e48aab7495a 100644
--- a/src/Morton_shuffler.hpp
+++ b/src/Morton_shuffler.hpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/base.hpp b/src/base.hpp
index c071b4af8b117beb365c5ce5cc734f7fc3bd6ddb..350106435134b1d04cf16b8a4e10ee02ba621cc8 100644
--- a/src/base.hpp
+++ b/src/base.hpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
+
 #include <mpi.h>
 #include <stdarg.h>
 #include <iostream>
diff --git a/src/fftwf_tools.cpp b/src/fftwf_tools.cpp
index a1b65f94212919e88f720e55524a7666848bc4ab..20de89002a540eceab323c006669cb2cb6dd643c 100644
--- a/src/fftwf_tools.cpp
+++ b/src/fftwf_tools.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/fftwf_tools.hpp b/src/fftwf_tools.hpp
index 1e922ab99130910d5201718efc9c4d1ee5ee96f0..12cbb300911f5dde102d90828ad1bd1453b1d47f 100644
--- a/src/fftwf_tools.hpp
+++ b/src/fftwf_tools.hpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/field_descriptor.cpp b/src/field_descriptor.cpp
index 2b7e2796db966057fb5cdea21610d73e568a1c44..b8a127b54646f3918716cd02305c1f850404ba51 100644
--- a/src/field_descriptor.cpp
+++ b/src/field_descriptor.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/field_descriptor.hpp b/src/field_descriptor.hpp
index dccbdd8fc81c03acb3ed3a4efb8c139a7a5b9519..7b1b677b570d7e0791811df9d06ba910dbedde98 100644
--- a/src/field_descriptor.hpp
+++ b/src/field_descriptor.hpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/fluid_solver.cpp b/src/fluid_solver.cpp
index 1ea35240f6726cd5ac429a2cd72e4482eb8e420c..e4494bb5a5dcf864a7b901d5b02d6b5c3ffc8bc2 100644
--- a/src/fluid_solver.cpp
+++ b/src/fluid_solver.cpp
@@ -1,3 +1,25 @@
+/***********************************************************************
+*
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+* Contact: Cristian.Lalescu@ds.mpg.de
+*
+************************************************************************/
+
+
+
 #include "fluid_solver.hpp"
 
 ///*****************************************************************************/
diff --git a/src/fluid_solver.hpp b/src/fluid_solver.hpp
index d54924d8351eb683feac41e7d57cc66e5da46043..b2c4ecb2703dbb6f7365f83e050523e737dc9357 100644
--- a/src/fluid_solver.hpp
+++ b/src/fluid_solver.hpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/full.cpp b/src/full.cpp
index 26c9cd8c92d8d53d96b59af608733df39e114b97..6a6b29ed144d4bd676c233749748afdf16958d84 100644
--- a/src/full.cpp
+++ b/src/full.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/p3DFFT_to_iR.cpp b/src/p3DFFT_to_iR.cpp
index a8d852428de3fa594639cdff0365d63ed7c2efd3..cb4ecba07ee9a040c1e54d3c009881b99c7699ae 100644
--- a/src/p3DFFT_to_iR.cpp
+++ b/src/p3DFFT_to_iR.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/p3DFFT_to_iR.hpp b/src/p3DFFT_to_iR.hpp
index a04ec0b109dcc3aa8f08a81088ae32c92cd05a7a..db52e7968cca7da347eb03647cf6a97e868df4ca 100644
--- a/src/p3DFFT_to_iR.hpp
+++ b/src/p3DFFT_to_iR.hpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/
 
diff --git a/src/test_field_descriptor.cpp b/src/test_field_descriptor.cpp
index d99c4881ab2e7bcd4b65674bfe29f18514516e67..5c58215403fb83f541f75ab8353f1b26f59c7cc7 100644
--- a/src/test_field_descriptor.cpp
+++ b/src/test_field_descriptor.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
 *
-*  Copyright 2015 Johns Hopkins University
+*  Copyright 2015 Max Planck Institute for Dynamics and SelfOrganization
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
-* Contact: turbulence@pha.jhu.edu
-* Website: http://turbulence.pha.jhu.edu/
+* Contact: Cristian.Lalescu@ds.mpg.de
 *
 ************************************************************************/