diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractBulkInputStream.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractBulkInputStream.java
index 6d7f9de4b8ad0365b80852a8ca4aff4d136f7790..957da99f03dbe1c8644e54f72838dc2c61c003af 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractBulkInputStream.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractBulkInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.IOException;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractId.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractId.java
index 47c2c48441ddbf59465e466b3101ba9f571fcd0a..75f1d120c1fd34cb3d3131e01348693a03a564a0 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractId.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.Serializable;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractLogger.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractLogger.java
index fb933a0941cf96fed075d2ebb246e5fc897e2ca8..b24f088b72976ec158912d6750d1b6203c554788 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractLogger.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/AbstractLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/Chunk.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/Chunk.java
index 00012b5c2cf028dcc207585e614e54bf128d75f9..a0e6380365a3127422cce8407f999342df53c17c 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/Chunk.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/Chunk.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.InputStream;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ChunkInputStream.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ChunkInputStream.java
index fd4ee3c7f72e6409e272a3ed2fb8480b3fa8ccd2..a77c1d7c0557bc8a93a121e9855a27eeed0d989b 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ChunkInputStream.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ChunkInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.IOException;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ConsoleLogger.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ConsoleLogger.java
index 514c2862719993b1e446a33cdc99907a2cde3461..d231abeb01fc1e99e44b3ac2282812fb191f2838 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ConsoleLogger.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ConsoleLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultChunkDeserializer.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultChunkDeserializer.java
index 62ba4e733fe9d54ec360f3265af8acf338935f7c..08f8487676360f85654a55f02c113065c86980e9 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultChunkDeserializer.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultChunkDeserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.ByteArrayInputStream;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultChunkSerializer.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultChunkSerializer.java
index 66f87afe0d4876d276bcee4e98bb029de8050ead..aeea04e81bb84f4fd983cb5c9413d6a1028bc503 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultChunkSerializer.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultChunkSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.InputStream;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultDeserializerProvider.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultDeserializerProvider.java
index cc2b925006be20917036a9dd9d947e248a3afa75..b733e1456488430380b65ce218441526f860997c 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultDeserializerProvider.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultDeserializerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultRetryProvider.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultRetryProvider.java
index c7b4f9ad082e89abffe64393f19e4e738bc69d62..daaa70a704860927ae4f9899e629900491bc49b9 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultRetryProvider.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultRetryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultSerializerProvider.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultSerializerProvider.java
index e6a5a941b2ffabeae65eb626b3ca424c16ae2e4e..4bcb6a24b062773b6ccc64fe604ee4ba39f6109e 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultSerializerProvider.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DefaultSerializerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClient.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClient.java
index 32f4ec67205731d96474a6973848a4c8865ac1c7..3f58694d706b6167ceaf067d97509d44e2750465 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClient.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.util.Collections;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClientConfig.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClientConfig.java
index d35374fe25ee420d91aa7e43ce6f66cec66fc1ab..dcad30dcda9a3970b7545c762e16d384b20abb24 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClientConfig.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClientConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClientDownload.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClientDownload.java
index 9c175d8260e513e4a1a07dc916b69b636185e53f..4f601a199368bf371b4615afe80db68a1dfbaf5d 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClientDownload.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadClientDownload.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.InputStream;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadException.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadException.java
index da645c92bd006d1a8652a1d1540b0365882c5144..d614c2012d04781e6793c0c777e614daf20602cb 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadException.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadInputStream.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadInputStream.java
index 92d3070ec30673b4bfff1ca0d377047ded1bb5e9..ff375df6de7ce00beefe4c86a936e4c4e5550112 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadInputStream.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.IOException;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadInputStreamReader.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadInputStreamReader.java
index 27f5005cc450ea61ed92bbceba9880311bd59c8f..efac740627153b3ed0fbde3f2d99263362bbc2ba 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadInputStreamReader.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadInputStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.IOException;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadItemId.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadItemId.java
index dfc1d8af4780082471eeb313a9230c746868f5f2..151e8527e827c7dc4d85c3e1e54c1c9eb0eec274 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadItemId.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadItemId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadItemNotFoundException.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadItemNotFoundException.java
index 6e82c0611e25eaff1d7430f7453a3dcd644da4b0..200e86694234dd8bc49e5b88f3369f53ad26ec99 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadItemNotFoundException.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadItemNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadListenerAdapter.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadListenerAdapter.java
index 720239bba5f59636f35b2d591dea0a784b6898e3..773dfd764eccf359f585cb3aaba923304b27fc43 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadListenerAdapter.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.nio.file.Path;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadPreferences.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadPreferences.java
index aa82396526a62e2c06cbe4ed514faf482e410465..1ef6c7d6c225a02c428bca2c4d18fce7bf7ec0ff 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadPreferences.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadPreferences.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * 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.
+ */
 package ch.ethz.sis.filetransfer;
 
 import java.io.Serializable;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadRange.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadRange.java
index 655f4ea29a29eeecbc1863e8627ee00ba25c8bcf..14514bf4ea2280d5c5964200980958f0ac362a5c 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadRange.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadRange.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * 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.
+ */
 package ch.ethz.sis.filetransfer;
 
 import java.io.Serializable;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServer.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServer.java
index c111dba2dc92c96de7361432fc96fbe2167f198b..9a73459d02229bbf0962845816553ea8fb8f1537 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServer.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
+ *
+ * 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.
+ */
 package ch.ethz.sis.filetransfer;
 
 import java.io.InputStream;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServerConfig.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServerConfig.java
index 98f342e37b3d882e122703ca9c24182aa07eea18..fa7837d0d4f6067ab0a92aa17769c3de6679ff4f 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServerConfig.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServerConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServerDownload.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServerDownload.java
index 9b7ddc64ea075ac3bd921081dab51a46078d653a..f5493967da887be9517c3ff014bcc7a30491eb08 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServerDownload.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadServerDownload.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
+ *
+ * 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.
+ */
 package ch.ethz.sis.filetransfer;
 
 import java.io.IOException;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadSession.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadSession.java
index 0bae013ff72ccddd104442868638b0dfe6c9d977..a363ce6b2ef57138cf973440deaadff0cdf32897 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadSession.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadSession.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
+ *
+ * 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.
+ */
 package ch.ethz.sis.filetransfer;
 
 import java.io.Serializable;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadSessionId.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadSessionId.java
index a9e3bf531bfcf689d2e711174a26f6030ff1b585..ceaf3697973a86ac2ebde6b40c049b3f68063be9 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadSessionId.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadSessionId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.Serializable;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadState.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadState.java
index cca3dd976ce59868b80db6d6ab29cc9414902545..2557436316fbc745155451757e47cb9cbd8c4f40 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadState.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.Serializable;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadStatus.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadStatus.java
index cefcd015bbfe73ad3b2c887e5cf9acba9a449122..44fa629aca562e66af43bc5af46a82b4b49ca1ad 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadStatus.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadStreamId.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadStreamId.java
index d2043d241125839f2f306a02a6ff6e510103e028..9bff03cf20f98f5f4f3538dd144c6fc481bd13b0 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadStreamId.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/DownloadStreamId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.Serializable;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileChunk.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileChunk.java
index e958146d74dc119b0d82c8d7b43e1bd459e2848b..82bc812511af782147c7229e79c559b20d079c40 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileChunk.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileChunk.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.ByteArrayInputStream;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileSystemChunkProvider.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileSystemChunkProvider.java
index b1e31d6d1dd92a36a5c86e65b83591dff45cf281..84b5ef507c5c8be3ce543f704a951de1450f38b0 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileSystemChunkProvider.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileSystemChunkProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.File;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileSystemDownloadStore.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileSystemDownloadStore.java
index 23a338173963e2b6768b74e2da5c823ac6e4c354..381c3956be1a59c64c9fc4cb4dc1233d1991bf7b 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileSystemDownloadStore.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/FileSystemDownloadStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.File;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkDeserializer.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkDeserializer.java
index 15196ec2bddf4e98ab8c452302ca1f96f8ceae3b..5fd40bef23b22387a559325b33e57687728a17c8 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkDeserializer.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkDeserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.InputStream;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkProvider.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkProvider.java
index dd2988f7e8a29a39fedab3a88a96a208b006918b..87c01bd08d5945a97a46dbce54f890c7fefb27b8 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkProvider.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.util.List;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkQueue.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkQueue.java
index bf8c0fcd9d2bdbcc1d0515f191bad5c7c40cf7cc..91ff9d5074d49232eb63173e6afc2a61a98ef01d 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkQueue.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkSerializer.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkSerializer.java
index 2ec864371b627a0d114c94125baedf09acfe32ee..8e06d7601f541d2f84b033d170dabed825bdb63d 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkSerializer.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IChunkSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.InputStream;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IConcurrencyProvider.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IConcurrencyProvider.java
index c3c9f4ef8ed5b578d177e125ec6fe044feca95a2..070e83d0b489fc6cc1d2bc0b57f7a9ca43ef093d 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IConcurrencyProvider.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IConcurrencyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.util.List;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDeserializerProvider.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDeserializerProvider.java
index ac23d750e94919cdb0ba21fb48709053c3ceb808..1832fcd4f7fb0f7e3d70a5b65d9b73aaebb54998 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDeserializerProvider.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDeserializerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDeserializerProviderFactory.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDeserializerProviderFactory.java
index 8fd8a1fbe8bbdad57d03f610d64d5a872e36984c..7b138fc3c00d6bfbb84b9ebc739ee26a3e15ffac 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDeserializerProviderFactory.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDeserializerProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemId.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemId.java
index 86dd1ce0c10556c2ede2783235162fffe478351c..5e97639a31038799aee48832e8713aaa1b39e46f 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemId.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemId.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
+ *
+ * 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.
+ */
 package ch.ethz.sis.filetransfer;
 
 import java.io.Serializable;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemIdDeserializer.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemIdDeserializer.java
index 150f66e8f66bd9836e5902e0dedbdce73127bc27..200176ba9226f58fb308ff9803f55efc2ab765da 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemIdDeserializer.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemIdDeserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.nio.ByteBuffer;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemIdSerializer.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemIdSerializer.java
index 86c1006cd3f571e9a3b9b08e60c2da7c26a8f7a9..56d20b790c672012fdfbf055dbd90a2ec96038a2 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemIdSerializer.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadItemIdSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadListener.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadListener.java
index 5307c2bdab7176b8b38b7301cc516c70ccbcaf3a..9a688c7c6b4f995db51ce69061e798968c9385a0 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadListener.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.nio.file.Path;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadServer.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadServer.java
index b5b33e025023450e0c8cb02ac1517cff56893bc2..4f355a826c186261d886acb751ade4e91e983c4f 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadServer.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadServer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
+ *
+ * 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.
+ */
 package ch.ethz.sis.filetransfer;
 
 import java.io.InputStream;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadStore.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadStore.java
index 47fde939d3a52865219978ea4c0133c13781287b..beacfa0d85bcd5c5a4dff32ec06dc9845cffa2de 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadStore.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.nio.file.Path;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadStoreFactory.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadStoreFactory.java
index 032314f06cd3a33861e6da77696460ae8b912021..89308ce2e10f10dba5c3f3b2996c9ad95efae52c 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadStoreFactory.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IDownloadStoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.nio.file.Path;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ILogger.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ILogger.java
index db9b1dffe61881b9fd42cd925636e225b9ddcaf5..535a4b1d22a5d8a278c678e9fa66dd546613c5c0 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ILogger.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ILogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryAction.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryAction.java
index b2eedae64c5ef8de0e25bf4c262b8261e172b81f..0b0bfc55e717924f5e0ced6fd13e421da784cf4a 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryAction.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryProvider.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryProvider.java
index 6376f0ba2a7572b30d3e3dd47c4f7b815f9adffd..31ccdd3dee2d1d506bb6a83040cbe9c64a1bf505 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryProvider.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryProviderFactory.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryProviderFactory.java
index 5d56dd913b82fb220f5a8fcaed023200854d3ecf..40781e9beba21db90ce70a70137d2c29fd7348d1 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryProviderFactory.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IRetryProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ISerializerProvider.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ISerializerProvider.java
index 8183dcff28656fdf403dcb89920db791f355bd48..7eb96cf888f43f56f4ed48926286a6455b5c2d0c 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ISerializerProvider.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ISerializerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IUserSessionId.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IUserSessionId.java
index 0f5a374477f0526bae008409e98be220382f1333..b07317f14492b882a05d5301d3106076f0f6dadb 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IUserSessionId.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IUserSessionId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.Serializable;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IUserSessionManager.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IUserSessionManager.java
index ea7848a3daabd7e8d1ee4ea8883a6d3d9159b2be..4a2d55e998d85c3b16aae39642fa39fc4ba13b6c 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/IUserSessionManager.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/IUserSessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidDownloadSessionException.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidDownloadSessionException.java
index 6e4ea9fafe0c3177fc401fd7aa3e6f49bba8540a..bdddf6b3d78054cc7eb3967308f60b58b3b5235b 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidDownloadSessionException.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidDownloadSessionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidDownloadStreamException.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidDownloadStreamException.java
index bdecf53ab1038a602d546dff985eb818f47b9d2d..f6e9872bfc6ec250ee3d8c302d13198bc376b0f2 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidDownloadStreamException.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidDownloadStreamException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidUserSessionException.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidUserSessionException.java
index 4d54dbdb9857fb54e8768281c1b3773dd591eb26..e4d762dd3a28b35541ba4237b453a011282bb935 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidUserSessionException.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/InvalidUserSessionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/LogLevel.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/LogLevel.java
index 800fa9e1a2d743598bcb37b65597c81cd43f9626..7c4eca11a9a21ac5b0eebf5d0bf9b3e9772ebdf2 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/LogLevel.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/LogLevel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/NullLogger.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/NullLogger.java
index e2288f87ae5abb2563cc34b44f6cfbf4f5bb74ff..be2725d4b020b4a831dc830ad5b17b4028bc570c 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/NullLogger.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/NullLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/PayloadInputStream.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/PayloadInputStream.java
index 4d8c999a01a3c3d3f3074c9f0039042ac1b0cd63..2442c70175221d6f70bc4e4c19d78741dd33abe2 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/PayloadInputStream.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/PayloadInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.IOException;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ToString.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ToString.java
index 117f8c587342a5c7d658c1225e3b1efc903bdd54..d992022fb2caef9d05119674b5d6d4d3aff60d55 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/ToString.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/ToString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/lib-file-download/source/java/ch/ethz/sis/filetransfer/UserSessionId.java b/lib-file-download/source/java/ch/ethz/sis/filetransfer/UserSessionId.java
index 7c559d3ab834485834835f3cbbbd1f4d3bb52d91..ea3d30bfa7af01c439e4b5e94b4785b5fe1747c0 100644
--- a/lib-file-download/source/java/ch/ethz/sis/filetransfer/UserSessionId.java
+++ b/lib-file-download/source/java/ch/ethz/sis/filetransfer/UserSessionId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/ChunkInputStreamTest.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/ChunkInputStreamTest.java
index fb64ca7b05f06cacf61a124425a8f9bff407ac93..e5c15ec41737694063bba9693e215f2103cfb223 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/ChunkInputStreamTest.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/ChunkInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import static org.testng.Assert.assertEquals;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadClientTest.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadClientTest.java
index 744ba848b3934fc15c2a95ec1a05044e270b7b3d..e04d6d8bd90e8aaae144db922ec1e80dfc5f1917 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadClientTest.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import static ch.ethz.sis.filetransfer.FailingDownloadServer.OPERATION_DOWNLOAD;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadExample.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadExample.java
index 4c56f379cc7868b938af6cedbc2c5f15137dc37c..22c17bf75794d3eb1aaf486f3e714a0929b3a1b8 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadExample.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.IOException;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadInputStreamTest.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadInputStreamTest.java
index b137f8c5fdebbdff53de20ba574ec26223044c8a..a8a65aee4081fe43f6a1efd841684b12d0cfaa0f 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadInputStreamTest.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/DownloadInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import static org.testng.Assert.assertEquals;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailingDownloadServer.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailingDownloadServer.java
index 7ce18142e94736c2de6aa101dd32258d37e89bab..c66911f8ecbb3abcd9a4bfbb9294b28588438823 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailingDownloadServer.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailingDownloadServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.IOException;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailingDownloadStore.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailingDownloadStore.java
index 50cd567fdccb11bfe7885e0e8f277b225d069c0d..76ea132b759f6bf726aa6771717200642d5259f9 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailingDownloadStore.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailingDownloadStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.nio.file.Path;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailureGenerator.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailureGenerator.java
index 082d802243746c09583a89b2f2ef03b49c3e30ae..1c8910d2d59ad067d1d908f324b37159ff1f0d40 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailureGenerator.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/FailureGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.util.Collection;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/HttpDownloadServer.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/HttpDownloadServer.java
index f0026fdc6f309d5ea58b5b98ef6703f6397dc4bc..1afe659586a568b7f42501c372e09ae8582d1305 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/HttpDownloadServer.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/HttpDownloadServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.ByteArrayInputStream;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/InconsistentCRCDownloadServer.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/InconsistentCRCDownloadServer.java
index faff0e8acd8951b9312717f1436007ca78650460..65a683199278528f3a5d958c5a1101842b6b6039 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/InconsistentCRCDownloadServer.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/InconsistentCRCDownloadServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.IOException;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/PayloadInputStreamTest.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/PayloadInputStreamTest.java
index cffa7a8caec97c1040e186146355c68ee54ca78f..c47641810ca805d90f4e73d4129a5c8abeab830a 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/PayloadInputStreamTest.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/PayloadInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import static org.testng.Assert.assertEquals;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/RecordingLogger.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/RecordingLogger.java
index c0cae2c75d9f418a4d49b17322a15fc3723bd6b4..1f74d38adbf70c94f206b0ad3934920824bbffaf 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/RecordingLogger.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/RecordingLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/StreamTestUtils.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/StreamTestUtils.java
index 5c971025dd88034be596eca7a7cb6f139d21f882..f1a718124572cbd536422e32db44cdd7b28dbc49 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/StreamTestUtils.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/StreamTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import static org.testng.Assert.assertEquals;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestAssertions.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestAssertions.java
index cdb7fe0cd293eafd146e9862ce6be783f3645389..b53b274d4219969c1f83f038c4e34e3b70dca1b3 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestAssertions.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import static org.testng.Assert.fail;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestChunkProvider.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestChunkProvider.java
index 8e29c61a303ae11aa03f1a52d9554446bf04c728..3aa9aa45a96e9695b317062173896ee0eac46492 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestChunkProvider.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestChunkProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.nio.file.Path;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestConcurrencyProvider.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestConcurrencyProvider.java
index c393560e32ca517bfb53931581f0c938ed0acc97..6117ade806cdf6a922f44fdb54f4eeda3c6cf58c 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestConcurrencyProvider.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestConcurrencyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.util.List;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemId.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemId.java
index e9bfceed310ddab8c43fba93e160eaf92d09e2e6..536f4d44dc2b30e564e79cd4255396ee49304868 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemId.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemId.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
+ *
+ * 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.
+ */
 package ch.ethz.sis.filetransfer;
 /*
  * Copyright 2018 ETH Zuerich, CISD
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemIdDeserializer.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemIdDeserializer.java
index a1d44f081226e79f9654a8cfa474080303a7df3a..20e3e32c042ffa43faf752980b1d691d00ab7950 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemIdDeserializer.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemIdDeserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.nio.ByteBuffer;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemIdSerializer.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemIdSerializer.java
index 66133874a4ad3b25ebbb88fb2b4e96681dde686c..de3d54d3cbf7e8ed1597def46e741c37542b4d92 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemIdSerializer.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadItemIdSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 /**
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadStore.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadStore.java
index 5bcf3ecb94122473f9d239d653952fc76ce93743..424bc93ffacfb83371b5e49d0e2175647862f43a 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadStore.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestDownloadStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.nio.file.Path;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestInputStream.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestInputStream.java
index 0f3695b8db08e9f0d0ac319754bed2001b957c14..ae8ec153db4d5e5f78a74d9f221a649e44d31640 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestInputStream.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.io.ByteArrayInputStream;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestLogger.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestLogger.java
index c78070db7c677c246e2e07a9288e6961a90ced66..b89405f23553c2d133b370c028d88f3adda38f00 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestLogger.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import static org.testng.Assert.fail;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestUserSession.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestUserSession.java
index c2e389670b5c8667d1d9612780532071f3d9674a..2d059e9d278411a8865957bd8d3ffbbef94e8b86 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestUserSession.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestUserSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import java.util.UUID;
diff --git a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestUserSessionManager.java b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestUserSessionManager.java
index fdcd7a8ad3ea3921467329ca892c932c2c7020ff..ec7f4f3a9b301e61d54c2f19b76028ea63d38572 100644
--- a/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestUserSessionManager.java
+++ b/lib-file-download/sourceTest/java/ch/ethz/sis/filetransfer/TestUserSessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.filetransfer;
 
 import ch.ethz.sis.filetransfer.IUserSessionId;