diff --git a/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt b/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt
index 51ce129f102e3cb17a503c5a5165da77036283c7..66584f0824762eed5efca5c4cc353d2bcda8598a 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt
+++ b/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt
@@ -1,3 +1,4 @@
+# $Id: CMakeLists.txt 757198 2016-06-23 10:12:56Z krasznaa $
 ################################################################################
 # Package: TileByteStream
 ################################################################################
@@ -6,43 +7,47 @@
 atlas_subdir( TileByteStream )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Event/ByteStreamCnvSvcBase
-                          Event/ByteStreamData
-                          GaudiKernel
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileIdentifier
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Control/CLIDSvc
-                          Control/SGTools
-                          Control/StoreGate
-                          Event/ByteStreamCnvSvc
-                          TileCalorimeter/TileCalib/TileCalibBlobObjs
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileL2Algs
-                          TileCalorimeter/TileRecUtils )
+atlas_depends_on_subdirs(
+   PUBLIC
+   Control/AthenaBaseComps
+   Control/AthenaKernel
+   Event/ByteStreamCnvSvcBase
+   Event/ByteStreamData
+   GaudiKernel
+   TileCalorimeter/TileEvent
+   TileCalorimeter/TileIdentifier
+   PRIVATE
+   Calorimeter/CaloDetDescr
+   Calorimeter/CaloIdentifier
+   Control/CLIDSvc
+   Control/SGTools
+   Control/StoreGate
+   Event/ByteStreamCnvSvc
+   TileCalorimeter/TileCalib/TileCalibBlobObjs
+   TileCalorimeter/TileConditions
+   TileCalorimeter/TileDetDescr
+   TileCalorimeter/TileL2Algs
+   TileCalorimeter/TileRecUtils )
 
 # External dependencies:
-find_package( tdaq-common )
+find_package( tdaq-common COMPONENTS eformat eformat_write )
 
 # Component(s) in the package:
 atlas_add_library( TileByteStreamLib
-                   src/Tile*.cxx
-                   PUBLIC_HEADERS TileByteStream
-                   INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamData GaudiKernel TileEvent TileIdentifier ByteStreamCnvSvcBaseLib ByteStreamData_test CaloDetDescrLib StoreGateLib SGtests ByteStreamCnvSvcLib TileConditionsLib TileL2AlgsLib TileRecUtilsLib
-                   PRIVATE_LINK_LIBRARIES CaloIdentifier SGTools TileCalibBlobObjs TileDetDescr )
+   TileByteStream/*.h TileByteStream/*.icc src/*.cxx
+   PUBLIC_HEADERS TileByteStream
+   INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+   LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel
+   ByteStreamData GaudiKernel TileEvent TileIdentifier ByteStreamCnvSvcBaseLib
+   CaloDetDescrLib StoreGateLib ByteStreamCnvSvcLib TileConditionsLib
+   TileL2AlgsLib TileRecUtilsLib
+   PRIVATE_LINK_LIBRARIES CaloIdentifier SGTools TileCalibBlobObjs
+   TileDetDescr )
 
 atlas_add_component( TileByteStream
-                     src/components/*.cxx
-                     INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel TileEvent TileIdentifier CaloDetDescrLib CaloIdentifier SGTools StoreGateLib SGtests ByteStreamCnvSvcLib TileCalibBlobObjs TileConditionsLib TileDetDescr TileL2AlgsLib TileRecUtilsLib TileByteStreamLib )
+   src/components/*.cxx
+   INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+   LINK_LIBRARIES TileByteStreamLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
-
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileBeamElemContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileBeamElemContByteStreamCnv.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileCellCont.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileCellCont.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigits2Bytes.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigits2Bytes.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileHid2RESrcID.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileHid2RESrcID.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamCnv.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamTool.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamTool.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamCnv.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamTool.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamTool.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Decoder.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Decoder.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Encoder.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Encoder.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes2.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes2.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes4.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes4.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamTool.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamTool.h
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/cmt/requirements b/TileCalorimeter/TileSvc/TileByteStream/cmt/requirements
old mode 100755
new mode 100644
index adde772d0130138ea4f35d8c6608d00c9c7155f5..59a5fdb72cb9c58846a383741484767f69045392
--- a/TileCalorimeter/TileSvc/TileByteStream/cmt/requirements
+++ b/TileCalorimeter/TileSvc/TileByteStream/cmt/requirements
@@ -32,3 +32,4 @@ end_private
 apply_pattern dual_use_library files="Tile*.cxx"
 
 apply_pattern declare_joboptions files="*.py"
+
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/PrepareTileBS_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/PrepareTileBS_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/ReadTileBS_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/ReadTileBS_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/ReadTileCellBS_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/ReadTileCellBS_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileByteStream_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/TileByteStream_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/WriteTileBS_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/WriteTileBS_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_ReadTileBS.py b/TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_ReadTileBS.py
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_WriteTileBS.py b/TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_WriteTileBS.py
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileBeamElemContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileBeamElemContByteStreamCnv.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileCellCont.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileCellCont.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigits2Bytes.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigits2Bytes.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamCnv.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamTool.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamTool.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes2.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes2.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes4.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes4.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamTool.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
old mode 100755
new mode 100644
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_load.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_load.cxx
old mode 100755
new mode 100644