diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/AthenaDBTestRecDataDict.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/AthenaDBTestRecDataDict.h
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/DetStoreDump.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/DetStoreDump.h
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecFolder.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecFolder.h
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecRead.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecRead.h
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/selection.xml b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/selection.xml
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements b/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements
old mode 100755
new mode 100644
index a7288cb9b9f4c6dff3629fafda88cfe6fb08337d..1956dd63e16bba7cb3f902700f1778ffec5a79c6
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements
@@ -42,7 +42,7 @@ apply_pattern poolcnv multChanTypes=" TestCoolRecPoolDataColl " files="-s=${Athe
 
 macro_append AthenaDBTestRecPoolCnv_dependencies " AthenaDBTestRecDataDict"
 
-application TestCoolRecWriter "-s=app *.cxx"
+application TestCoolRecWriter -s=app *.cxx
 macro_append TestCoolRecWriter_dependencies " AthenaDBTestRecLib"
 
 apply_pattern declare_joboptions files="*.py"
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/ATLR_CalibStream_1.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/ATLR_CalibStream_1.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1_nodcs.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1_nodcs.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_2.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_2.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_3.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_3.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_10c.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_10c.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_1c.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_1c.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/lar_calib.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/lar_calib.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib2.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib2.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/poolfile_test.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/poolfile_test.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc1301.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc1301.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc2001.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc2001.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/test128.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/test128.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/ti0c1301.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/ti0c1301.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/doc/mainpage.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/doc/mainpage.h
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/DetStoreDump_jobOptions.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/DetStoreDump_jobOptions.py
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/ReadRefDBExample.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/ReadRefDBExample.py
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/Read_refcond1.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/Read_refcond1.py
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/TestCoolRecExample.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/TestCoolRecExample.py
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/DBConnection.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/DBConnection.h
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/FolderInfo.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/FolderInfo.h
old mode 100755
new mode 100644
index bc2890613e4679aee528232a4d04fada3dc64b5b..4df38013b749edde4a32ec602b14dc4107b55912
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/FolderInfo.h
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/FolderInfo.h
@@ -11,7 +11,7 @@
 #include "DBConnection.h"
 #include "CoolKernel/IFolder.h"
 #include "CoolKernel/RecordSpecification.h"
-#include "PersistencySvc/Placement.h"
+#include "PersistentDataModel/Placement.h"
 
 class FolderInfo {
  public:
@@ -52,10 +52,10 @@ class FolderInfo {
   int size() const;
   int period() const;
   const std::string tag() const;
-  pool::Placement* poolplace() const;
+  Placement* poolplace() const;
 
   // const set function (on mutable datamember)
-  void setpoolplace(pool::Placement* const poolplace) const;
+  void setpoolplace(Placement* const poolplace) const;
   
   void printSpec(const cool::IRecordSpecification& catrspec) const;
 
@@ -74,7 +74,7 @@ class FolderInfo {
   std::string m_tag;
   bool m_paytable;
 
-  mutable pool::Placement* m_poolplace;
+  mutable Placement* m_poolplace;
 
 };
 
@@ -89,8 +89,8 @@ inline int FolderInfo::size() const {return m_size;}
 inline int FolderInfo::period() const {return m_period;}
 inline const std::string FolderInfo::tag() const {return m_tag;}
 
-inline pool::Placement* FolderInfo::poolplace() const {return m_poolplace;}
-inline void FolderInfo::setpoolplace(pool::Placement* const poolplace) const {
+inline Placement* FolderInfo::poolplace() const {return m_poolplace;}
+inline void FolderInfo::setpoolplace(Placement* const poolplace) const {
   m_poolplace=poolplace; }
 
 // helper functions
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/TestCoolRecWriter.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/TestCoolRecWriter.h
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/DBConnection.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/DBConnection.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/FolderInfo.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/FolderInfo.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/TestCoolRecWriter.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/TestCoolRecWriter.cxx
old mode 100755
new mode 100644
index 4660c6ef8ec3cf1212cd0e39fd3ce5a1a3b8023e..f98e8aa31d66aced4760a683d8b20d1b8e7050fb
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/TestCoolRecWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/TestCoolRecWriter.cxx
@@ -14,12 +14,12 @@
 #include <sstream>
 
 //POOL includes for POOL object write
+#include "PersistentDataModel/Placement.h"
 #include "PersistentDataModel/Token.h"
 #include "PersistencySvc/ISession.h"
 #include "PersistencySvc/IPersistencySvcFactory.h"
 #include "PersistencySvc/IPersistencySvc.h"
 #include "PersistencySvc/DatabaseConnectionPolicy.h"
-#include "PersistencySvc/Placement.h"
 #include "PersistencySvc/ITransaction.h"
 #include "StorageSvc/DbType.h"
 #include "StorageSvc/DbReflex.h"
@@ -199,7 +199,7 @@ int TestCoolRecWriter::fillDB() {
     m_nrun=1;
     std::cout << "Writing single IOV for all runs" << std::endl;
   }
-  pool::Placement* placement=0;
+  Placement* placement=0;
 
   for (int irun=m_run0; irun<m_run0+m_nrun; ++irun) {
     std::cout << "Fill database for run " << irun << 
@@ -243,14 +243,14 @@ int TestCoolRecWriter::fillDB() {
 	if (placement==0 || (m_poolmode & 1)) {
   	  std::cout << "Setup POOL for folder " << folderi->name() << 
 	    std::endl;
-    	  placement=new pool::Placement;
+    	  placement=new Placement;
   	  std::ostringstream sfile;
 	  sfile << m_poolstem;
           if (m_poolmode & 1) sfile << fseq;
 	  if (m_poolmode & 2) sfile << "_run" << irun;
           sfile << ".root";
 	  std::cout << "Setup new POOL file: " << sfile.str() << std::endl;
- 	  placement->setDatabase(sfile.str(),pool::DatabaseSpecification::PFN);
+ 	  placement->setFileName(sfile.str());
 	  placement->setTechnology(pool::ROOTTREE_StorageType.type());
 	  placement->setContainerName("POOLContainer_TestCoolRecPoolData");
 	}
@@ -375,7 +375,7 @@ int TestCoolRecWriter::fillDB() {
       const FolderInfo* folderi=*ifold;
       if (m_usepool && folderi->poolplace()!=0 && (m_poolmode &2)) {
 	if ((m_poolmode & 1) || first) {
-	  pool::Placement* placement=folderi->poolplace();
+	  Placement* placement=folderi->poolplace();
 	  delete placement;
 	  folderi->setpoolplace(0);
 	} else {
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/DetStoreDump.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/DetStoreDump.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecFolder.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecFolder.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecPoolData.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecPoolData.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecRead.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecRead.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/test/AthenaDBTestRec_TestConfig.xml b/AtlasTest/DatabaseTest/AthenaDBTestRec/test/AthenaDBTestRec_TestConfig.xml
old mode 100755
new mode 100644