diff --git a/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp b/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
index 8ba7e5a585c438698dd6ac7f4d4f0f2e36440146..cb470d25d89e57549c053fb6be7848789d2eda60 100644
--- a/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
+++ b/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DetachedTrackingVolume.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Detector/DetectorElementBase.hpp b/Core/include/ACTS/Detector/DetectorElementBase.hpp
index f07cdcde7851d8ec92cd5b6bed72403b42736e7b..a4dfc9c1d285ea19497bc7c70eb49a5bd913ecd6 100644
--- a/Core/include/ACTS/Detector/DetectorElementBase.hpp
+++ b/Core/include/ACTS/Detector/DetectorElementBase.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DetectorElementBase.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Detector/GenericApproachDescriptor.hpp b/Core/include/ACTS/Detector/GenericApproachDescriptor.hpp
index 0f6ce1fedfe2b3915f8e1d16134ce6ec7e385d51..a739d0259a56f83a3fc45c5d37d0a8f05fd4f1f9 100644
--- a/Core/include/ACTS/Detector/GenericApproachDescriptor.hpp
+++ b/Core/include/ACTS/Detector/GenericApproachDescriptor.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GenericApproachDescriptor.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Detector/GenericOverlapDescriptor.hpp b/Core/include/ACTS/Detector/GenericOverlapDescriptor.hpp
index 6518cf23e4b16905730101cdaa77c656d8bcbad0..f47dcbd724f482b4dddbe15e4e786e78e444cf27 100644
--- a/Core/include/ACTS/Detector/GenericOverlapDescriptor.hpp
+++ b/Core/include/ACTS/Detector/GenericOverlapDescriptor.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GenericOverlapDescriptor.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp b/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
index c9dece514649b874b6011c44998942738b594edc..7b4d65fec0fe6428fbb8f7708f96ab9290895fde 100644
--- a/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
+++ b/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GlueVolumesDescriptor.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Detector/TrackingGeometry.hpp b/Core/include/ACTS/Detector/TrackingGeometry.hpp
index a1c62109c794088fc92fd6e2af5bbf4df305528c..d2edba04d4fc20d80d7c68f0d3ced24628d292c6 100644
--- a/Core/include/ACTS/Detector/TrackingGeometry.hpp
+++ b/Core/include/ACTS/Detector/TrackingGeometry.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrackingGeometry.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Detector/TrackingVolume.hpp b/Core/include/ACTS/Detector/TrackingVolume.hpp
index 0807d75fb861e1f9bd6368d56566fe391b18d61e..6fcd287cb397c758276928dcfbc87993ba9b2c3e 100644
--- a/Core/include/ACTS/Detector/TrackingVolume.hpp
+++ b/Core/include/ACTS/Detector/TrackingVolume.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrackingVolume.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/EventData/ChargePolicy.hpp b/Core/include/ACTS/EventData/ChargePolicy.hpp
index 7f806f97965324235651344be57bb02ea2218fee..6e80e6a4c4ec67724915173367b99e0fc0b6133b 100644
--- a/Core/include/ACTS/EventData/ChargePolicy.hpp
+++ b/Core/include/ACTS/EventData/ChargePolicy.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_CHARGEDEFINITION_H
 #define ACTS_CHARGEDEFINITION_H 1
 
diff --git a/Core/include/ACTS/EventData/Measurement.hpp b/Core/include/ACTS/EventData/Measurement.hpp
index 7ab01080d36913b734036e0cfbf93697f7caf65a..05554dfe8befd4c24cfe8e1f094e1fe2139f7a1e 100644
--- a/Core/include/ACTS/EventData/Measurement.hpp
+++ b/Core/include/ACTS/EventData/Measurement.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_MEASUREMENT_H
 #define ACTS_MEASUREMENT_H 1
 
diff --git a/Core/include/ACTS/EventData/NeutralParameters.hpp b/Core/include/ACTS/EventData/NeutralParameters.hpp
index 15b7306d2a544e311d8cff72ea5b4d31b94a6c8a..586c8d1b0f92ed5b7769ec88b6348915f48597c6 100644
--- a/Core/include/ACTS/EventData/NeutralParameters.hpp
+++ b/Core/include/ACTS/EventData/NeutralParameters.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_NEUTRALPARAMETERS_H
 #define ACTS_NEUTRALPARAMETERS_H 1
 
diff --git a/Core/include/ACTS/EventData/ParameterSet.hpp b/Core/include/ACTS/EventData/ParameterSet.hpp
index ffc246b9b04193b649d8dfb570de4c5beed1eab6..71526d2befe68b64a5e47befb8c9aa924792729e 100644
--- a/Core/include/ACTS/EventData/ParameterSet.hpp
+++ b/Core/include/ACTS/EventData/ParameterSet.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_PARAMETERSET_H
 #define ACTS_PARAMETERSET_H 1
 
diff --git a/Core/include/ACTS/EventData/ParticleDefinitions.hpp b/Core/include/ACTS/EventData/ParticleDefinitions.hpp
index c1158a3658b91c295e440b08f4ad423de93c0720..4be403f48fa693afec367b6082455063a1c8acb3 100644
--- a/Core/include/ACTS/EventData/ParticleDefinitions.hpp
+++ b/Core/include/ACTS/EventData/ParticleDefinitions.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ParticleDefinitions.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp b/Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp
index 2081f2018833b5610ff837deb5079dbefa2cbb54..542b438322cd5c778cec6d0ce63aa5fa1732d94c 100644
--- a/Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp
+++ b/Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_SINGLEBOUNDTRACKPARAMETERS_H
 #define ACTS_SINGLEBOUNDTRACKPARAMETERS_H 1
 
diff --git a/Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp b/Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp
index 4c0bd278329ece4ab51feaaff71ed2a5543af905..75d3a403480d6d1afca8ea4f128a539254a78216 100644
--- a/Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp
+++ b/Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_SINGLECURVILINEARTRACKPARAMETERS_H
 #define ACTS_SINGLECURVILINEARTRACKPARAMETERS_H 1
 
diff --git a/Core/include/ACTS/EventData/SingleTrackParameters.hpp b/Core/include/ACTS/EventData/SingleTrackParameters.hpp
index 497daf53e77df922be4718a6eca6f319cb25a28e..88515b219c9b110411dc289940df18ab0fff87ca 100644
--- a/Core/include/ACTS/EventData/SingleTrackParameters.hpp
+++ b/Core/include/ACTS/EventData/SingleTrackParameters.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_SINGLETRACKPARAMETERS_H
 #define ACTS_SINGLETRACKPARAMETERS_H 1
 
diff --git a/Core/include/ACTS/EventData/TrackParameters.hpp b/Core/include/ACTS/EventData/TrackParameters.hpp
index e27ee75256c7e9f0e6a9fd6d49872d80419d4d11..c882aa27fe6e5c4d70ecf33589b582d77e109252 100644
--- a/Core/include/ACTS/EventData/TrackParameters.hpp
+++ b/Core/include/ACTS/EventData/TrackParameters.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_TRACKPARAMETERS_H
 #define ACTS_TRACKPARAMETERS_H 1
 
diff --git a/Core/include/ACTS/EventData/TrackParametersBase.hpp b/Core/include/ACTS/EventData/TrackParametersBase.hpp
index 63e0f88ed781fc71176c9846a713388890ca377c..d3b958bc8851707a2ee77f0f2b523c6da4cc2cab 100644
--- a/Core/include/ACTS/EventData/TrackParametersBase.hpp
+++ b/Core/include/ACTS/EventData/TrackParametersBase.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_PARAMETERSBASE_H
 #define ACTS_PARAMETERSBASE_H 1
 
diff --git a/Core/include/ACTS/EventData/TransportJacobian.hpp b/Core/include/ACTS/EventData/TransportJacobian.hpp
index a289cb6f1af8d8b7178a41fe2355c44e345fdfe5..c1416e96674ff9f8d94a406cb2fbc5e695b760b8 100644
--- a/Core/include/ACTS/EventData/TransportJacobian.hpp
+++ b/Core/include/ACTS/EventData/TransportJacobian.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TransportJacobian.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/EventData/detail/CoordinateTransformations.hpp b/Core/include/ACTS/EventData/detail/CoordinateTransformations.hpp
index 6b0dee7e5b8a07cb0f51f46fe02b58ef9d2781fd..7fc0ffee014b00ff6e0de374db1a852c63437542 100644
--- a/Core/include/ACTS/EventData/detail/CoordinateTransformations.hpp
+++ b/Core/include/ACTS/EventData/detail/CoordinateTransformations.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_COORDINATETRANSFORMATIONS_H
 #define ACTS_COORDINATETRANSFORMATIONS_H 1
 
diff --git a/Core/include/ACTS/Extrapolation/ExtrapolationCell.hpp b/Core/include/ACTS/Extrapolation/ExtrapolationCell.hpp
index 2f61f27c38e0a605f7f51e0564eec5a92728b204..645883c2bc185f6d5f04fd3e765804bde5c1e624 100644
--- a/Core/include/ACTS/Extrapolation/ExtrapolationCell.hpp
+++ b/Core/include/ACTS/Extrapolation/ExtrapolationCell.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ExtrapolationCell.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/ExtrapolationEngine.hpp b/Core/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
index b35dacb97a0b1b5586dcdec08130c640027c84e6..14a1ca86efc05b5833f2b95766a7166139e5405b 100644
--- a/Core/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ExtrapolationEngine.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/IExtrapolationEngine.hpp b/Core/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
index b2e591895550a770652526371d6d9ec17a12cde4..e655d4114676da62d957a301faee3be283dbcc26 100644
--- a/Core/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // IExtrapolationEngine.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp b/Core/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
index f3dc29d341781f97e92df22518c1bac500dd5d47..c33122d63a3658f62ccf38a7a5e63a89670c1560 100644
--- a/Core/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // IMaterialEffectsEngine.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp b/Core/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
index 47f5a26151c7b3ba428562a5287f079cd0290a4f..0c0ec793091261e3ff8b0f59041c1e4ecb8edec9 100644
--- a/Core/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
+++ b/Core/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // IMultipleScatteringUpdator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/INavigationEngine.hpp b/Core/include/ACTS/Extrapolation/INavigationEngine.hpp
index 356edb24bbe01417d75f75db733539bfdbfe9850..55ffd8705bdd2ee7e203cf1b1bc08392eb10dd6d 100644
--- a/Core/include/ACTS/Extrapolation/INavigationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/INavigationEngine.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // INavigationEngine.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/IPropagationEngine.hpp b/Core/include/ACTS/Extrapolation/IPropagationEngine.hpp
index d73e48c5d335a0fbb2bdb589f0923c326f02477d..eb10c0e64a1487232237654bf3cac7e843a23133 100644
--- a/Core/include/ACTS/Extrapolation/IPropagationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/IPropagationEngine.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // IPropagationEngine.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp b/Core/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
index 7ba079f9e76c301a35d92ef4b1fb9500a552f80b..9d96eada80c73e8883f729573339c80ac9d61f5d 100644
--- a/Core/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // MaterialEffectsEngine.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/MaterialUpdateMode.hpp b/Core/include/ACTS/Extrapolation/MaterialUpdateMode.hpp
index cd4b4126b9e1325cf8ff4e2dfeffcb9aac9c6461..e892cf0821b19151f569bb897623989488d5da97 100644
--- a/Core/include/ACTS/Extrapolation/MaterialUpdateMode.hpp
+++ b/Core/include/ACTS/Extrapolation/MaterialUpdateMode.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_EXTRAPOLATIONUTILS_MATERIALUPDATEMODE_H
 #define ACTS_EXTRAPOLATIONUTILS_MATERIALUPDATEMODE_H 1
 
diff --git a/Core/include/ACTS/Extrapolation/RungeKuttaEngine.hpp b/Core/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
index a4df82c555d20ddd7659ced124a8ac76963f8d8d..6ab8897d8e70387b785646b295aaf4f5d98cbdf8 100644
--- a/Core/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 /////////////////////////////////////////////////////////////////////////////////
 //  Header file for class RungeKuttaEngine, ACTS project
 /////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/StaticEngine.hpp b/Core/include/ACTS/Extrapolation/StaticEngine.hpp
index 59c81eb81b77e28c160bb7c723dad3a99bb55a05..0f36ad6f3412e0a0707350e9cc17ef73d5d9609e 100644
--- a/Core/include/ACTS/Extrapolation/StaticEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/StaticEngine.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // StaticEngine.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/StaticNavigationEngine.hpp b/Core/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
index fb398734c1868fa3566d04d635865de54644038a..e004757f707446a1c2de189cbc76338c8b6c44c2 100644
--- a/Core/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // StaticNavigationEngine.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/detail/ExtrapolationMacros.hpp b/Core/include/ACTS/Extrapolation/detail/ExtrapolationMacros.hpp
index e1b4530a6822085308bda8c95f2cb9eb17f73500..680786c22e172b0082b9a41945f40894b3b56ed2 100644
--- a/Core/include/ACTS/Extrapolation/detail/ExtrapolationMacros.hpp
+++ b/Core/include/ACTS/Extrapolation/detail/ExtrapolationMacros.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ExtrapolationMacros.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/detail/MaterialInteraction.hpp b/Core/include/ACTS/Extrapolation/detail/MaterialInteraction.hpp
index 3bbfc23c0ac8250814ea5dba96e759e644621fcf..e73e7a7e275c32d5776b5b14d57dd172357c985b 100644
--- a/Core/include/ACTS/Extrapolation/detail/MaterialInteraction.hpp
+++ b/Core/include/ACTS/Extrapolation/detail/MaterialInteraction.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // MaterialInteraction.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/detail/RealQuadraticEquation.hpp b/Core/include/ACTS/Extrapolation/detail/RealQuadraticEquation.hpp
index cac233d8b02eae0614dc31153ff7bf139fa35373..e2bc5dca1a3125e1a92fdccc956e3156ad66e3e1 100644
--- a/Core/include/ACTS/Extrapolation/detail/RealQuadraticEquation.hpp
+++ b/Core/include/ACTS/Extrapolation/detail/RealQuadraticEquation.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // RealQuadraticEquation.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp b/Core/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp
index 6d93064fbb515b0f5e54ca9c9840c73bac5de0fc..d7f6a18050d7f76439bec3f5af782223dbef83d7 100644
--- a/Core/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp
+++ b/Core/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 /////////////////////////////////////////////////////////////////////////////////
 //  RungeKuttaUtils.h, ACTS project
 /////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Layers/ConeLayer.hpp b/Core/include/ACTS/Layers/ConeLayer.hpp
index cc90143fba92836b875b455f5aef9847e3865a3c..7651066fd367e9f6da24a89901a894ecd82794a4 100644
--- a/Core/include/ACTS/Layers/ConeLayer.hpp
+++ b/Core/include/ACTS/Layers/ConeLayer.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ConeLayer.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Layers/CylinderLayer.hpp b/Core/include/ACTS/Layers/CylinderLayer.hpp
index 12ab3cdd862584bc9901725d3d508236419dc077..576aac156258c5a8886ebd5c5641513bb35ca873 100644
--- a/Core/include/ACTS/Layers/CylinderLayer.hpp
+++ b/Core/include/ACTS/Layers/CylinderLayer.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderLayer.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Layers/DiscLayer.hpp b/Core/include/ACTS/Layers/DiscLayer.hpp
index 9707ac5341926d99c84d3850b10d1d091414faf1..36e7130385b27cf7c81ccafff98d912ca55eabd1 100644
--- a/Core/include/ACTS/Layers/DiscLayer.hpp
+++ b/Core/include/ACTS/Layers/DiscLayer.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DiscLayer.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Layers/Layer.hpp b/Core/include/ACTS/Layers/Layer.hpp
index db43bd59bacfb9f708804c3a68fb245821b28921..e9e45025c596578e49b6674fe1046c0951572b75 100644
--- a/Core/include/ACTS/Layers/Layer.hpp
+++ b/Core/include/ACTS/Layers/Layer.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // Layer.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Layers/NavigationLayer.hpp b/Core/include/ACTS/Layers/NavigationLayer.hpp
index e1d80ab0d6b195fd32591d28406c50fba8ca5e20..a8314b9b7432393feec042ca33928114c2d72e63 100644
--- a/Core/include/ACTS/Layers/NavigationLayer.hpp
+++ b/Core/include/ACTS/Layers/NavigationLayer.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // NavigationLayer.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Layers/PlaneLayer.hpp b/Core/include/ACTS/Layers/PlaneLayer.hpp
index 6d2d48208e53aed8b177f50b46172dc306686d2d..8e73df9125d1f53f17afc70cd36ddd2533048cd6 100644
--- a/Core/include/ACTS/Layers/PlaneLayer.hpp
+++ b/Core/include/ACTS/Layers/PlaneLayer.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // PlaneLayer.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Layers/SubtractedCylinderLayer.hpp b/Core/include/ACTS/Layers/SubtractedCylinderLayer.hpp
index 381a05f227b6a20062df3bf37fe7c6914f12507a..dfe7e7a8012821e40a16df34de475f83c17323fd 100644
--- a/Core/include/ACTS/Layers/SubtractedCylinderLayer.hpp
+++ b/Core/include/ACTS/Layers/SubtractedCylinderLayer.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedCylinderLayer.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Layers/SubtractedPlaneLayer.hpp b/Core/include/ACTS/Layers/SubtractedPlaneLayer.hpp
index d93183552c746df1195fd8fd2db67684f12f30af..53f9020e2afdf6eba4f987ac1b5725ca6610f35f 100644
--- a/Core/include/ACTS/Layers/SubtractedPlaneLayer.hpp
+++ b/Core/include/ACTS/Layers/SubtractedPlaneLayer.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedPlaneLayer.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/MagneticField/IMagneticFieldSvc.hpp b/Core/include/ACTS/MagneticField/IMagneticFieldSvc.hpp
index 2bf9ed3ddfc93aeb527f9f32a04783ea1462deb5..19ddb6519277d57fb4be5f8ee9df56668ab1fea2 100644
--- a/Core/include/ACTS/MagneticField/IMagneticFieldSvc.hpp
+++ b/Core/include/ACTS/MagneticField/IMagneticFieldSvc.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // IMagneticFieldSvc.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp b/Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp
index 66a4d977ebdcbb66d281e25947c75ae9f66f777b..6cb5d55a56b17e4267adebfbc1f4ad29fd28867e 100644
--- a/Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp
+++ b/Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BinnedSurfaceMaterial.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp b/Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp
index 9e72127ab56bca1126c1f51f66aa32f2fbfd5550..c204ccae477bec6a2636a7eab39192a6667739f6 100644
--- a/Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp
+++ b/Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // HomogeneousSurfaceMaterial.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Material/Material.hpp b/Core/include/ACTS/Material/Material.hpp
index fb8946163f01d27479a0358f34be321eff314d74..3442c0274badf0e77efb1c9099065b3a645fe572 100644
--- a/Core/include/ACTS/Material/Material.hpp
+++ b/Core/include/ACTS/Material/Material.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // Material.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Material/MaterialProperties.hpp b/Core/include/ACTS/Material/MaterialProperties.hpp
index 63bcf4c9f93622f780e83881bcf7a2a79acd6f5a..442418b3a2aae04056dc614b09d98f113a713a28 100644
--- a/Core/include/ACTS/Material/MaterialProperties.hpp
+++ b/Core/include/ACTS/Material/MaterialProperties.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // MaterialProperties.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Material/SurfaceMaterial.hpp b/Core/include/ACTS/Material/SurfaceMaterial.hpp
index 6d9a288df961442edfe31b255e99733229778d11..815cb4f4e1402247e79f7113dd55fa13528910e7 100644
--- a/Core/include/ACTS/Material/SurfaceMaterial.hpp
+++ b/Core/include/ACTS/Material/SurfaceMaterial.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SurfaceMaterial.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp b/Core/include/ACTS/Surfaces/BoundaryCheck.hpp
index 12900cee72ea83f5a360ebb65fbbc4a61c265ab4..5bb36b5ebbd6737a0c25bf3be391bb864e97c5e0 100644
--- a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp
+++ b/Core/include/ACTS/Surfaces/BoundaryCheck.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BoundaryCheck.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/ConeBounds.hpp b/Core/include/ACTS/Surfaces/ConeBounds.hpp
index afd33a578259f531063b2b85e5ddde3c802b900d..d58e2a075c2f6b7790e204ee6fc2781b5624da89 100644
--- a/Core/include/ACTS/Surfaces/ConeBounds.hpp
+++ b/Core/include/ACTS/Surfaces/ConeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ConeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/ConeSurface.hpp b/Core/include/ACTS/Surfaces/ConeSurface.hpp
index 46498afb7842b4cf888e434b5f4d0ee95b795036..f59a3a01ee5452fee25b07fdce8d1cfec0d388cb 100644
--- a/Core/include/ACTS/Surfaces/ConeSurface.hpp
+++ b/Core/include/ACTS/Surfaces/ConeSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ConeSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/CylinderBounds.hpp b/Core/include/ACTS/Surfaces/CylinderBounds.hpp
index 894ddaffe35057a9da0e7e510927f57f1bb07404..4a0a5a6ab2f8ee7be8b711a5e802aa338af7ad88 100644
--- a/Core/include/ACTS/Surfaces/CylinderBounds.hpp
+++ b/Core/include/ACTS/Surfaces/CylinderBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/CylinderSurface.hpp b/Core/include/ACTS/Surfaces/CylinderSurface.hpp
index 974575fdcaee9a7ce7dc3492b79b04de85a1ef6d..422ad34f748a27afaa518f81b6a8330e55b9cfda 100644
--- a/Core/include/ACTS/Surfaces/CylinderSurface.hpp
+++ b/Core/include/ACTS/Surfaces/CylinderSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/DiamondBounds.hpp b/Core/include/ACTS/Surfaces/DiamondBounds.hpp
index 6751d385e7101c836e977e33ec6267765bedf8b3..827a79dba21c01f7e59cd669eab5994c669042ce 100644
--- a/Core/include/ACTS/Surfaces/DiamondBounds.hpp
+++ b/Core/include/ACTS/Surfaces/DiamondBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DiamondBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/DiscBounds.hpp b/Core/include/ACTS/Surfaces/DiscBounds.hpp
index 2fa4b6508c36b707b7de20995ab34098fdd65b2f..f86a6395eed15518c3466e009016fb656d7652c5 100644
--- a/Core/include/ACTS/Surfaces/DiscBounds.hpp
+++ b/Core/include/ACTS/Surfaces/DiscBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DiscBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/DiscSurface.hpp b/Core/include/ACTS/Surfaces/DiscSurface.hpp
index ecd4c5da476d34fe922f7edf70b637ec2f039d47..36690761676788c217aa6f7f283f5350ba9aa54c 100644
--- a/Core/include/ACTS/Surfaces/DiscSurface.hpp
+++ b/Core/include/ACTS/Surfaces/DiscSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DiscSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp b/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
index b12621b5303a6d19db237d7227d3baba3c18c668..14e43e22cd00b3cf9aaddfc75e43d320ef2e7605 100644
--- a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
+++ b/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DiscTrapezoidalBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/EllipseBounds.hpp b/Core/include/ACTS/Surfaces/EllipseBounds.hpp
index fb8c61e2e58074602827d0d0b24aa0508fa4b46d..e97dbf65696050163b3576b666cf5d9b4ff267c7 100644
--- a/Core/include/ACTS/Surfaces/EllipseBounds.hpp
+++ b/Core/include/ACTS/Surfaces/EllipseBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // EllipseBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/InvalidBounds.hpp b/Core/include/ACTS/Surfaces/InvalidBounds.hpp
index 54562dee761cd9d233b763f28193b460c442f61e..74e2480d91f79a282c7115a127504ac12f6fc5de 100644
--- a/Core/include/ACTS/Surfaces/InvalidBounds.hpp
+++ b/Core/include/ACTS/Surfaces/InvalidBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/NoBounds.hpp b/Core/include/ACTS/Surfaces/NoBounds.hpp
index 8cb548bb7aca5012e2e02331c8daa8ef2101a911..fda579eb3d3bfd444aea669ae1b80a077f6872de 100644
--- a/Core/include/ACTS/Surfaces/NoBounds.hpp
+++ b/Core/include/ACTS/Surfaces/NoBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/PerigeeSurface.hpp b/Core/include/ACTS/Surfaces/PerigeeSurface.hpp
index 769ac485c45306b4e67b4b21392fe78b43ab99d5..0651cb7fe3252a99a77e63e5a81334948ecbdf5d 100644
--- a/Core/include/ACTS/Surfaces/PerigeeSurface.hpp
+++ b/Core/include/ACTS/Surfaces/PerigeeSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 /////////////////////////////////////////////////////////////////
 // PerigeeSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/PlanarBounds.hpp b/Core/include/ACTS/Surfaces/PlanarBounds.hpp
index e36ddc3e3950aae80dd49b5774e487e192f5abec..61dd5ba377a2c9d3eb35471ac9508db41f494f3c 100644
--- a/Core/include/ACTS/Surfaces/PlanarBounds.hpp
+++ b/Core/include/ACTS/Surfaces/PlanarBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // PlanarBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/PlaneSurface.hpp b/Core/include/ACTS/Surfaces/PlaneSurface.hpp
index f7af926a00f3c2505005d9bbd8d23a465bd9f337..e69137deda727e28135196443caf50acbd1b5e1e 100644
--- a/Core/include/ACTS/Surfaces/PlaneSurface.hpp
+++ b/Core/include/ACTS/Surfaces/PlaneSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // PlaneSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/RadialBounds.hpp b/Core/include/ACTS/Surfaces/RadialBounds.hpp
index 2cb42b48b4b41d781b238bdc765661f94c1ab512..e32f9ab1f56e6bee468e5d1c1c8191947d406bbf 100644
--- a/Core/include/ACTS/Surfaces/RadialBounds.hpp
+++ b/Core/include/ACTS/Surfaces/RadialBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // RadialBounds.h, c) ATLAS Detector software
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/RealQuadraticEquation.hpp b/Core/include/ACTS/Surfaces/RealQuadraticEquation.hpp
index cf9eab1830ab64e13c08fa7fe2c668fda96f714c..c33de7f78f5b1c67efe73b1913b4d113519114db 100644
--- a/Core/include/ACTS/Surfaces/RealQuadraticEquation.hpp
+++ b/Core/include/ACTS/Surfaces/RealQuadraticEquation.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // RealQuadraticEquation.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/RectangleBounds.hpp b/Core/include/ACTS/Surfaces/RectangleBounds.hpp
index 2bc491b4eafac37e1336ae71d1313cd8b4dba846..5aa21def70853ab54024c000c5763568e9cf27b5 100644
--- a/Core/include/ACTS/Surfaces/RectangleBounds.hpp
+++ b/Core/include/ACTS/Surfaces/RectangleBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // RectangleBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/SlidingCylinderSurface.hpp b/Core/include/ACTS/Surfaces/SlidingCylinderSurface.hpp
index 4a0fc0065e9b91232e65362832b997f56af8a812..8308355e6bfaa78c96ff244e1d58d4646e65e7c7 100644
--- a/Core/include/ACTS/Surfaces/SlidingCylinderSurface.hpp
+++ b/Core/include/ACTS/Surfaces/SlidingCylinderSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SlidingCylinderSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/SlidingDiscSurface.hpp b/Core/include/ACTS/Surfaces/SlidingDiscSurface.hpp
index 2baab24e32f81e147f5c5030998e1090e5da1e8a..2496a56c5573261fddc4c58b65d3e9485cd62186 100644
--- a/Core/include/ACTS/Surfaces/SlidingDiscSurface.hpp
+++ b/Core/include/ACTS/Surfaces/SlidingDiscSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SlidingDiscSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/StraightLineSurface.hpp b/Core/include/ACTS/Surfaces/StraightLineSurface.hpp
index ffbdb83d4f532a6b966175ae69bb8606e74ab457..480bc4472ddca2cbf5185c3a34f3582865e59d19 100644
--- a/Core/include/ACTS/Surfaces/StraightLineSurface.hpp
+++ b/Core/include/ACTS/Surfaces/StraightLineSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 /////////////////////////////////////////////////////////////////
 // StraightLineSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/SubtractedCylinderSurface.hpp b/Core/include/ACTS/Surfaces/SubtractedCylinderSurface.hpp
index a2a63da0b152e8d356f947ad1049dfcdae8dcb59..10d287dabdb62971bc2fc911bf19b3cfda5a4bbe 100644
--- a/Core/include/ACTS/Surfaces/SubtractedCylinderSurface.hpp
+++ b/Core/include/ACTS/Surfaces/SubtractedCylinderSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedCylinderSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/SubtractedDiscSurface.hpp b/Core/include/ACTS/Surfaces/SubtractedDiscSurface.hpp
index 34235caa5c4c26bc5b11a44d3fdf78baaf4f3c45..ef5f541ce9888b3ddeefc096ee5128b050bbe668 100644
--- a/Core/include/ACTS/Surfaces/SubtractedDiscSurface.hpp
+++ b/Core/include/ACTS/Surfaces/SubtractedDiscSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedDiscSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/SubtractedPlaneSurface.hpp b/Core/include/ACTS/Surfaces/SubtractedPlaneSurface.hpp
index 8bfdfe5828a4be97d23fc27adb8a9a3b45ef8d1b..06c4d4de5faa33c6a6ffdec71a7740f9235177e1 100644
--- a/Core/include/ACTS/Surfaces/SubtractedPlaneSurface.hpp
+++ b/Core/include/ACTS/Surfaces/SubtractedPlaneSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedPlaneSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/Surface.hpp b/Core/include/ACTS/Surfaces/Surface.hpp
index d4d2b32cbdc958b64f5a02bcd7d05287161b5dad..ff3d5cd4cd4a6e576a828634876d7ce49f29c5a2 100644
--- a/Core/include/ACTS/Surfaces/Surface.hpp
+++ b/Core/include/ACTS/Surfaces/Surface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // Surface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp b/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
index fa45ce7e2a0a7a0e5c3df5b767b39994ae97b5b7..87c1685009b84c61ec984f53767df8c9c4ec91d6 100644
--- a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
+++ b/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SurfaceBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp b/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
index 0cdaf55f6804d2d6f8ee2cd3db85c86884000281..6ec3980d4eaf3478496b863edda4ee2097581596 100644
--- a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
+++ b/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrapezoidBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Surfaces/TriangleBounds.hpp b/Core/include/ACTS/Surfaces/TriangleBounds.hpp
index 245ce33853fc91f736b559614f4106ba3ac0a232..13e09cddc1ad672c99312f3fe91ea1c8ebe5f836 100644
--- a/Core/include/ACTS/Surfaces/TriangleBounds.hpp
+++ b/Core/include/ACTS/Surfaces/TriangleBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TriangleBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/CylinderGeometryBuilder.hpp b/Core/include/ACTS/Tools/CylinderGeometryBuilder.hpp
index bd2c28e1790ed03e567f5ac78ee071a1a16fc46e..3ca458110474cccd24d1581f3ca540fa0d38f078 100644
--- a/Core/include/ACTS/Tools/CylinderGeometryBuilder.hpp
+++ b/Core/include/ACTS/Tools/CylinderGeometryBuilder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
  ///////////////////////////////////////////////////////////////////
 // CylinderGeometryBuilder.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp b/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
index 13b9fb227df0795b87a4f9a5a82729261e9c9f08..89538569bebf4a250c9d4e0d71e33d28a1538a73 100644
--- a/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
+++ b/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderVolumeBuilder.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp b/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
index a7e8af2a48c7560501bbf2cc59d9188779f80348..a0e174b60fa1a13f1ba80212ca267f7ecdf96124 100644
--- a/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
+++ b/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderVolumeHelper.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/ILayerArrayCreator.hpp b/Core/include/ACTS/Tools/ILayerArrayCreator.hpp
index 954338d19d45f14276ccdf6062582ec4a47a0349..95f0b785ad75d4a39553041d78ede28ede3e9e82 100644
--- a/Core/include/ACTS/Tools/ILayerArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/ILayerArrayCreator.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ILayerArrayCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/ILayerBuilder.hpp b/Core/include/ACTS/Tools/ILayerBuilder.hpp
index 0ae7a6b74ec636cd349dff6b8cd752183d9924a2..e97b42ba89ad616a089ad5d144a8a7ab3d871c27 100644
--- a/Core/include/ACTS/Tools/ILayerBuilder.hpp
+++ b/Core/include/ACTS/Tools/ILayerBuilder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ILayerBuilder.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/ILayerCreator.hpp b/Core/include/ACTS/Tools/ILayerCreator.hpp
index daf020b2411c371f7f475cfcc5ffdd261bb4f051..f1c321b201de171692e0bdb2c854f58efceb3c3a 100644
--- a/Core/include/ACTS/Tools/ILayerCreator.hpp
+++ b/Core/include/ACTS/Tools/ILayerCreator.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ILayerCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/ISurfaceArrayCreator.hpp b/Core/include/ACTS/Tools/ISurfaceArrayCreator.hpp
index 3d3eab4905c52df1e19b0003fd2d555c17d1489e..e1e71d51749f6f4c234ab73c3da3b47b31563d0b 100644
--- a/Core/include/ACTS/Tools/ISurfaceArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/ISurfaceArrayCreator.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ISurfaceArrayCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp b/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp
index 532a73560c20b0ec828dd7c0ed8134973b980f47..60e6341d8ee808a71630fbf96f8ddbe8dd11aa6c 100644
--- a/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp
+++ b/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ITrackingGeometryBuilder.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp b/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
index 4893ec5d73701f8f090564b80c6894836f9b5167..fa6732ae6374e9729af7b3eda5c8a90921af1987 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ITrackingVolumeArrayCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp b/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp
index 8c80dcbf29763092ba2d0792772729b50e30b450..9f5caa630d81c1c4a0b639e1025bbc1ead6873dc 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp
+++ b/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ITrackingVolumeBuilder.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp b/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
index 98937de2f8c1d112e4d1494099afa85d27ac8256..5d1d1464899cd757529fd71ee0aaabe4727c43f0 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
+++ b/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ITrackingVolumeHelper.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/LayerArrayCreator.hpp b/Core/include/ACTS/Tools/LayerArrayCreator.hpp
index 9397825a9a4d3664a52f6d6f6e6d6ab46a5165b8..b46e85a47ebb0846643d3e0d5bf63f9735247e83 100644
--- a/Core/include/ACTS/Tools/LayerArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/LayerArrayCreator.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // LayerArrayCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/LayerCreator.hpp b/Core/include/ACTS/Tools/LayerCreator.hpp
index 6d828c88553eafda931ce0fb4a8b45467545543d..aa963011397aeb15c7672728782b0329da54a195 100644
--- a/Core/include/ACTS/Tools/LayerCreator.hpp
+++ b/Core/include/ACTS/Tools/LayerCreator.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // LayerCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/PassiveLayerBuilder.hpp b/Core/include/ACTS/Tools/PassiveLayerBuilder.hpp
index a1ab741bec2ec59a86b6a58d30bedb233a12ba32..702fffa93b26e312bc46fcbcef74c6c3cfb6580e 100644
--- a/Core/include/ACTS/Tools/PassiveLayerBuilder.hpp
+++ b/Core/include/ACTS/Tools/PassiveLayerBuilder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // PassiveLayerBuilder.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp b/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
index b86782dec01ae7c8ae23788df1f1e45e82868d25..7921e87949830753735abbc64199d5376f3a3c11 100644
--- a/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SurfaceArrayCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp b/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
index a31f87719802af4d7b02b3c217b4254a1d9e263e..9b450a84a4e58cebf19e5a252033ab1ab1c94f0c 100644
--- a/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrackingVolumeArrayCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/ApproachDescriptor.hpp b/Core/include/ACTS/Utilities/ApproachDescriptor.hpp
index e04c0170b16a9fee2e82e3c3c549f29455b31250..72acc1783e311e2a0b86bc737c15bc43e51473a6 100644
--- a/Core/include/ACTS/Utilities/ApproachDescriptor.hpp
+++ b/Core/include/ACTS/Utilities/ApproachDescriptor.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ApproachDescriptor.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/AreaExcluder.hpp b/Core/include/ACTS/Utilities/AreaExcluder.hpp
index 231a8a9d66862995b848c95c61e139e050f9df9a..008fa68a47591b6baa5b88db5ed63ee6997bbe6c 100644
--- a/Core/include/ACTS/Utilities/AreaExcluder.hpp
+++ b/Core/include/ACTS/Utilities/AreaExcluder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // AreaExcluder.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/BinStepping.hpp b/Core/include/ACTS/Utilities/BinStepping.hpp
index 43dcb2ab54a78352c9109bec74991bd9767ff170..2d6aa37cade261de397b973e7820ca27559e6497 100644
--- a/Core/include/ACTS/Utilities/BinStepping.hpp
+++ b/Core/include/ACTS/Utilities/BinStepping.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BinStepping.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/BinUtility.hpp b/Core/include/ACTS/Utilities/BinUtility.hpp
index a0f99538727ffa1c9c728937c17ba35115be093e..108897258301c4d95cf67efe8ba3756240931b71 100644
--- a/Core/include/ACTS/Utilities/BinUtility.hpp
+++ b/Core/include/ACTS/Utilities/BinUtility.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BinUtility.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/BinnedArray.hpp b/Core/include/ACTS/Utilities/BinnedArray.hpp
index fbd9e0ab285cb6951d46beaea2c86e6efead982a..c5af648b1725814423afbb8dd54655eed15bd6f1 100644
--- a/Core/include/ACTS/Utilities/BinnedArray.hpp
+++ b/Core/include/ACTS/Utilities/BinnedArray.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BinnedArray.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/BinnedArray0D.hpp b/Core/include/ACTS/Utilities/BinnedArray0D.hpp
index d91cc9753c4da1df762aea5b90b0d68c0b02e0b4..207fdcacde21486b698805d85b0bda55172348a7 100644
--- a/Core/include/ACTS/Utilities/BinnedArray0D.hpp
+++ b/Core/include/ACTS/Utilities/BinnedArray0D.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BinnedArray0D.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/BinnedArray1D.hpp b/Core/include/ACTS/Utilities/BinnedArray1D.hpp
index 508c78de246c344029e483624f4fea9997f6b006..6c80f30120747a542e142810cfad01a57679fa4f 100644
--- a/Core/include/ACTS/Utilities/BinnedArray1D.hpp
+++ b/Core/include/ACTS/Utilities/BinnedArray1D.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BinnedArray1D.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/BinnedArray2D.hpp b/Core/include/ACTS/Utilities/BinnedArray2D.hpp
index 4878c94202dc2a6120899ba5efe90e21150e6ed7..c7e612c35d62304c08f0ff8f21df708390980eb5 100644
--- a/Core/include/ACTS/Utilities/BinnedArray2D.hpp
+++ b/Core/include/ACTS/Utilities/BinnedArray2D.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BinnedArray2D.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/BinningData.hpp b/Core/include/ACTS/Utilities/BinningData.hpp
index 9a4ea225123be6167210eaf8f1860372aaaba199..272496c0d5d6ddbbd526fb0e1eee2973a4002993 100644
--- a/Core/include/ACTS/Utilities/BinningData.hpp
+++ b/Core/include/ACTS/Utilities/BinningData.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BinUtility.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/BinningType.hpp b/Core/include/ACTS/Utilities/BinningType.hpp
index 0624c2d4d3cafefc4411060e663aafc84acec971..a6dcd45b6559b4ca5b35c1c7436f05f264232175 100644
--- a/Core/include/ACTS/Utilities/BinningType.hpp
+++ b/Core/include/ACTS/Utilities/BinningType.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BinningType.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/Definitions.hpp b/Core/include/ACTS/Utilities/Definitions.hpp
index 9c54be70191473c7a178c71023ce560d197fba37..379405fbf3b96eac5c6d6599d184bd1e0289ac32 100644
--- a/Core/include/ACTS/Utilities/Definitions.hpp
+++ b/Core/include/ACTS/Utilities/Definitions.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_Definitions_H
 #define ACTS_Definitions_H
 
diff --git a/Core/include/ACTS/Utilities/GeometryID.hpp b/Core/include/ACTS/Utilities/GeometryID.hpp
index f73d038259598657ec1e2f806c9fdfea9141d1d3..400f7697a8a8c8b239233f799da4ae04667737ed 100644
--- a/Core/include/ACTS/Utilities/GeometryID.hpp
+++ b/Core/include/ACTS/Utilities/GeometryID.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GeometryID.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/GeometryObject.hpp b/Core/include/ACTS/Utilities/GeometryObject.hpp
index b193aeab4edda94ee9f12910bc7963a2b5673307..adca6b574da44f34635a7d0b10b39fc869d0048d 100644
--- a/Core/include/ACTS/Utilities/GeometryObject.hpp
+++ b/Core/include/ACTS/Utilities/GeometryObject.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GeometryObject.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp b/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp
index fa3615d02d10b479d8b9a3c0e0596e46e5f4945b..4a13eaa232c595856e8e87648ec82e205b52962c 100644
--- a/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp
+++ b/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GeometryObjectSorter.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/GeometrySignature.hpp b/Core/include/ACTS/Utilities/GeometrySignature.hpp
index 6a6f0e272799ccad1b90b79a2e677354037ad333..d96a4c01fa6db87f072ad9e952b12d229f7d9fd6 100644
--- a/Core/include/ACTS/Utilities/GeometrySignature.hpp
+++ b/Core/include/ACTS/Utilities/GeometrySignature.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GeometrySignature.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/GeometryStatics.hpp b/Core/include/ACTS/Utilities/GeometryStatics.hpp
index c3f939761eb60c0cf5729da9695c9c9e63699ec7..d1a6d9084e1c199714a96872e7bcca67329e14dc 100644
--- a/Core/include/ACTS/Utilities/GeometryStatics.hpp
+++ b/Core/include/ACTS/Utilities/GeometryStatics.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GeometryStatics.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/Helpers.hpp b/Core/include/ACTS/Utilities/Helpers.hpp
index 1c605298b9731a49ec882012770ed024119e095e..dbb31b472b7343f5400f0b4e09d57fdc401113ee 100644
--- a/Core/include/ACTS/Utilities/Helpers.hpp
+++ b/Core/include/ACTS/Utilities/Helpers.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // AlgebraHelper.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/Identifier.hpp b/Core/include/ACTS/Utilities/Identifier.hpp
index eaefa6db6f3347f5778d5c7b88ab62a10dee2b53..1f57c5337015ba3c66ee2c1bdca8dc6ca4cf3f67 100644
--- a/Core/include/ACTS/Utilities/Identifier.hpp
+++ b/Core/include/ACTS/Utilities/Identifier.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // Identifier.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/Intersection.hpp b/Core/include/ACTS/Utilities/Intersection.hpp
index c0dd9dd534504d013f83492b757b32b815d2b861..54b631e8522af08c9c63c5b863221a805ff1e0e9 100644
--- a/Core/include/ACTS/Utilities/Intersection.hpp
+++ b/Core/include/ACTS/Utilities/Intersection.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // Intersection.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/Logger.hpp b/Core/include/ACTS/Utilities/Logger.hpp
index fe2e0a72ef70970ff59b33f7a1b4f0456c4385e8..041fb116145d070a21f3f6c429eb948d4c305a97 100644
--- a/Core/include/ACTS/Utilities/Logger.hpp
+++ b/Core/include/ACTS/Utilities/Logger.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_LOGGER_H
 #define ACTS_LOGGER_H 1
 
diff --git a/Core/include/ACTS/Utilities/MsgMacros.hpp b/Core/include/ACTS/Utilities/MsgMacros.hpp
index a8b5a7abc4e39bc81659d292c2cba0dedb90685f..03633cfe323019de646b4ab189b5734b695f607e 100644
--- a/Core/include/ACTS/Utilities/MsgMacros.hpp
+++ b/Core/include/ACTS/Utilities/MsgMacros.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_MSG_MACROS_H
 #define ACTS_MSG_MACROS_H 1
 
diff --git a/Core/include/ACTS/Utilities/OverlapDescriptor.hpp b/Core/include/ACTS/Utilities/OverlapDescriptor.hpp
index acc130ccc022a692980e39a2be01888526a24944..792ca032c0d36d5c9a1cdb7f6ca18f0c160d029c 100644
--- a/Core/include/ACTS/Utilities/OverlapDescriptor.hpp
+++ b/Core/include/ACTS/Utilities/OverlapDescriptor.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // OverlapDescriptor.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/ParameterDefinitions.hpp b/Core/include/ACTS/Utilities/ParameterDefinitions.hpp
index b6eb98872472380cd1af7a5deabfed719140af19..25fff46cc6c14328d772a46e45ac99e8baf5bf24 100644
--- a/Core/include/ACTS/Utilities/ParameterDefinitions.hpp
+++ b/Core/include/ACTS/Utilities/ParameterDefinitions.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_PARAMETERDEFINITIONS_H
 #define ACTS_PARAMETERDEFINITIONS_H 1
 
diff --git a/Core/include/ACTS/Utilities/ParameterTypes.hpp b/Core/include/ACTS/Utilities/ParameterTypes.hpp
index 7c281d24d2fceb5308efaf0b183896ee09d10397..0f9c3c56568cf01c50694a3dcce1b59c05155fbc 100644
--- a/Core/include/ACTS/Utilities/ParameterTypes.hpp
+++ b/Core/include/ACTS/Utilities/ParameterTypes.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_PARAMETERTYPES_H
 #define ACTS_PARAMETERTYPES_H 1
 
diff --git a/Core/include/ACTS/Utilities/detail/DefaultMsgMacros.hpp b/Core/include/ACTS/Utilities/detail/DefaultMsgMacros.hpp
index f6a347cd3923b0b64e1c6f598c33195852192d84..8364a64588ca79357944fdb545753c8c79518b54 100644
--- a/Core/include/ACTS/Utilities/detail/DefaultMsgMacros.hpp
+++ b/Core/include/ACTS/Utilities/detail/DefaultMsgMacros.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_DEFAULT_MSG_MACROS_H
 #define ACTS_DEFAULT_MSG_MACROS_H 1
 
diff --git a/Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp b/Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp
index 94311626f6a07c82bcbc92976b362458f57c27c2..1b475857a58fbdaa33b97fa5d11df655f43de03b 100644
--- a/Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp
+++ b/Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_DEFAULTPARAMETERDEFINITIONS_H
 #define ACTS_DEFAULTPARAMETERDEFINITIONS_H 1
 
diff --git a/Core/include/ACTS/Utilities/detail/MatrixBasePlugin.hpp b/Core/include/ACTS/Utilities/detail/MatrixBasePlugin.hpp
index 3d448decb3fd85982e8bcec55c7157d8f944926f..9b9fe05fe53c406c372455f8a0c60ec2016110a9 100644
--- a/Core/include/ACTS/Utilities/detail/MatrixBasePlugin.hpp
+++ b/Core/include/ACTS/Utilities/detail/MatrixBasePlugin.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // AmgMatrixPlugin.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Utilities/detail/MatrixPlugin.hpp b/Core/include/ACTS/Utilities/detail/MatrixPlugin.hpp
index 21667883b1724ab6bd6587fe771f7af8caa338e3..cf2be477be42d9e414a66a02260414e6f97a535b 100644
--- a/Core/include/ACTS/Utilities/detail/MatrixPlugin.hpp
+++ b/Core/include/ACTS/Utilities/detail/MatrixPlugin.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef EVENTPRIMITIVES_SYMMETRICMATRIXHELPERS_H
 #define EVENTPRIMITIVES_SYMMETRICMATRIXHELPERS_H
 
diff --git a/Core/include/ACTS/Utilities/detail/TransformPlugin.hpp b/Core/include/ACTS/Utilities/detail/TransformPlugin.hpp
index 4b39080f01d7a616e33681f536fe0151caa091b1..e7d405a10d37a333caac40020a4ed05288ebbca1 100644
--- a/Core/include/ACTS/Utilities/detail/TransformPlugin.hpp
+++ b/Core/include/ACTS/Utilities/detail/TransformPlugin.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GeoPrimitivesHelpers.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/AbstractVolume.hpp b/Core/include/ACTS/Volumes/AbstractVolume.hpp
index 270b32bd50b191470ced75bbe34562cc6139162e..0fbe385e5477d66dccfd9df86e6fd65e07ea48e8 100644
--- a/Core/include/ACTS/Volumes/AbstractVolume.hpp
+++ b/Core/include/ACTS/Volumes/AbstractVolume.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // AbstractVolume.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/BevelledCylinderVolumeBounds.hpp b/Core/include/ACTS/Volumes/BevelledCylinderVolumeBounds.hpp
index 0a4b21112800426356306486298ef212f6d90714..b8c0bb612e961d9e40a129675163bffb0357234b 100644
--- a/Core/include/ACTS/Volumes/BevelledCylinderVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/BevelledCylinderVolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BevelledCylinderVolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/BoundaryCylinderSurface.hpp b/Core/include/ACTS/Volumes/BoundaryCylinderSurface.hpp
index 1b078a6ec7dab32a713e345a345a00d62889d03c..9b5a65d67729f44b4519ab3fb784deb14ccbd7d4 100644
--- a/Core/include/ACTS/Volumes/BoundaryCylinderSurface.hpp
+++ b/Core/include/ACTS/Volumes/BoundaryCylinderSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BoundaryCylinderSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/BoundaryDiscSurface.hpp b/Core/include/ACTS/Volumes/BoundaryDiscSurface.hpp
index cf8cfc6b145ad9cddde7a484f619e6049a738193..dc8ebc28bfb5edb3109e2321a02196e0ebd36ef3 100644
--- a/Core/include/ACTS/Volumes/BoundaryDiscSurface.hpp
+++ b/Core/include/ACTS/Volumes/BoundaryDiscSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BoundaryDiscSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/BoundaryPlaneSurface.hpp b/Core/include/ACTS/Volumes/BoundaryPlaneSurface.hpp
index f78eb7f74c7789c8a1bb0c24be65fd4ecf5cd54c..bc47775c763818f2a8c7cba585b2c05517a36c1e 100644
--- a/Core/include/ACTS/Volumes/BoundaryPlaneSurface.hpp
+++ b/Core/include/ACTS/Volumes/BoundaryPlaneSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BoundaryPlaneSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/BoundarySubtractedCylinderSurface.hpp b/Core/include/ACTS/Volumes/BoundarySubtractedCylinderSurface.hpp
index 7c4fcab0963551803eae3256bb45bc36e0744fe7..4ac56c9ce53357ab6c8bfc1cb89e9e06a8f01c5b 100644
--- a/Core/include/ACTS/Volumes/BoundarySubtractedCylinderSurface.hpp
+++ b/Core/include/ACTS/Volumes/BoundarySubtractedCylinderSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BoundarySubtractedCylinderSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/BoundarySubtractedPlaneSurface.hpp b/Core/include/ACTS/Volumes/BoundarySubtractedPlaneSurface.hpp
index 42103ef9fc58659a7a061fc7cb64867447f7ff0f..6d431917fc75e2e04647cc6459ff3b9c5bb172c9 100644
--- a/Core/include/ACTS/Volumes/BoundarySubtractedPlaneSurface.hpp
+++ b/Core/include/ACTS/Volumes/BoundarySubtractedPlaneSurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BoundarySubtractedPlaneSurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/BoundarySurface.hpp b/Core/include/ACTS/Volumes/BoundarySurface.hpp
index 9f2ac57401bc39d666f96caaa503c2cfdb67ae13..a1305206e4918c24245813b035b7c28500537f21 100644
--- a/Core/include/ACTS/Volumes/BoundarySurface.hpp
+++ b/Core/include/ACTS/Volumes/BoundarySurface.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BoundarySurface.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/BoundarySurfaceFace.hpp b/Core/include/ACTS/Volumes/BoundarySurfaceFace.hpp
index 15145dab400716742958d76494b1a6dfbcd2b3c4..a12645dcf32942a51479e6573e63e51165435e9d 100644
--- a/Core/include/ACTS/Volumes/BoundarySurfaceFace.hpp
+++ b/Core/include/ACTS/Volumes/BoundarySurfaceFace.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BoundarySurfaceFace.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/CombinedVolumeBounds.hpp b/Core/include/ACTS/Volumes/CombinedVolumeBounds.hpp
index 7dc16261ce8fbaa0d5fd766fc8325f5578378b97..a3ad066d6b62d941823e133b858534d5aaf7c1f6 100644
--- a/Core/include/ACTS/Volumes/CombinedVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/CombinedVolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CombinedVolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp b/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
index ec9a4bd184760e8e50708e725f16724ef3a82aec..5dd9440020a172e703e7e2330dc8b644e160d0e1 100644
--- a/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CuboidVolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp b/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
index 3a5dd281b94202ef6745865d416f0270dcd3d458..4a865e056ad11a8d8effada76a75bfd7ecf1b156 100644
--- a/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderVolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp b/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
index a60ce66522a9bca5dd4cf21236d577ac6d9af9a7..87fd3dbeba99f16c7f43ce2ee5a538df010411f0 100644
--- a/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DoubleTrapezoidVolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/PrismVolumeBounds.hpp b/Core/include/ACTS/Volumes/PrismVolumeBounds.hpp
index 0cf969895d9710173b35348430804c914d3ab1e9..619cc16ceb6074e8acd0e251e867266b9ae71543 100644
--- a/Core/include/ACTS/Volumes/PrismVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/PrismVolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // PrismVolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/SimplePolygonBrepVolumeBounds.hpp b/Core/include/ACTS/Volumes/SimplePolygonBrepVolumeBounds.hpp
index 847a261ad979aa84d24679824f5d31c9f678ce72..b291913b1dba105c722756be0d72253ef3f00024 100644
--- a/Core/include/ACTS/Volumes/SimplePolygonBrepVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/SimplePolygonBrepVolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SimplePolygonBrepVolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/SubtractedVolumeBounds.hpp b/Core/include/ACTS/Volumes/SubtractedVolumeBounds.hpp
index a5f67cfe1394bfd83b881835d42c585dbf5d8fe8..5ad6a7f99324140464f95abd525faeb1937aa577 100644
--- a/Core/include/ACTS/Volumes/SubtractedVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/SubtractedVolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedVolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp b/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
index 96402265584eaedd8bdf6cea9d68733b938ce775..4b3f965a9b0336d07eab4baffa1342248df83039 100644
--- a/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrapezoidVolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/Volume.hpp b/Core/include/ACTS/Volumes/Volume.hpp
index bbddff31146050b0f72f375d9f6abcf7f3581e1e..9143337b70a26c52b039b5f41527b0ac66339f8f 100644
--- a/Core/include/ACTS/Volumes/Volume.hpp
+++ b/Core/include/ACTS/Volumes/Volume.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // AbstractVolume.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/VolumeBounds.hpp b/Core/include/ACTS/Volumes/VolumeBounds.hpp
index 320af2889689443dd9fd524a51b91d7a4d9dabed..c5143c184ef6d8fc3d9e966871e52d2b7f032a69 100644
--- a/Core/include/ACTS/Volumes/VolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/VolumeBounds.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // VolumeBounds.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/include/ACTS/Volumes/VolumeExcluder.hpp b/Core/include/ACTS/Volumes/VolumeExcluder.hpp
index 2f8f7fcd2ce0b442f534c2ad0512e5ecd1f9d231..0a2f5a75f41b4089d41eb6e750f77cc2c7ce163e 100644
--- a/Core/include/ACTS/Volumes/VolumeExcluder.hpp
+++ b/Core/include/ACTS/Volumes/VolumeExcluder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // VolumeExcluder.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/ConeLayer.cpp b/Core/src/Detector/ConeLayer.cpp
index b612dd5f185af5d13f641bc981641a61f4e159a0..44ed94bd9945f488e8d9cf5856d61baa0dbd1280 100644
--- a/Core/src/Detector/ConeLayer.cpp
+++ b/Core/src/Detector/ConeLayer.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ConeLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/CylinderLayer.cpp b/Core/src/Detector/CylinderLayer.cpp
index da99e81bd5dddf7346f6f630748f14bec49345e6..a533ad9356268b0a8602e936fbf560fc93776082 100644
--- a/Core/src/Detector/CylinderLayer.cpp
+++ b/Core/src/Detector/CylinderLayer.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/DetachedTrackingVolume.cpp b/Core/src/Detector/DetachedTrackingVolume.cpp
index 593307c86676feb062e1ad2c577de5e514d02cd8..374dc6ac4d9075ca48bc6d2ba4108836c038736c 100644
--- a/Core/src/Detector/DetachedTrackingVolume.cpp
+++ b/Core/src/Detector/DetachedTrackingVolume.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DetachedTrackingVolume.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/DiscLayer.cpp b/Core/src/Detector/DiscLayer.cpp
index 0480d66c59cede056bb023466e2fdd2606eb5c94..5e58c85ebcc854f7f2ff874ad3f8206c257a969a 100644
--- a/Core/src/Detector/DiscLayer.cpp
+++ b/Core/src/Detector/DiscLayer.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DiscLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/GenericOverlapDescriptor.cpp b/Core/src/Detector/GenericOverlapDescriptor.cpp
index c4abc6b76f7d4b71465dabb514df9be1f077ff64..79eee8969abf434f3348c0c725753b8cb63a18a2 100644
--- a/Core/src/Detector/GenericOverlapDescriptor.cpp
+++ b/Core/src/Detector/GenericOverlapDescriptor.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GenericOverlapDescriptor.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/GlueVolumesDescriptor.cpp b/Core/src/Detector/GlueVolumesDescriptor.cpp
index 886c4a3acd96b381a3d26e777aad554ca87ba9cf..63bc8e5f0948765a45735cee238db23469f64ed0 100644
--- a/Core/src/Detector/GlueVolumesDescriptor.cpp
+++ b/Core/src/Detector/GlueVolumesDescriptor.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GlueVolumesDescriptor.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/Layer.cpp b/Core/src/Detector/Layer.cpp
index 2d0d48ff2b6e0e58821ac333e0aab4f40ce13ffd..4939add4c0d9db5c6fdee3faf1f7fafffc39e3d4 100644
--- a/Core/src/Detector/Layer.cpp
+++ b/Core/src/Detector/Layer.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // Layer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/NavigationLayer.cpp b/Core/src/Detector/NavigationLayer.cpp
index 69c99100466ce8f77e2eae239fa083d23e1a3b9c..bd3a6613d6859cb52f5420479f926c506c4e2f6e 100644
--- a/Core/src/Detector/NavigationLayer.cpp
+++ b/Core/src/Detector/NavigationLayer.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // NavigationLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/PlaneLayer.cpp b/Core/src/Detector/PlaneLayer.cpp
index 4efe3bf9d92da1aa0527d04b4b9feb2b1e99693c..2be0f0da6954841399f9b5f1d5a1dee687bb22bb 100644
--- a/Core/src/Detector/PlaneLayer.cpp
+++ b/Core/src/Detector/PlaneLayer.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // PlaneLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/SubtractedCylinderLayer.cpp b/Core/src/Detector/SubtractedCylinderLayer.cpp
index 7a229f80bc94d3ffa5e7c2fea2e8ce5634f7a2e2..d6d47bd8400e98c787f8a496d39887c1b9d44671 100644
--- a/Core/src/Detector/SubtractedCylinderLayer.cpp
+++ b/Core/src/Detector/SubtractedCylinderLayer.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedCylinderLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/SubtractedPlaneLayer.cpp b/Core/src/Detector/SubtractedPlaneLayer.cpp
index ceeb170a1fb5e9d51ec09628a49d7c8cd428880c..15122b9b70f53d87151ab1f4a2020627181b05b8 100644
--- a/Core/src/Detector/SubtractedPlaneLayer.cpp
+++ b/Core/src/Detector/SubtractedPlaneLayer.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedPlaneLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/TrackingGeometry.cpp b/Core/src/Detector/TrackingGeometry.cpp
index 184ff6f45192e802b9da075e424143d1e1ee909b..bef80208c62667db771ee9881e29f174f6ce94f1 100644
--- a/Core/src/Detector/TrackingGeometry.cpp
+++ b/Core/src/Detector/TrackingGeometry.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrackingGeometry.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Detector/TrackingVolume.cpp b/Core/src/Detector/TrackingVolume.cpp
index c92b2bbe640f4451c8819112cc30424fdf641ade..f35d6c1b48461fd90372189a85f93d0336515047 100644
--- a/Core/src/Detector/TrackingVolume.cpp
+++ b/Core/src/Detector/TrackingVolume.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrackingVolume.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/EventData/NeutralParameters.cpp b/Core/src/EventData/NeutralParameters.cpp
index 6153234f6df26d0271de34ea2534c0d88f82333a..7e17136639345714d72f9a950ce26a6f26cc8f73 100644
--- a/Core/src/EventData/NeutralParameters.cpp
+++ b/Core/src/EventData/NeutralParameters.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/EventData/NeutralParameters.hpp"
 
 namespace Acts
diff --git a/Core/src/EventData/TrackParameters.cpp b/Core/src/EventData/TrackParameters.cpp
index 732785694abeee8f2c7fc2466144ee18adb50013..37d313d0361132088c399c1924211022d45f76f0 100644
--- a/Core/src/EventData/TrackParameters.cpp
+++ b/Core/src/EventData/TrackParameters.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/EventData/TrackParameters.hpp"
 
 namespace Acts
diff --git a/Core/src/EventData/TrackParametersBase.cpp b/Core/src/EventData/TrackParametersBase.cpp
index 3d2b8a2e67d6f877a14f58739607f71d386ca5e3..5f8fc8a5d7654f142bb6231b33a71a91d630f854 100644
--- a/Core/src/EventData/TrackParametersBase.cpp
+++ b/Core/src/EventData/TrackParametersBase.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 // STL include(s)
 #include <iostream>
 #include <iomanip>
diff --git a/Core/src/EventData/TransportJacobian.cpp b/Core/src/EventData/TransportJacobian.cpp
index db6e1dd7f63836093ee139fb472032a65f290e86..c486e329ade5c8b2f0b5af1c61828d82894af216 100644
--- a/Core/src/EventData/TransportJacobian.cpp
+++ b/Core/src/EventData/TransportJacobian.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TransportJacobian.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Extrapolation/ExtrapolationCell.cpp b/Core/src/Extrapolation/ExtrapolationCell.cpp
index bea0e35bdeef9e66e897879152f389f4ea2a5174..b94122a597e396c060484efaa2150bac94ce858e 100644
--- a/Core/src/Extrapolation/ExtrapolationCell.cpp
+++ b/Core/src/Extrapolation/ExtrapolationCell.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ExtrapolationCell.cpp, ACTS project 
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Extrapolation/ExtrapolationEngine.cpp b/Core/src/Extrapolation/ExtrapolationEngine.cpp
index 364a5f1b5d56d2ddad86a14bcd410fa20855cb41..31b4c963cef5b10551963d480cd107e2996b4e3a 100644
--- a/Core/src/Extrapolation/ExtrapolationEngine.cpp
+++ b/Core/src/Extrapolation/ExtrapolationEngine.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ExtrapolationEngine.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Extrapolation/MaterialEffectsEngine.cpp b/Core/src/Extrapolation/MaterialEffectsEngine.cpp
index 1096ba53c84631e753fbd854184b6a32619664c9..c177694413da61f1ef131ebf1925b50e14fba229 100644
--- a/Core/src/Extrapolation/MaterialEffectsEngine.cpp
+++ b/Core/src/Extrapolation/MaterialEffectsEngine.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // MaterialEffectsEngine.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Extrapolation/MaterialInteraction.cpp b/Core/src/Extrapolation/MaterialInteraction.cpp
index c9a6a64e0bfd0b4d337554a463bbdc914ac127fc..0bcd82eaebbc68563121a03f43826cb6dfc9c22d 100644
--- a/Core/src/Extrapolation/MaterialInteraction.cpp
+++ b/Core/src/Extrapolation/MaterialInteraction.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // MaterialInteraction.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Extrapolation/RungeKuttaEngine.cpp b/Core/src/Extrapolation/RungeKuttaEngine.cpp
index 0a40214d76ad80a0a7c1564c5e9abfac881af4a5..88266d65421758dbbc50e7191fd3719f98735e36 100644
--- a/Core/src/Extrapolation/RungeKuttaEngine.cpp
+++ b/Core/src/Extrapolation/RungeKuttaEngine.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 /////////////////////////////////////////////////////////////////////////////////
 // RungeKuttaEngine.cpp, ACTS project
 /////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/src/Extrapolation/RungeKuttaUtils.cpp b/Core/src/Extrapolation/RungeKuttaUtils.cpp
index a24ddbfb8ca308856734b3d0a070ec720b3b8947..195ef5d1e9f1a4d5c49ea0c7460bf68a42f8d325 100644
--- a/Core/src/Extrapolation/RungeKuttaUtils.cpp
+++ b/Core/src/Extrapolation/RungeKuttaUtils.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 /////////////////////////////////////////////////////////////////////////////////
 // RungeKuttaUtils.cpp , ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Extrapolation/StaticEngine.cpp b/Core/src/Extrapolation/StaticEngine.cpp
index 4d56c3b60a77877e34fbd947a2b3d2edf03d43a1..b7939696183d090e71ce3e2f5fe98a8bc9d980ca 100644
--- a/Core/src/Extrapolation/StaticEngine.cpp
+++ b/Core/src/Extrapolation/StaticEngine.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // StaticEngine.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Extrapolation/StaticNavigationEngine.cpp b/Core/src/Extrapolation/StaticNavigationEngine.cpp
index ff0aa67f94ea21d015ea5d98b03b0c7789825e6f..c2d99b4da96eff7b1f23920960b34acc47f18348 100644
--- a/Core/src/Extrapolation/StaticNavigationEngine.cpp
+++ b/Core/src/Extrapolation/StaticNavigationEngine.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // StaticNavigationEngine.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/GeometryUtils/BinUtility.cpp b/Core/src/GeometryUtils/BinUtility.cpp
index 2afa6c9e1546d89624cb3c5a08255c23f6f430fe..b952b88ee4fa4718839dcd975ed5ad19c2bb5a37 100644
--- a/Core/src/GeometryUtils/BinUtility.cpp
+++ b/Core/src/GeometryUtils/BinUtility.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 
 ///////////////////////////////////////////////////////////////////
 // BinUtility.cpp, ACTS project
diff --git a/Core/src/GeometryUtils/GeometryID.cpp b/Core/src/GeometryUtils/GeometryID.cpp
index ab5b9f0aa81c5cf6741bb5622ece4937c5ed44ea..64a4c7918641b18b13eef65082a27a291c9f957f 100644
--- a/Core/src/GeometryUtils/GeometryID.cpp
+++ b/Core/src/GeometryUtils/GeometryID.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GeometryIDCalculator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Material/HomogeneousSurfaceMaterial.cpp b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
index 7d6d05093258f21f20e8354fd033cbfebe92ddcc..eaded7b3ea67ab54df572868059372c299a45706 100644
--- a/Core/src/Material/HomogeneousSurfaceMaterial.cpp
+++ b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // HomogeneousSurfaceMaterial.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Material/MaterialProperties.cpp b/Core/src/Material/MaterialProperties.cpp
index 54b7791388f80baabf2a093df9bbfc79195717a8..3dd1bf6c5f5e727c1c4319dadb3d93783774a40d 100644
--- a/Core/src/Material/MaterialProperties.cpp
+++ b/Core/src/Material/MaterialProperties.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // MaterialProperties.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/ConeBounds.cpp b/Core/src/Surfaces/ConeBounds.cpp
index 908bfe45a47f5c4ac3f0fd66c21596d1550d0968..4b61ed2237600d86836606493856aee98bfcec78 100644
--- a/Core/src/Surfaces/ConeBounds.cpp
+++ b/Core/src/Surfaces/ConeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ConeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/ConeSurface.cpp b/Core/src/Surfaces/ConeSurface.cpp
index bead3148af842668fd1dce802b5225af6b2396fa..d04483c8a53d2232c5d008aa07c31c1f56634d25 100644
--- a/Core/src/Surfaces/ConeSurface.cpp
+++ b/Core/src/Surfaces/ConeSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // ConeSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/CylinderBounds.cpp b/Core/src/Surfaces/CylinderBounds.cpp
index f1a297da5b0d8ccafa41bba955e18ffbb432ef78..7d22b6be1a01f6e35f604a39d7e1a3e411425eca 100644
--- a/Core/src/Surfaces/CylinderBounds.cpp
+++ b/Core/src/Surfaces/CylinderBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/CylinderSurface.cpp b/Core/src/Surfaces/CylinderSurface.cpp
index 024474aef6a49bbc70a545fd0740985baf941353..0719ff44194173d67c0198e9f5c2c17548fc3221 100644
--- a/Core/src/Surfaces/CylinderSurface.cpp
+++ b/Core/src/Surfaces/CylinderSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/DiamondBounds.cpp b/Core/src/Surfaces/DiamondBounds.cpp
index 43dcc7587adba66551b666913ca708d1c5363457..71b03220ae4c20dfbb291b8a6129cef6ecb7839d 100644
--- a/Core/src/Surfaces/DiamondBounds.cpp
+++ b/Core/src/Surfaces/DiamondBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DiamondBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/DiscSurface.cpp b/Core/src/Surfaces/DiscSurface.cpp
index b7b25bec03d9e37864a68c3b425287d231feeda0..8447cf08fffb2ecce8e9efe9fe3a321618acb902 100644
--- a/Core/src/Surfaces/DiscSurface.cpp
+++ b/Core/src/Surfaces/DiscSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DiscSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
index c4430638688c95863d3325cd26cd3290fc9193af..e4fbb55703abebeb08daff626608066ada716b5c 100644
--- a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
+++ b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DiscTrapezoidalBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/EllipseBounds.cpp b/Core/src/Surfaces/EllipseBounds.cpp
index 3429be9c0404a0aece57b740763f016e5567ee1e..7ecc91f3b773fe2c6c6c849672d5f89ea7c3d133 100644
--- a/Core/src/Surfaces/EllipseBounds.cpp
+++ b/Core/src/Surfaces/EllipseBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // EllipseBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/PerigeeSurface.cpp b/Core/src/Surfaces/PerigeeSurface.cpp
index 77043567c011dfd528538c7b975bf1aa6eed14ca..4757cfbf8ec4065ec70e2a57a98f92016f8dda26 100644
--- a/Core/src/Surfaces/PerigeeSurface.cpp
+++ b/Core/src/Surfaces/PerigeeSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 /////////////////////////////////////////////////////////////////
 // PerigeeSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/PlaneSurface.cpp b/Core/src/Surfaces/PlaneSurface.cpp
index d8241421594bffae70a3c3c18ab0522799151d12..67e5977de6c5a16a4ef8705f04e858a6398c2108 100644
--- a/Core/src/Surfaces/PlaneSurface.cpp
+++ b/Core/src/Surfaces/PlaneSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // PlaneSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/RadialBounds.cpp b/Core/src/Surfaces/RadialBounds.cpp
index 8f87b5b9b1c033bd5a0306cf60f9a9b8b20c552a..70506a65c630facd02552ca586fe28cc876b2ff3 100644
--- a/Core/src/Surfaces/RadialBounds.cpp
+++ b/Core/src/Surfaces/RadialBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // RadialBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/RectangleBounds.cpp b/Core/src/Surfaces/RectangleBounds.cpp
index 51ddfbfcf6d7308f9d52ce6e781ae5b178414a75..6460506655c895e8562f7ca78cf1e246ceb9cba9 100644
--- a/Core/src/Surfaces/RectangleBounds.cpp
+++ b/Core/src/Surfaces/RectangleBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // RectangleBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/SlidingCylinderSurface.cpp b/Core/src/Surfaces/SlidingCylinderSurface.cpp
index db25b7469bd42e36e36f54f40076ef66a7bc3417..59424208f46adbf31eca9b7ff7dcc0edb973436d 100644
--- a/Core/src/Surfaces/SlidingCylinderSurface.cpp
+++ b/Core/src/Surfaces/SlidingCylinderSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SlidingCylinderSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/SlidingDiscSurface.cpp b/Core/src/Surfaces/SlidingDiscSurface.cpp
index bb1ed739ec896a30ba9508b2ca9b656b639191af..66f17c392529aac4ebc3fd46564eb8ba76802821 100644
--- a/Core/src/Surfaces/SlidingDiscSurface.cpp
+++ b/Core/src/Surfaces/SlidingDiscSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SlidingDiscSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/StraightLineSurface.cpp b/Core/src/Surfaces/StraightLineSurface.cpp
index c829568fa286ae8f8bc35a90be65c623465d0ed9..3dda8e407fdcb10bccd4523e985c31bd161dcccb 100644
--- a/Core/src/Surfaces/StraightLineSurface.cpp
+++ b/Core/src/Surfaces/StraightLineSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // StraightLineSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/SubtractedCylinderSurface.cpp b/Core/src/Surfaces/SubtractedCylinderSurface.cpp
index ee57c73c0fd95f9d9ae7baebc239213ce3874657..48fd1129a5c17f5bdc42e09837a4c60bdd4000b4 100644
--- a/Core/src/Surfaces/SubtractedCylinderSurface.cpp
+++ b/Core/src/Surfaces/SubtractedCylinderSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedCylinderSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/SubtractedDiscSurface.cpp b/Core/src/Surfaces/SubtractedDiscSurface.cpp
index 968280a8eb2927c07b5ee756f12dca798d1d3cd1..71d28eb3b58efe707ad34439d946937fd447630c 100644
--- a/Core/src/Surfaces/SubtractedDiscSurface.cpp
+++ b/Core/src/Surfaces/SubtractedDiscSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedDiscSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/SubtractedPlaneSurface.cpp b/Core/src/Surfaces/SubtractedPlaneSurface.cpp
index 71ad5c64ae8b24b7fc808fa73c9b6e56490369e8..979daaa907e83a7a132f2e5e9c9e6d59193e5d63 100644
--- a/Core/src/Surfaces/SubtractedPlaneSurface.cpp
+++ b/Core/src/Surfaces/SubtractedPlaneSurface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedPlaneSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/Surface.cpp b/Core/src/Surfaces/Surface.cpp
index 95ad213bbeef010bb4d5b381b4c14c4405cab054..9c9fc3b0c6f981535af2a97f0a6667dc752cab95 100644
--- a/Core/src/Surfaces/Surface.cpp
+++ b/Core/src/Surfaces/Surface.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // Surface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/SurfaceBounds.cpp b/Core/src/Surfaces/SurfaceBounds.cpp
index cef6f3257324481c3fbe9ef480000e1ba2eae90c..4a89e6a50780eb20366d6e7f60728dcc4cd89b61 100644
--- a/Core/src/Surfaces/SurfaceBounds.cpp
+++ b/Core/src/Surfaces/SurfaceBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SurfaceBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/TrapezoidBounds.cpp b/Core/src/Surfaces/TrapezoidBounds.cpp
index e90b5f31d11263cefada75ff17dbbf3bb60f66e9..4a6481203f18748c44d3171301d87d596f9e8b06 100644
--- a/Core/src/Surfaces/TrapezoidBounds.cpp
+++ b/Core/src/Surfaces/TrapezoidBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrapezoidBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Surfaces/TriangleBounds.cpp b/Core/src/Surfaces/TriangleBounds.cpp
index 9f6ce7e04f1ed8fd7cbb0b7f6ad958f212fc23b4..7e55aa638669d87f2767b5793fc8c2c28d9755da 100644
--- a/Core/src/Surfaces/TriangleBounds.cpp
+++ b/Core/src/Surfaces/TriangleBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TriangleBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Tools/CylinderGeometryBuilder.cpp b/Core/src/Tools/CylinderGeometryBuilder.cpp
index ca8e00b59cd9a033259006cad829014a774b1e3a..8413bf3abef646263329970584b91b5628a4eb01 100644
--- a/Core/src/Tools/CylinderGeometryBuilder.cpp
+++ b/Core/src/Tools/CylinderGeometryBuilder.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderGeometryBuilder.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Tools/CylinderVolumeBuilder.cpp b/Core/src/Tools/CylinderVolumeBuilder.cpp
index fd58b4689ccb267dc0d4e25146706864bf978d23..d60cfb94f47596b693803141eeef582082aaee29 100644
--- a/Core/src/Tools/CylinderVolumeBuilder.cpp
+++ b/Core/src/Tools/CylinderVolumeBuilder.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderVolumeBuilder.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Tools/CylinderVolumeHelper.cpp b/Core/src/Tools/CylinderVolumeHelper.cpp
index a5597a0092eeeb96b240c0f40be69061545d476d..f182c792d428a8e12ecb80aadc8600c7aed7db79 100644
--- a/Core/src/Tools/CylinderVolumeHelper.cpp
+++ b/Core/src/Tools/CylinderVolumeHelper.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderVolumeHelper.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Tools/LayerArrayCreator.cpp b/Core/src/Tools/LayerArrayCreator.cpp
index 09783d28ee80a92f0a69bd06c803fb590fa8b469..0af7ee5898a43803d9384ae748f37cbc7dd5eaed 100644
--- a/Core/src/Tools/LayerArrayCreator.cpp
+++ b/Core/src/Tools/LayerArrayCreator.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // LayerArrayCreator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Tools/LayerCreator.cpp b/Core/src/Tools/LayerCreator.cpp
index 0d2221e5b9a0c66bb974f18ee398fcd6c95eee8b..f5e24763a3a3d44c5df2ac2ce8ab65b9b4a4ed49 100644
--- a/Core/src/Tools/LayerCreator.cpp
+++ b/Core/src/Tools/LayerCreator.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // LayerCreator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Tools/PassiveLayerBuilder.cpp b/Core/src/Tools/PassiveLayerBuilder.cpp
index 2b4b8c6707e473ec2a77338f7d704d130407cd8e..04cec3daa1b108fd0cf5828b111fa7e443e7d14c 100644
--- a/Core/src/Tools/PassiveLayerBuilder.cpp
+++ b/Core/src/Tools/PassiveLayerBuilder.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // PassiveLayerBuilder.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Tools/SurfaceArrayCreator.cpp b/Core/src/Tools/SurfaceArrayCreator.cpp
index dbd99b012fe9afc4903140665e82f049018f34e1..4c0579b5706caa6768a6689fa39cf2e4edf6a5a8 100644
--- a/Core/src/Tools/SurfaceArrayCreator.cpp
+++ b/Core/src/Tools/SurfaceArrayCreator.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SurfaceArrayCreator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Tools/TrackingVolumeArrayCreator.cpp b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
index 8dea973dfd3cd3af195d6d99bf839f4850dfe1dd..a41f97353df017eff424db82c84fe6eca54bd5c6 100644
--- a/Core/src/Tools/TrackingVolumeArrayCreator.cpp
+++ b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrackingVolumeArrayCreator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Utilities/Logger.cpp b/Core/src/Utilities/Logger.cpp
index 0327f795272ec5a22b54f9e798602c94a6ce3a75..a313a8b989541550c0f1601b8bbbc3e300386dfc 100644
--- a/Core/src/Utilities/Logger.cpp
+++ b/Core/src/Utilities/Logger.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/Utilities/Logger.hpp"
 
 namespace Acts
diff --git a/Core/src/Volumes/AbstractVolume.cpp b/Core/src/Volumes/AbstractVolume.cpp
index f3cf7f9df13ab1232ec5e45256e8a5d5ad1a7e67..2263230adb97fbb039c223c83ea7325f5cc55401 100644
--- a/Core/src/Volumes/AbstractVolume.cpp
+++ b/Core/src/Volumes/AbstractVolume.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // AbstractVolume.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/BevelledCylinderVolumeBounds.cpp b/Core/src/Volumes/BevelledCylinderVolumeBounds.cpp
index 01b31412d47df43396e407a76eaafe031bfd8a36..e23bdda0090798006d0b14b742ac409e875b440e 100644
--- a/Core/src/Volumes/BevelledCylinderVolumeBounds.cpp
+++ b/Core/src/Volumes/BevelledCylinderVolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // BevelledCylinderVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/CombinedVolumeBounds.cpp b/Core/src/Volumes/CombinedVolumeBounds.cpp
index ba73bcc6f36ee4682a48eef9e6a5d6c0fdd7dcf8..459ec9a09582392159af02d8be484c86743e8e1f 100644
--- a/Core/src/Volumes/CombinedVolumeBounds.cpp
+++ b/Core/src/Volumes/CombinedVolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CombinedVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/CuboidVolumeBounds.cpp b/Core/src/Volumes/CuboidVolumeBounds.cpp
index ec553f155e270fea41630789e5af3dec891f94f4..5985782e8a4175c23afacf6229a74742d1aa192b 100644
--- a/Core/src/Volumes/CuboidVolumeBounds.cpp
+++ b/Core/src/Volumes/CuboidVolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CuboidVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/CylinderVolumeBounds.cpp b/Core/src/Volumes/CylinderVolumeBounds.cpp
index a7a8fec39f7b63488186bfddae76bf2ac17258ed..6ca7de85d51ffb8df4fd0347b6d31d37555598bf 100644
--- a/Core/src/Volumes/CylinderVolumeBounds.cpp
+++ b/Core/src/Volumes/CylinderVolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // CylinderVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
index b45220ed5b7f00f4ef81274675cf664b6eb5da33..ed69ad7cbc5c8c16cca5b0d944b0cd9372d6c9fc 100644
--- a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DoubleTrapezoidVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/PrismVolumeBounds.cpp b/Core/src/Volumes/PrismVolumeBounds.cpp
index 07ca031d35606a095907d032f4a6e35337c7b6a7..e441c815ccb95846515f759836d535b003942808 100644
--- a/Core/src/Volumes/PrismVolumeBounds.cpp
+++ b/Core/src/Volumes/PrismVolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // PrismVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/SimplePolygonBrepVolumeBounds.cpp b/Core/src/Volumes/SimplePolygonBrepVolumeBounds.cpp
index 7725f258b357b87cd1ee6195ffdce1c2f7787e9e..db343ec8ad4e522ebb201aec1f6c39926f175588 100644
--- a/Core/src/Volumes/SimplePolygonBrepVolumeBounds.cpp
+++ b/Core/src/Volumes/SimplePolygonBrepVolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SimplePolygonBrepVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/SubtractedVolumeBounds.cpp b/Core/src/Volumes/SubtractedVolumeBounds.cpp
index bd6f64ce8e2534a9e3f9c71eac458e4562360fec..466bf6550e8ba2f8203804b7b21f5ff0b6d96b16 100644
--- a/Core/src/Volumes/SubtractedVolumeBounds.cpp
+++ b/Core/src/Volumes/SubtractedVolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // SubtractedVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/TrapezoidVolumeBounds.cpp b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
index a76f086c6b702b060688d9534498174099d54ace..0f15917f2733852557cb763c029d4a201f756d81 100644
--- a/Core/src/Volumes/TrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TrapezoidVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/Volume.cpp b/Core/src/Volumes/Volume.cpp
index fa246cecf5581d2eb26c42284e245843b7983ecc..5c33df8c99d762836407cef5d17690058c58f8ff 100644
--- a/Core/src/Volumes/Volume.cpp
+++ b/Core/src/Volumes/Volume.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // Volume.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/VolumeBounds.cpp b/Core/src/Volumes/VolumeBounds.cpp
index 30b410df852fe96447cdb15a9d65885d046c0af3..db97ceb0c34eda9c7c94d24ad00985f8864187df 100644
--- a/Core/src/Volumes/VolumeBounds.cpp
+++ b/Core/src/Volumes/VolumeBounds.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // VolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Core/src/Volumes/VolumeExcluder.cpp b/Core/src/Volumes/VolumeExcluder.cpp
index f431b8c354ef4ed8d5210bac5446a428d2bb686b..e6f02f1f9f725a789b94d07be400c3058157e334 100644
--- a/Core/src/Volumes/VolumeExcluder.cpp
+++ b/Core/src/Volumes/VolumeExcluder.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // VolumeExcluder.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/BuildGenericDetector.hpp b/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/BuildGenericDetector.hpp
index 0b26b2601d685874c0fa0eea87791d65835cef49..818e366440fd186c240398b6ad47573f06a71382 100644
--- a/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/BuildGenericDetector.hpp
+++ b/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/BuildGenericDetector.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef ACTS_BUILDGENERICDETECTOR_H
 #define ACTS_BUILDGENERICDETECTOR_H 1
 
diff --git a/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/GenericDetectorElement.hpp b/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/GenericDetectorElement.hpp
index e42dcff71c0afcb659d132701f8e977e6a4e04da..4a3cdf47e6ed6fcdf7cbba52fe61f95bf8e84e0f 100644
--- a/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/GenericDetectorElement.hpp
+++ b/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/GenericDetectorElement.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GenericDetectorElement.h, ACTS project, Generic Detector plugin
 ///////////////////////////////////////////////////////////////////
diff --git a/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/GenericLayerBuilder.hpp b/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/GenericLayerBuilder.hpp
index 4248148e1e8ee93f22f4d10ba1f45234930b1931..f6dfd6e18e4730e57bc082d436c14cc15f09a724 100644
--- a/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/GenericLayerBuilder.hpp
+++ b/Examples/GenericDetectorExample/include/ACTS/Examples/GenericDetectorExample/GenericLayerBuilder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // LayerArrayCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Examples/GenericDetectorExample/src/BuildGenericDetector.cpp b/Examples/GenericDetectorExample/src/BuildGenericDetector.cpp
index ab0eff1d3ae24d9cb65508628dfa2e0881b1ed79..73ade0de9db9b5a8eaf0709306c36348d0e5831e 100644
--- a/Examples/GenericDetectorExample/src/BuildGenericDetector.cpp
+++ b/Examples/GenericDetectorExample/src/BuildGenericDetector.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 // ACTS include(s)
 #include "ACTS/Examples/GenericDetectorExample/BuildGenericDetector.hpp"
 #include "ACTS/Examples/GenericDetectorExample/GenericLayerBuilder.hpp"
diff --git a/Examples/GenericDetectorExample/src/GenericDetectorElement.cpp b/Examples/GenericDetectorExample/src/GenericDetectorElement.cpp
index 61d24090cdfb37ad4429a41f5eee038b079981a1..b3cb068428fef27f173d9de234d4587f0e3e9f47 100644
--- a/Examples/GenericDetectorExample/src/GenericDetectorElement.cpp
+++ b/Examples/GenericDetectorExample/src/GenericDetectorElement.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GenericDetectorElement.cxx, ACTS project, Generic Detector plugin
 ///////////////////////////////////////////////////////////////////
diff --git a/Examples/GenericDetectorExample/src/GenericLayerBuilder.cpp b/Examples/GenericDetectorExample/src/GenericLayerBuilder.cpp
index c73530859197f004464110108593d06c710cf1c9..a011f3d46a630073cdb89385f9b7f2a4c4451943 100644
--- a/Examples/GenericDetectorExample/src/GenericLayerBuilder.cpp
+++ b/Examples/GenericDetectorExample/src/GenericLayerBuilder.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // GenericLayerBuilder.cxx, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepCylinderGeometryBuilder.hpp b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepCylinderGeometryBuilder.hpp
index 3478b7fd9bef94936a9ead4ecb323f68c1fb0cbd..e13b3849ea825dc0c04e7346e6105441dc8dd095 100644
--- a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepCylinderGeometryBuilder.hpp
+++ b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepCylinderGeometryBuilder.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DD4hepCylinderGeometryBuilder.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
index bd9fb268bc904cba957d1d33823fb616cf774977..40dcba1b072d6d69ce7053922c472b25a1b572ad 100644
--- a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
+++ b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DD4hepDetElement.h, ACTS project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepGeometryHelper.hpp b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepGeometryHelper.hpp
index 9648967f7def923a84f482335f33c290129c0d88..feff06aa51321ada9c6bb7c54f818e8d2687987e 100644
--- a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepGeometryHelper.hpp
+++ b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepGeometryHelper.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DD4hepGeometryHelper.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerHelper.hpp b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerHelper.hpp
index 652607de53b4aa768207a98a0480a114d7c8485e..4439b475bc6f831d067143a4caf0b410c7095de0 100644
--- a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerHelper.hpp
+++ b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerHelper.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DD4hepLayerHelper.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DetExtension.hpp b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DetExtension.hpp
index 64da073bf18db521d5badf90dafe598a5b700df1..f4e6fe0a36a26fa481ca80b6f58092d74b933b92 100644
--- a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DetExtension.hpp
+++ b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/DetExtension.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // DetExtension.h, ACTS project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/IDD4hepGeometrySvc.hpp b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/IDD4hepGeometrySvc.hpp
index 644a8cc2e1adffac09387e884c1dce06e35c8bb9..c528eca02404db1085b834e3a947ce1c7a50b21d 100644
--- a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/IDD4hepGeometrySvc.hpp
+++ b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/IDD4hepGeometrySvc.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // LayerArrayCreator.h, ACTS project
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/IDetExtension.hpp b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/IDetExtension.hpp
index be1e4959080ca6a60404f56cae03e031651063e1..ce1b3bb639834700b36105f3e90d279ee3c423d4 100644
--- a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/IDetExtension.hpp
+++ b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/IDetExtension.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // IDetExtension.h, ACTS project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/Module.hpp b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/Module.hpp
index dffb8cd06779232165fda33db65112f1474b76d5..edbb2859bfd8a84f2915ce62d47f14ed974f5b15 100644
--- a/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/Module.hpp
+++ b/Plugins/DD4hepPlugins/include/ACTS/Plugins/DD4hepPlugins/Module.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // Module.h, ACTS project, Modules plugin
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/DD4hepPlugins/src/DD4hepCylinderGeometryBuilder.cpp b/Plugins/DD4hepPlugins/src/DD4hepCylinderGeometryBuilder.cpp
index 472d6e4d1db456398fb8deb38fde935f5a32455f..549ce2a50262848e20412897919a9404959629fe 100644
--- a/Plugins/DD4hepPlugins/src/DD4hepCylinderGeometryBuilder.cpp
+++ b/Plugins/DD4hepPlugins/src/DD4hepCylinderGeometryBuilder.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/Plugins/DD4hepPlugins/DD4hepCylinderGeometryBuilder.hpp"
 // Geometry module
 #include "ACTS/Detector/TrackingGeometry.hpp"
diff --git a/Plugins/DD4hepPlugins/src/DD4hepDetectorElement.cpp b/Plugins/DD4hepPlugins/src/DD4hepDetectorElement.cpp
index e20ec3510758ca8ece0a4df5e6d1a9f167193b25..6e49ff0476045a5d8ed3e696777633e074c16b59 100644
--- a/Plugins/DD4hepPlugins/src/DD4hepDetectorElement.cpp
+++ b/Plugins/DD4hepPlugins/src/DD4hepDetectorElement.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp"
 
 Acts::DD4hepDetElement::DD4hepDetElement(const DD4hep::Geometry::DetElement detElement, const DD4hep::Geometry::Segmentation segmentation, std::shared_ptr<const Acts::Transform3D> motherTransform) :
diff --git a/Plugins/DD4hepPlugins/src/DD4hepGeometryHelper.cpp b/Plugins/DD4hepPlugins/src/DD4hepGeometryHelper.cpp
index f95bcbf9f28fd0fa7834ec5f502a5287e1771128..741ae3957fe3fd349e565786f2f0daa611f37261 100644
--- a/Plugins/DD4hepPlugins/src/DD4hepGeometryHelper.cpp
+++ b/Plugins/DD4hepPlugins/src/DD4hepGeometryHelper.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/Plugins/DD4hepPlugins/DD4hepGeometryHelper.hpp"
 // Geometry Module
 #include "ACTS/Volumes/CylinderVolumeBounds.hpp"
diff --git a/Plugins/DD4hepPlugins/src/DD4hepLayerHelper.cpp b/Plugins/DD4hepPlugins/src/DD4hepLayerHelper.cpp
index e2590b21926fe8c786595e364fca532129f727a1..3ad0cc75eb046f69ca5d29d033d6bd0d2c6f982c 100644
--- a/Plugins/DD4hepPlugins/src/DD4hepLayerHelper.cpp
+++ b/Plugins/DD4hepPlugins/src/DD4hepLayerHelper.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/Plugins/DD4hepPlugins/DD4hepLayerHelper.hpp"
 //DD4hepPlugin
 #include "ACTS/Plugins/DD4hepPlugins/DD4hepGeometryHelper.hpp"
diff --git a/Plugins/DD4hepPlugins/src/DetExtension.cpp b/Plugins/DD4hepPlugins/src/DetExtension.cpp
index e9215fbe03587f1d92554a3b28aa65d7aadfe396..48d6b0fe03f51f07ead6724f122fc8ac71877fdb 100644
--- a/Plugins/DD4hepPlugins/src/DetExtension.cpp
+++ b/Plugins/DD4hepPlugins/src/DetExtension.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/Plugins/DD4hepPlugins/DetExtension.hpp"
 
 Acts::DetExtension::DetExtension() :
diff --git a/Plugins/DD4hepPlugins/src/Module.cpp b/Plugins/DD4hepPlugins/src/Module.cpp
index 5fd23f325bef02bd1e710f947b041498f95066b8..a22c1900d38f01903d9fb42dae085d2f1e2b572d 100644
--- a/Plugins/DD4hepPlugins/src/Module.cpp
+++ b/Plugins/DD4hepPlugins/src/Module.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/Plugins/DD4hepPlugins/Module.hpp"
 
 Acts::Module::Module(const DD4hep::Geometry::DetElement& mod, std::vector<std::shared_ptr<const Acts::Transform3D>> placements) :
diff --git a/Plugins/TGeoPlugins/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp b/Plugins/TGeoPlugins/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
index ee8cbc0561b0bbe05935fcb359bcd1eebabdd5c7..73215d249cd3b16d1c5423919ec1064f3b1f5cce 100644
--- a/Plugins/TGeoPlugins/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
+++ b/Plugins/TGeoPlugins/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ///////////////////////////////////////////////////////////////////
 // TGeoDetectorElement.h, ACTS project, TGeoDetector plugin
 ///////////////////////////////////////////////////////////////////
diff --git a/Plugins/TGeoPlugins/src/TGeoDetectorElement.cpp b/Plugins/TGeoPlugins/src/TGeoDetectorElement.cpp
index 79ca6df6796d908637477eb6735588c6df55eccb..379279fe4ddb6a04bd324dabf1b4800ff4f84741 100644
--- a/Plugins/TGeoPlugins/src/TGeoDetectorElement.cpp
+++ b/Plugins/TGeoPlugins/src/TGeoDetectorElement.cpp
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 ACTS project team
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
 // ACTS
 #include "ACTS/Surfaces/PlaneSurface.hpp"