diff --git a/EDM/calypso/AtlasTest/TestTools/CMakeLists.txt b/AtlasTest/TestTools/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/CMakeLists.txt
rename to AtlasTest/TestTools/CMakeLists.txt
diff --git a/EDM/calypso/AtlasTest/TestTools/TestTools/FLOATassert.h b/AtlasTest/TestTools/TestTools/FLOATassert.h
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/TestTools/FLOATassert.h
rename to AtlasTest/TestTools/TestTools/FLOATassert.h
diff --git a/EDM/calypso/AtlasTest/TestTools/TestTools/SGassert.h b/AtlasTest/TestTools/TestTools/SGassert.h
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/TestTools/SGassert.h
rename to AtlasTest/TestTools/TestTools/SGassert.h
diff --git a/EDM/calypso/AtlasTest/TestTools/TestTools/expect_exception.h b/AtlasTest/TestTools/TestTools/expect_exception.h
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/TestTools/expect_exception.h
rename to AtlasTest/TestTools/TestTools/expect_exception.h
diff --git a/EDM/calypso/AtlasTest/TestTools/TestTools/initGaudi.h b/AtlasTest/TestTools/TestTools/initGaudi.h
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/TestTools/initGaudi.h
rename to AtlasTest/TestTools/TestTools/initGaudi.h
diff --git a/EDM/calypso/AtlasTest/TestTools/TestTools/random.h b/AtlasTest/TestTools/TestTools/random.h
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/TestTools/random.h
rename to AtlasTest/TestTools/TestTools/random.h
diff --git a/EDM/calypso/AtlasTest/TestTools/cmt/Makefile.RootCore b/AtlasTest/TestTools/cmt/Makefile.RootCore
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/cmt/Makefile.RootCore
rename to AtlasTest/TestTools/cmt/Makefile.RootCore
diff --git a/EDM/calypso/AtlasTest/TestTools/cmt/requirements b/AtlasTest/TestTools/cmt/requirements
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/cmt/requirements
rename to AtlasTest/TestTools/cmt/requirements
diff --git a/EDM/calypso/AtlasTest/TestTools/doc/MainPage.h b/AtlasTest/TestTools/doc/MainPage.h
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/doc/MainPage.h
rename to AtlasTest/TestTools/doc/MainPage.h
diff --git a/EDM/calypso/AtlasTest/TestTools/python/__init__.py b/AtlasTest/TestTools/python/__init__.py
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/python/__init__.py
rename to AtlasTest/TestTools/python/__init__.py
diff --git a/EDM/calypso/AtlasTest/TestTools/python/iobench.py b/AtlasTest/TestTools/python/iobench.py
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/python/iobench.py
rename to AtlasTest/TestTools/python/iobench.py
diff --git a/EDM/calypso/AtlasTest/TestTools/scripts/nightlies/CppUnitSGServiceTestExample.sh b/AtlasTest/TestTools/scripts/nightlies/CppUnitSGServiceTestExample.sh
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/scripts/nightlies/CppUnitSGServiceTestExample.sh
rename to AtlasTest/TestTools/scripts/nightlies/CppUnitSGServiceTestExample.sh
diff --git a/EDM/calypso/AtlasTest/TestTools/scripts/nightlies/CppUnitTestExample.sh b/AtlasTest/TestTools/scripts/nightlies/CppUnitTestExample.sh
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/scripts/nightlies/CppUnitTestExample.sh
rename to AtlasTest/TestTools/scripts/nightlies/CppUnitTestExample.sh
diff --git a/EDM/calypso/AtlasTest/TestTools/scripts/nightlies/TestHelloWorld.sh b/AtlasTest/TestTools/scripts/nightlies/TestHelloWorld.sh
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/scripts/nightlies/TestHelloWorld.sh
rename to AtlasTest/TestTools/scripts/nightlies/TestHelloWorld.sh
diff --git a/EDM/calypso/AtlasTest/TestTools/scripts/nightlies/TestHelloWorld_XML.xml b/AtlasTest/TestTools/scripts/nightlies/TestHelloWorld_XML.xml
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/scripts/nightlies/TestHelloWorld_XML.xml
rename to AtlasTest/TestTools/scripts/nightlies/TestHelloWorld_XML.xml
diff --git a/EDM/calypso/AtlasTest/TestTools/scripts/nightlies/TestHelloWorld_script.xml b/AtlasTest/TestTools/scripts/nightlies/TestHelloWorld_script.xml
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/scripts/nightlies/TestHelloWorld_script.xml
rename to AtlasTest/TestTools/scripts/nightlies/TestHelloWorld_script.xml
diff --git a/EDM/calypso/AtlasTest/TestTools/share/IoAuditor_fragment.py b/AtlasTest/TestTools/share/IoAuditor_fragment.py
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/share/IoAuditor_fragment.py
rename to AtlasTest/TestTools/share/IoAuditor_fragment.py
diff --git a/EDM/calypso/AtlasTest/TestTools/share/post.sh b/AtlasTest/TestTools/share/post.sh
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/share/post.sh
rename to AtlasTest/TestTools/share/post.sh
diff --git a/EDM/calypso/AtlasTest/TestTools/share/runUnitTests.sh b/AtlasTest/TestTools/share/runUnitTests.sh
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/share/runUnitTests.sh
rename to AtlasTest/TestTools/share/runUnitTests.sh
diff --git a/EDM/calypso/AtlasTest/TestTools/src/initGaudi.cxx b/AtlasTest/TestTools/src/initGaudi.cxx
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/src/initGaudi.cxx
rename to AtlasTest/TestTools/src/initGaudi.cxx
diff --git a/EDM/calypso/AtlasTest/TestTools/test/test_iobench.py b/AtlasTest/TestTools/test/test_iobench.py
similarity index 100%
rename from EDM/calypso/AtlasTest/TestTools/test/test_iobench.py
rename to AtlasTest/TestTools/test/test_iobench.py
diff --git a/EDM/calypso/Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh b/Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh
similarity index 100%
rename from EDM/calypso/Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh
rename to Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh
diff --git a/EDM/calypso/Build/AtlasBuildScripts/README.md b/Build/AtlasBuildScripts/README.md
similarity index 100%
rename from EDM/calypso/Build/AtlasBuildScripts/README.md
rename to Build/AtlasBuildScripts/README.md
diff --git a/EDM/calypso/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh b/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
similarity index 100%
rename from EDM/calypso/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
rename to Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
diff --git a/EDM/calypso/Build/AtlasBuildScripts/build_Gaudi.sh b/Build/AtlasBuildScripts/build_Gaudi.sh
similarity index 100%
rename from EDM/calypso/Build/AtlasBuildScripts/build_Gaudi.sh
rename to Build/AtlasBuildScripts/build_Gaudi.sh
diff --git a/EDM/calypso/Build/AtlasBuildScripts/build_atlasexternals.sh b/Build/AtlasBuildScripts/build_atlasexternals.sh
similarity index 100%
rename from EDM/calypso/Build/AtlasBuildScripts/build_atlasexternals.sh
rename to Build/AtlasBuildScripts/build_atlasexternals.sh
diff --git a/EDM/calypso/Build/AtlasBuildScripts/checkout_Gaudi.sh b/Build/AtlasBuildScripts/checkout_Gaudi.sh
similarity index 100%
rename from EDM/calypso/Build/AtlasBuildScripts/checkout_Gaudi.sh
rename to Build/AtlasBuildScripts/checkout_Gaudi.sh
diff --git a/EDM/calypso/Build/AtlasBuildScripts/checkout_atlasexternals.sh b/Build/AtlasBuildScripts/checkout_atlasexternals.sh
similarity index 100%
rename from EDM/calypso/Build/AtlasBuildScripts/checkout_atlasexternals.sh
rename to Build/AtlasBuildScripts/checkout_atlasexternals.sh
diff --git a/EDM/calypso/Build/AtlasBuildScripts/copy_rpm_eos.sh b/Build/AtlasBuildScripts/copy_rpm_eos.sh
similarity index 100%
rename from EDM/calypso/Build/AtlasBuildScripts/copy_rpm_eos.sh
rename to Build/AtlasBuildScripts/copy_rpm_eos.sh
diff --git a/EDM/calypso/Build/AtlasBuildScripts/tag_build.sh b/Build/AtlasBuildScripts/tag_build.sh
similarity index 100%
rename from EDM/calypso/Build/AtlasBuildScripts/tag_build.sh
rename to Build/AtlasBuildScripts/tag_build.sh
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/Arena.h b/Control/AthAllocators/AthAllocators/Arena.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/Arena.h
rename to Control/AthAllocators/AthAllocators/Arena.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaAllocatorBase.h b/Control/AthAllocators/AthAllocators/ArenaAllocatorBase.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaAllocatorBase.h
rename to Control/AthAllocators/AthAllocators/ArenaAllocatorBase.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaAllocatorBase.icc b/Control/AthAllocators/AthAllocators/ArenaAllocatorBase.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaAllocatorBase.icc
rename to Control/AthAllocators/AthAllocators/ArenaAllocatorBase.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaAllocatorCreator.h b/Control/AthAllocators/AthAllocators/ArenaAllocatorCreator.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaAllocatorCreator.h
rename to Control/AthAllocators/AthAllocators/ArenaAllocatorCreator.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaAllocatorRegistry.h b/Control/AthAllocators/AthAllocators/ArenaAllocatorRegistry.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaAllocatorRegistry.h
rename to Control/AthAllocators/AthAllocators/ArenaAllocatorRegistry.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaBase.h b/Control/AthAllocators/AthAllocators/ArenaBase.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaBase.h
rename to Control/AthAllocators/AthAllocators/ArenaBase.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaBlock.h b/Control/AthAllocators/AthAllocators/ArenaBlock.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaBlock.h
rename to Control/AthAllocators/AthAllocators/ArenaBlock.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaBlock.icc b/Control/AthAllocators/AthAllocators/ArenaBlock.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaBlock.icc
rename to Control/AthAllocators/AthAllocators/ArenaBlock.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaBlockAllocatorBase.h b/Control/AthAllocators/AthAllocators/ArenaBlockAllocatorBase.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaBlockAllocatorBase.h
rename to Control/AthAllocators/AthAllocators/ArenaBlockAllocatorBase.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaCachingHandle.h b/Control/AthAllocators/AthAllocators/ArenaCachingHandle.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaCachingHandle.h
rename to Control/AthAllocators/AthAllocators/ArenaCachingHandle.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaCachingHandle.icc b/Control/AthAllocators/AthAllocators/ArenaCachingHandle.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaCachingHandle.icc
rename to Control/AthAllocators/AthAllocators/ArenaCachingHandle.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandle.h b/Control/AthAllocators/AthAllocators/ArenaHandle.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandle.h
rename to Control/AthAllocators/AthAllocators/ArenaHandle.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandle.icc b/Control/AthAllocators/AthAllocators/ArenaHandle.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandle.icc
rename to Control/AthAllocators/AthAllocators/ArenaHandle.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBase.h b/Control/AthAllocators/AthAllocators/ArenaHandleBase.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBase.h
rename to Control/AthAllocators/AthAllocators/ArenaHandleBase.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBase.icc b/Control/AthAllocators/AthAllocators/ArenaHandleBase.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBase.icc
rename to Control/AthAllocators/AthAllocators/ArenaHandleBase.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBaseAllocT.h b/Control/AthAllocators/AthAllocators/ArenaHandleBaseAllocT.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBaseAllocT.h
rename to Control/AthAllocators/AthAllocators/ArenaHandleBaseAllocT.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBaseAllocT.icc b/Control/AthAllocators/AthAllocators/ArenaHandleBaseAllocT.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBaseAllocT.icc
rename to Control/AthAllocators/AthAllocators/ArenaHandleBaseAllocT.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBaseT.h b/Control/AthAllocators/AthAllocators/ArenaHandleBaseT.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBaseT.h
rename to Control/AthAllocators/AthAllocators/ArenaHandleBaseT.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBaseT.icc b/Control/AthAllocators/AthAllocators/ArenaHandleBaseT.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHandleBaseT.icc
rename to Control/AthAllocators/AthAllocators/ArenaHandleBaseT.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeader.h b/Control/AthAllocators/AthAllocators/ArenaHeader.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeader.h
rename to Control/AthAllocators/AthAllocators/ArenaHeader.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeader.icc b/Control/AthAllocators/AthAllocators/ArenaHeader.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeader.icc
rename to Control/AthAllocators/AthAllocators/ArenaHeader.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.h b/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.h
rename to Control/AthAllocators/AthAllocators/ArenaHeapAllocator.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.icc b/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.icc
rename to Control/AthAllocators/AthAllocators/ArenaHeapAllocator.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeapSTLAllocator.h b/Control/AthAllocators/AthAllocators/ArenaHeapSTLAllocator.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeapSTLAllocator.h
rename to Control/AthAllocators/AthAllocators/ArenaHeapSTLAllocator.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeapSTLAllocator.icc b/Control/AthAllocators/AthAllocators/ArenaHeapSTLAllocator.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaHeapSTLAllocator.icc
rename to Control/AthAllocators/AthAllocators/ArenaHeapSTLAllocator.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.h b/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.h
rename to Control/AthAllocators/AthAllocators/ArenaPoolAllocator.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.icc b/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.icc
rename to Control/AthAllocators/AthAllocators/ArenaPoolAllocator.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.h b/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.h
rename to Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.icc b/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.icc
rename to Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaSTLAllocator.h b/Control/AthAllocators/AthAllocators/ArenaSTLAllocator.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaSTLAllocator.h
rename to Control/AthAllocators/AthAllocators/ArenaSTLAllocator.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaSTLAllocator.icc b/Control/AthAllocators/AthAllocators/ArenaSTLAllocator.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaSTLAllocator.icc
rename to Control/AthAllocators/AthAllocators/ArenaSTLAllocator.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaSharedHeapSTLAllocator.h b/Control/AthAllocators/AthAllocators/ArenaSharedHeapSTLAllocator.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaSharedHeapSTLAllocator.h
rename to Control/AthAllocators/AthAllocators/ArenaSharedHeapSTLAllocator.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/ArenaSharedHeapSTLAllocator.icc b/Control/AthAllocators/AthAllocators/ArenaSharedHeapSTLAllocator.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/ArenaSharedHeapSTLAllocator.icc
rename to Control/AthAllocators/AthAllocators/ArenaSharedHeapSTLAllocator.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/AthAllocatorsDict.h b/Control/AthAllocators/AthAllocators/AthAllocatorsDict.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/AthAllocatorsDict.h
rename to Control/AthAllocators/AthAllocators/AthAllocatorsDict.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/DataPool.h b/Control/AthAllocators/AthAllocators/DataPool.h
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/DataPool.h
rename to Control/AthAllocators/AthAllocators/DataPool.h
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/DataPool.icc b/Control/AthAllocators/AthAllocators/DataPool.icc
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/DataPool.icc
rename to Control/AthAllocators/AthAllocators/DataPool.icc
diff --git a/EDM/calypso/Control/AthAllocators/AthAllocators/selection.xml b/Control/AthAllocators/AthAllocators/selection.xml
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/AthAllocators/selection.xml
rename to Control/AthAllocators/AthAllocators/selection.xml
diff --git a/EDM/calypso/Control/AthAllocators/CMakeLists.txt b/Control/AthAllocators/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/CMakeLists.txt
rename to Control/AthAllocators/CMakeLists.txt
diff --git a/EDM/calypso/Control/AthAllocators/cmt/requirements b/Control/AthAllocators/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/cmt/requirements
rename to Control/AthAllocators/cmt/requirements
diff --git a/EDM/calypso/Control/AthAllocators/ispellwords b/Control/AthAllocators/ispellwords
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/ispellwords
rename to Control/AthAllocators/ispellwords
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaAllocatorBase_test.ref b/Control/AthAllocators/share/ArenaAllocatorBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaAllocatorBase_test.ref
rename to Control/AthAllocators/share/ArenaAllocatorBase_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaAllocatorCreator_test.ref b/Control/AthAllocators/share/ArenaAllocatorCreator_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaAllocatorCreator_test.ref
rename to Control/AthAllocators/share/ArenaAllocatorCreator_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaAllocatorRegistry_test.ref b/Control/AthAllocators/share/ArenaAllocatorRegistry_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaAllocatorRegistry_test.ref
rename to Control/AthAllocators/share/ArenaAllocatorRegistry_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaBase_test.ref b/Control/AthAllocators/share/ArenaBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaBase_test.ref
rename to Control/AthAllocators/share/ArenaBase_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaBlockAllocatorBase_test.ref b/Control/AthAllocators/share/ArenaBlockAllocatorBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaBlockAllocatorBase_test.ref
rename to Control/AthAllocators/share/ArenaBlockAllocatorBase_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaBlock_test.ref b/Control/AthAllocators/share/ArenaBlock_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaBlock_test.ref
rename to Control/AthAllocators/share/ArenaBlock_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaCachingHandle_test.ref b/Control/AthAllocators/share/ArenaCachingHandle_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaCachingHandle_test.ref
rename to Control/AthAllocators/share/ArenaCachingHandle_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaHandleBaseAllocT_test.ref b/Control/AthAllocators/share/ArenaHandleBaseAllocT_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaHandleBaseAllocT_test.ref
rename to Control/AthAllocators/share/ArenaHandleBaseAllocT_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaHandleBaseT_test.ref b/Control/AthAllocators/share/ArenaHandleBaseT_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaHandleBaseT_test.ref
rename to Control/AthAllocators/share/ArenaHandleBaseT_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaHandleBase_test.ref b/Control/AthAllocators/share/ArenaHandleBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaHandleBase_test.ref
rename to Control/AthAllocators/share/ArenaHandleBase_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaHandle_test.ref b/Control/AthAllocators/share/ArenaHandle_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaHandle_test.ref
rename to Control/AthAllocators/share/ArenaHandle_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaHeader_test.ref b/Control/AthAllocators/share/ArenaHeader_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaHeader_test.ref
rename to Control/AthAllocators/share/ArenaHeader_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaHeapAllocator_test.ref b/Control/AthAllocators/share/ArenaHeapAllocator_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaHeapAllocator_test.ref
rename to Control/AthAllocators/share/ArenaHeapAllocator_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaHeapSTLAllocator_test.ref b/Control/AthAllocators/share/ArenaHeapSTLAllocator_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaHeapSTLAllocator_test.ref
rename to Control/AthAllocators/share/ArenaHeapSTLAllocator_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaPoolAllocator_test.ref b/Control/AthAllocators/share/ArenaPoolAllocator_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaPoolAllocator_test.ref
rename to Control/AthAllocators/share/ArenaPoolAllocator_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaPoolSTLAllocator_test.ref b/Control/AthAllocators/share/ArenaPoolSTLAllocator_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaPoolSTLAllocator_test.ref
rename to Control/AthAllocators/share/ArenaPoolSTLAllocator_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/ArenaSharedHeapSTLAllocator_test.ref b/Control/AthAllocators/share/ArenaSharedHeapSTLAllocator_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/ArenaSharedHeapSTLAllocator_test.ref
rename to Control/AthAllocators/share/ArenaSharedHeapSTLAllocator_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/Arena_test.ref b/Control/AthAllocators/share/Arena_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/Arena_test.ref
rename to Control/AthAllocators/share/Arena_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/DataPool_test.ref b/Control/AthAllocators/share/DataPool_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/DataPool_test.ref
rename to Control/AthAllocators/share/DataPool_test.ref
diff --git a/EDM/calypso/Control/AthAllocators/share/DataPool_test.txt b/Control/AthAllocators/share/DataPool_test.txt
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/share/DataPool_test.txt
rename to Control/AthAllocators/share/DataPool_test.txt
diff --git a/EDM/calypso/Control/AthAllocators/src/Arena.cxx b/Control/AthAllocators/src/Arena.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/Arena.cxx
rename to Control/AthAllocators/src/Arena.cxx
diff --git a/EDM/calypso/Control/AthAllocators/src/ArenaAllocatorBase.cxx b/Control/AthAllocators/src/ArenaAllocatorBase.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/ArenaAllocatorBase.cxx
rename to Control/AthAllocators/src/ArenaAllocatorBase.cxx
diff --git a/EDM/calypso/Control/AthAllocators/src/ArenaAllocatorRegistry.cxx b/Control/AthAllocators/src/ArenaAllocatorRegistry.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/ArenaAllocatorRegistry.cxx
rename to Control/AthAllocators/src/ArenaAllocatorRegistry.cxx
diff --git a/EDM/calypso/Control/AthAllocators/src/ArenaBlock.cxx b/Control/AthAllocators/src/ArenaBlock.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/ArenaBlock.cxx
rename to Control/AthAllocators/src/ArenaBlock.cxx
diff --git a/EDM/calypso/Control/AthAllocators/src/ArenaBlockAllocatorBase.cxx b/Control/AthAllocators/src/ArenaBlockAllocatorBase.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/ArenaBlockAllocatorBase.cxx
rename to Control/AthAllocators/src/ArenaBlockAllocatorBase.cxx
diff --git a/EDM/calypso/Control/AthAllocators/src/ArenaHandleBase.cxx b/Control/AthAllocators/src/ArenaHandleBase.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/ArenaHandleBase.cxx
rename to Control/AthAllocators/src/ArenaHandleBase.cxx
diff --git a/EDM/calypso/Control/AthAllocators/src/ArenaHeader.cxx b/Control/AthAllocators/src/ArenaHeader.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/ArenaHeader.cxx
rename to Control/AthAllocators/src/ArenaHeader.cxx
diff --git a/EDM/calypso/Control/AthAllocators/src/ArenaHeapAllocator.cxx b/Control/AthAllocators/src/ArenaHeapAllocator.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/ArenaHeapAllocator.cxx
rename to Control/AthAllocators/src/ArenaHeapAllocator.cxx
diff --git a/EDM/calypso/Control/AthAllocators/src/ArenaPoolAllocator.cxx b/Control/AthAllocators/src/ArenaPoolAllocator.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/ArenaPoolAllocator.cxx
rename to Control/AthAllocators/src/ArenaPoolAllocator.cxx
diff --git a/EDM/calypso/Control/AthAllocators/src/ArenaSharedHeapSTLAllocator.cxx b/Control/AthAllocators/src/ArenaSharedHeapSTLAllocator.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/src/ArenaSharedHeapSTLAllocator.cxx
rename to Control/AthAllocators/src/ArenaSharedHeapSTLAllocator.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaAllocatorBase_test.cxx b/Control/AthAllocators/test/ArenaAllocatorBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaAllocatorBase_test.cxx
rename to Control/AthAllocators/test/ArenaAllocatorBase_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaAllocatorCreator_test.cxx b/Control/AthAllocators/test/ArenaAllocatorCreator_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaAllocatorCreator_test.cxx
rename to Control/AthAllocators/test/ArenaAllocatorCreator_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaAllocatorRegistry_test.cxx b/Control/AthAllocators/test/ArenaAllocatorRegistry_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaAllocatorRegistry_test.cxx
rename to Control/AthAllocators/test/ArenaAllocatorRegistry_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaBase_test.cxx b/Control/AthAllocators/test/ArenaBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaBase_test.cxx
rename to Control/AthAllocators/test/ArenaBase_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaBlockAllocatorBase_test.cxx b/Control/AthAllocators/test/ArenaBlockAllocatorBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaBlockAllocatorBase_test.cxx
rename to Control/AthAllocators/test/ArenaBlockAllocatorBase_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaBlock_test.cxx b/Control/AthAllocators/test/ArenaBlock_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaBlock_test.cxx
rename to Control/AthAllocators/test/ArenaBlock_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaCachingHandle_test.cxx b/Control/AthAllocators/test/ArenaCachingHandle_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaCachingHandle_test.cxx
rename to Control/AthAllocators/test/ArenaCachingHandle_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaHandleBaseAllocT_test.cxx b/Control/AthAllocators/test/ArenaHandleBaseAllocT_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaHandleBaseAllocT_test.cxx
rename to Control/AthAllocators/test/ArenaHandleBaseAllocT_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaHandleBaseT_test.cxx b/Control/AthAllocators/test/ArenaHandleBaseT_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaHandleBaseT_test.cxx
rename to Control/AthAllocators/test/ArenaHandleBaseT_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaHandleBase_test.cxx b/Control/AthAllocators/test/ArenaHandleBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaHandleBase_test.cxx
rename to Control/AthAllocators/test/ArenaHandleBase_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaHandle_test.cxx b/Control/AthAllocators/test/ArenaHandle_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaHandle_test.cxx
rename to Control/AthAllocators/test/ArenaHandle_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaHeader_test.cxx b/Control/AthAllocators/test/ArenaHeader_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaHeader_test.cxx
rename to Control/AthAllocators/test/ArenaHeader_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaHeapAllocator_test.cxx b/Control/AthAllocators/test/ArenaHeapAllocator_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaHeapAllocator_test.cxx
rename to Control/AthAllocators/test/ArenaHeapAllocator_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaHeapSTLAllocator_test.cxx b/Control/AthAllocators/test/ArenaHeapSTLAllocator_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaHeapSTLAllocator_test.cxx
rename to Control/AthAllocators/test/ArenaHeapSTLAllocator_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaPoolAllocator_test.cxx b/Control/AthAllocators/test/ArenaPoolAllocator_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaPoolAllocator_test.cxx
rename to Control/AthAllocators/test/ArenaPoolAllocator_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaPoolSTLAllocator_test.cxx b/Control/AthAllocators/test/ArenaPoolSTLAllocator_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaPoolSTLAllocator_test.cxx
rename to Control/AthAllocators/test/ArenaPoolSTLAllocator_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/ArenaSharedHeapSTLAllocator_test.cxx b/Control/AthAllocators/test/ArenaSharedHeapSTLAllocator_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/ArenaSharedHeapSTLAllocator_test.cxx
rename to Control/AthAllocators/test/ArenaSharedHeapSTLAllocator_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/Arena_test.cxx b/Control/AthAllocators/test/Arena_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/Arena_test.cxx
rename to Control/AthAllocators/test/Arena_test.cxx
diff --git a/EDM/calypso/Control/AthAllocators/test/AthAllocators.xml b/Control/AthAllocators/test/AthAllocators.xml
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/AthAllocators.xml
rename to Control/AthAllocators/test/AthAllocators.xml
diff --git a/EDM/calypso/Control/AthAllocators/test/DataPool_test.cxx b/Control/AthAllocators/test/DataPool_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthAllocators/test/DataPool_test.cxx
rename to Control/AthAllocators/test/DataPool_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AthContainersDict.h b/Control/AthContainers/AthContainers/AthContainersDict.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AthContainersDict.h
rename to Control/AthContainers/AthContainers/AthContainersDict.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxElement.h b/Control/AthContainers/AthContainers/AuxElement.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxElement.h
rename to Control/AthContainers/AthContainers/AuxElement.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxElement.icc b/Control/AthContainers/AthContainers/AuxElement.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxElement.icc
rename to Control/AthContainers/AthContainers/AuxElement.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxElementComplete.h b/Control/AthContainers/AthContainers/AuxElementComplete.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxElementComplete.h
rename to Control/AthContainers/AthContainers/AuxElementComplete.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxElementComplete.icc b/Control/AthContainers/AthContainers/AuxElementComplete.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxElementComplete.icc
rename to Control/AthContainers/AthContainers/AuxElementComplete.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxStoreInternal.h b/Control/AthContainers/AthContainers/AuxStoreInternal.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxStoreInternal.h
rename to Control/AthContainers/AthContainers/AuxStoreInternal.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxStoreStandalone.h b/Control/AthContainers/AthContainers/AuxStoreStandalone.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxStoreStandalone.h
rename to Control/AthContainers/AthContainers/AuxStoreStandalone.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxTypeRegistry.h b/Control/AthContainers/AthContainers/AuxTypeRegistry.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxTypeRegistry.h
rename to Control/AthContainers/AthContainers/AuxTypeRegistry.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxTypeRegistry.icc b/Control/AthContainers/AthContainers/AuxTypeRegistry.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxTypeRegistry.icc
rename to Control/AthContainers/AthContainers/AuxTypeRegistry.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxVectorBase.h b/Control/AthContainers/AthContainers/AuxVectorBase.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxVectorBase.h
rename to Control/AthContainers/AthContainers/AuxVectorBase.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxVectorBase.icc b/Control/AthContainers/AthContainers/AuxVectorBase.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxVectorBase.icc
rename to Control/AthContainers/AthContainers/AuxVectorBase.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxVectorData.h b/Control/AthContainers/AthContainers/AuxVectorData.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxVectorData.h
rename to Control/AthContainers/AthContainers/AuxVectorData.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/AuxVectorData.icc b/Control/AthContainers/AthContainers/AuxVectorData.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/AuxVectorData.icc
rename to Control/AthContainers/AthContainers/AuxVectorData.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ClassName.h b/Control/AthContainers/AthContainers/ClassName.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ClassName.h
rename to Control/AthContainers/AthContainers/ClassName.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ClassName.icc b/Control/AthContainers/AthContainers/ClassName.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ClassName.icc
rename to Control/AthContainers/AthContainers/ClassName.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ConstDataList.h b/Control/AthContainers/AthContainers/ConstDataList.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ConstDataList.h
rename to Control/AthContainers/AthContainers/ConstDataList.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ConstDataList.icc b/Control/AthContainers/AthContainers/ConstDataList.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ConstDataList.icc
rename to Control/AthContainers/AthContainers/ConstDataList.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ConstDataVector.h b/Control/AthContainers/AthContainers/ConstDataVector.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ConstDataVector.h
rename to Control/AthContainers/AthContainers/ConstDataVector.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ConstDataVector.icc b/Control/AthContainers/AthContainers/ConstDataVector.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ConstDataVector.icc
rename to Control/AthContainers/AthContainers/ConstDataVector.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/DataList.h b/Control/AthContainers/AthContainers/DataList.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/DataList.h
rename to Control/AthContainers/AthContainers/DataList.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/DataList.icc b/Control/AthContainers/AthContainers/DataList.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/DataList.icc
rename to Control/AthContainers/AthContainers/DataList.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/DataVector.h b/Control/AthContainers/AthContainers/DataVector.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/DataVector.h
rename to Control/AthContainers/AthContainers/DataVector.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/DataVector.icc b/Control/AthContainers/AthContainers/DataVector.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/DataVector.icc
rename to Control/AthContainers/AthContainers/DataVector.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/IndexTrackingPolicy.h b/Control/AthContainers/AthContainers/IndexTrackingPolicy.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/IndexTrackingPolicy.h
rename to Control/AthContainers/AthContainers/IndexTrackingPolicy.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/OwnershipPolicy.h b/Control/AthContainers/AthContainers/OwnershipPolicy.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/OwnershipPolicy.h
rename to Control/AthContainers/AthContainers/OwnershipPolicy.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/PackedContainer.h b/Control/AthContainers/AthContainers/PackedContainer.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/PackedContainer.h
rename to Control/AthContainers/AthContainers/PackedContainer.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/PackedContainer.icc b/Control/AthContainers/AthContainers/PackedContainer.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/PackedContainer.icc
rename to Control/AthContainers/AthContainers/PackedContainer.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/PackedConverter.h b/Control/AthContainers/AthContainers/PackedConverter.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/PackedConverter.h
rename to Control/AthContainers/AthContainers/PackedConverter.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/PackedConverter.icc b/Control/AthContainers/AthContainers/PackedConverter.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/PackedConverter.icc
rename to Control/AthContainers/AthContainers/PackedConverter.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/PackedParameters.h b/Control/AthContainers/AthContainers/PackedParameters.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/PackedParameters.h
rename to Control/AthContainers/AthContainers/PackedParameters.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/PackedParameters.icc b/Control/AthContainers/AthContainers/PackedParameters.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/PackedParameters.icc
rename to Control/AthContainers/AthContainers/PackedParameters.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/UserDataStore.h b/Control/AthContainers/AthContainers/UserDataStore.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/UserDataStore.h
rename to Control/AthContainers/AthContainers/UserDataStore.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ViewVector.h b/Control/AthContainers/AthContainers/ViewVector.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ViewVector.h
rename to Control/AthContainers/AthContainers/ViewVector.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ViewVector.icc b/Control/AthContainers/AthContainers/ViewVector.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ViewVector.icc
rename to Control/AthContainers/AthContainers/ViewVector.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ViewVectorBase.h b/Control/AthContainers/AthContainers/ViewVectorBase.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ViewVectorBase.h
rename to Control/AthContainers/AthContainers/ViewVectorBase.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/ViewVectorBase.icc b/Control/AthContainers/AthContainers/ViewVectorBase.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/ViewVectorBase.icc
rename to Control/AthContainers/AthContainers/ViewVectorBase.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/dataVectorAsELV.h b/Control/AthContainers/AthContainers/dataVectorAsELV.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/dataVectorAsELV.h
rename to Control/AthContainers/AthContainers/dataVectorAsELV.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/debug.h b/Control/AthContainers/AthContainers/debug.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/debug.h
rename to Control/AthContainers/AthContainers/debug.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/exceptions.h b/Control/AthContainers/AthContainers/exceptions.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/exceptions.h
rename to Control/AthContainers/AthContainers/exceptions.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/normalizedTypeinfoName.h b/Control/AthContainers/AthContainers/normalizedTypeinfoName.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/normalizedTypeinfoName.h
rename to Control/AthContainers/AthContainers/normalizedTypeinfoName.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/selection.xml b/Control/AthContainers/AthContainers/selection.xml
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/selection.xml
rename to Control/AthContainers/AthContainers/selection.xml
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/ATHCONTAINERS_ASSERT.h b/Control/AthContainers/AthContainers/tools/ATHCONTAINERS_ASSERT.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/ATHCONTAINERS_ASSERT.h
rename to Control/AthContainers/AthContainers/tools/ATHCONTAINERS_ASSERT.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/AuxDataTraits.h b/Control/AthContainers/AthContainers/tools/AuxDataTraits.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/AuxDataTraits.h
rename to Control/AthContainers/AthContainers/tools/AuxDataTraits.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/AuxTypeVector.h b/Control/AthContainers/AthContainers/tools/AuxTypeVector.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/AuxTypeVector.h
rename to Control/AthContainers/AthContainers/tools/AuxTypeVector.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/AuxTypeVector.icc b/Control/AthContainers/AthContainers/tools/AuxTypeVector.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/AuxTypeVector.icc
rename to Control/AthContainers/AthContainers/tools/AuxTypeVector.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/AuxTypeVectorFactory.h b/Control/AthContainers/AthContainers/tools/AuxTypeVectorFactory.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/AuxTypeVectorFactory.h
rename to Control/AthContainers/AthContainers/tools/AuxTypeVectorFactory.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/AuxTypeVectorFactory.icc b/Control/AthContainers/AthContainers/tools/AuxTypeVectorFactory.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/AuxTypeVectorFactory.icc
rename to Control/AthContainers/AthContainers/tools/AuxTypeVectorFactory.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/ClassID.h b/Control/AthContainers/AthContainers/tools/ClassID.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/ClassID.h
rename to Control/AthContainers/AthContainers/tools/ClassID.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/CompareAndPrint.h b/Control/AthContainers/AthContainers/tools/CompareAndPrint.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/CompareAndPrint.h
rename to Control/AthContainers/AthContainers/tools/CompareAndPrint.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/CurrentEventStore.h b/Control/AthContainers/AthContainers/tools/CurrentEventStore.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/CurrentEventStore.h
rename to Control/AthContainers/AthContainers/tools/CurrentEventStore.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVLCast.h b/Control/AthContainers/AthContainers/tools/DVLCast.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVLCast.h
rename to Control/AthContainers/AthContainers/tools/DVLCast.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVLDataBucket.h b/Control/AthContainers/AthContainers/tools/DVLDataBucket.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVLDataBucket.h
rename to Control/AthContainers/AthContainers/tools/DVLDataBucket.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVLDataBucket.icc b/Control/AthContainers/AthContainers/tools/DVLDataBucket.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVLDataBucket.icc
rename to Control/AthContainers/AthContainers/tools/DVLDataBucket.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVLEltBaseInfo.icc b/Control/AthContainers/AthContainers/tools/DVLEltBaseInfo.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVLEltBaseInfo.icc
rename to Control/AthContainers/AthContainers/tools/DVLEltBaseInfo.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVLInfo.h b/Control/AthContainers/AthContainers/tools/DVLInfo.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVLInfo.h
rename to Control/AthContainers/AthContainers/tools/DVLInfo.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVLInfo.icc b/Control/AthContainers/AthContainers/tools/DVLInfo.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVLInfo.icc
rename to Control/AthContainers/AthContainers/tools/DVLInfo.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVLIterator.h b/Control/AthContainers/AthContainers/tools/DVLIterator.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVLIterator.h
rename to Control/AthContainers/AthContainers/tools/DVLIterator.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVLNoBase.h b/Control/AthContainers/AthContainers/tools/DVLNoBase.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVLNoBase.h
rename to Control/AthContainers/AthContainers/tools/DVLNoBase.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVL_algorithms.h b/Control/AthContainers/AthContainers/tools/DVL_algorithms.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVL_algorithms.h
rename to Control/AthContainers/AthContainers/tools/DVL_algorithms.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVL_algorithms.icc b/Control/AthContainers/AthContainers/tools/DVL_algorithms.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVL_algorithms.icc
rename to Control/AthContainers/AthContainers/tools/DVL_algorithms.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/DVL_iter_swap.h b/Control/AthContainers/AthContainers/tools/DVL_iter_swap.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/DVL_iter_swap.h
rename to Control/AthContainers/AthContainers/tools/DVL_iter_swap.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/ElementProxy.h b/Control/AthContainers/AthContainers/tools/ElementProxy.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/ElementProxy.h
rename to Control/AthContainers/AthContainers/tools/ElementProxy.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/ElementProxy.icc b/Control/AthContainers/AthContainers/tools/ElementProxy.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/ElementProxy.icc
rename to Control/AthContainers/AthContainers/tools/ElementProxy.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/IsMostDerivedFlag.h b/Control/AthContainers/AthContainers/tools/IsMostDerivedFlag.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/IsMostDerivedFlag.h
rename to Control/AthContainers/AthContainers/tools/IsMostDerivedFlag.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/UDSLabelHashTable.h b/Control/AthContainers/AthContainers/tools/UDSLabelHashTable.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/UDSLabelHashTable.h
rename to Control/AthContainers/AthContainers/tools/UDSLabelHashTable.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/assume.h b/Control/AthContainers/AthContainers/tools/assume.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/assume.h
rename to Control/AthContainers/AthContainers/tools/assume.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/copyAuxStoreThinned.h b/Control/AthContainers/AthContainers/tools/copyAuxStoreThinned.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/copyAuxStoreThinned.h
rename to Control/AthContainers/AthContainers/tools/copyAuxStoreThinned.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/copyThinned.h b/Control/AthContainers/AthContainers/tools/copyThinned.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/copyThinned.h
rename to Control/AthContainers/AthContainers/tools/copyThinned.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/copyThinned.icc b/Control/AthContainers/AthContainers/tools/copyThinned.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/copyThinned.icc
rename to Control/AthContainers/AthContainers/tools/copyThinned.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/error.h b/Control/AthContainers/AthContainers/tools/error.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/error.h
rename to Control/AthContainers/AthContainers/tools/error.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/foreach.h b/Control/AthContainers/AthContainers/tools/foreach.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/foreach.h
rename to Control/AthContainers/AthContainers/tools/foreach.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/getThinnedFlags.h b/Control/AthContainers/AthContainers/tools/getThinnedFlags.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/getThinnedFlags.h
rename to Control/AthContainers/AthContainers/tools/getThinnedFlags.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/getThinnedFlags.icc b/Control/AthContainers/AthContainers/tools/getThinnedFlags.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/getThinnedFlags.icc
rename to Control/AthContainers/AthContainers/tools/getThinnedFlags.icc
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/likely.h b/Control/AthContainers/AthContainers/tools/likely.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/likely.h
rename to Control/AthContainers/AthContainers/tools/likely.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/threading.h b/Control/AthContainers/AthContainers/tools/threading.h
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/threading.h
rename to Control/AthContainers/AthContainers/tools/threading.h
diff --git a/EDM/calypso/Control/AthContainers/AthContainers/tools/threading.icc b/Control/AthContainers/AthContainers/tools/threading.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/AthContainers/tools/threading.icc
rename to Control/AthContainers/AthContainers/tools/threading.icc
diff --git a/EDM/calypso/Control/AthContainers/CMakeLists.txt b/Control/AthContainers/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/AthContainers/CMakeLists.txt
rename to Control/AthContainers/CMakeLists.txt
diff --git a/EDM/calypso/Control/AthContainers/Root/AuxElement.cxx b/Control/AthContainers/Root/AuxElement.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/AuxElement.cxx
rename to Control/AthContainers/Root/AuxElement.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/AuxStoreInternal.cxx b/Control/AthContainers/Root/AuxStoreInternal.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/AuxStoreInternal.cxx
rename to Control/AthContainers/Root/AuxStoreInternal.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/AuxStoreStandalone.cxx b/Control/AthContainers/Root/AuxStoreStandalone.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/AuxStoreStandalone.cxx
rename to Control/AthContainers/Root/AuxStoreStandalone.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/AuxTypeRegistry.cxx b/Control/AthContainers/Root/AuxTypeRegistry.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/AuxTypeRegistry.cxx
rename to Control/AthContainers/Root/AuxTypeRegistry.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/AuxVectorBase.cxx b/Control/AthContainers/Root/AuxVectorBase.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/AuxVectorBase.cxx
rename to Control/AthContainers/Root/AuxVectorBase.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/AuxVectorData.cxx b/Control/AthContainers/Root/AuxVectorData.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/AuxVectorData.cxx
rename to Control/AthContainers/Root/AuxVectorData.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/CompareAndPrint.cxx b/Control/AthContainers/Root/CompareAndPrint.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/CompareAndPrint.cxx
rename to Control/AthContainers/Root/CompareAndPrint.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/DVLInfo.cxx b/Control/AthContainers/Root/DVLInfo.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/DVLInfo.cxx
rename to Control/AthContainers/Root/DVLInfo.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/PackedConverter.cxx b/Control/AthContainers/Root/PackedConverter.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/PackedConverter.cxx
rename to Control/AthContainers/Root/PackedConverter.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/PackedParameters.cxx b/Control/AthContainers/Root/PackedParameters.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/PackedParameters.cxx
rename to Control/AthContainers/Root/PackedParameters.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/UDSLabelHashTable.cxx b/Control/AthContainers/Root/UDSLabelHashTable.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/UDSLabelHashTable.cxx
rename to Control/AthContainers/Root/UDSLabelHashTable.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/UserDataStore.cxx b/Control/AthContainers/Root/UserDataStore.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/UserDataStore.cxx
rename to Control/AthContainers/Root/UserDataStore.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/debug.cxx b/Control/AthContainers/Root/debug.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/debug.cxx
rename to Control/AthContainers/Root/debug.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/dict/PackedContainerStreamer.cxx b/Control/AthContainers/Root/dict/PackedContainerStreamer.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/dict/PackedContainerStreamer.cxx
rename to Control/AthContainers/Root/dict/PackedContainerStreamer.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/dict/ViewVectorBaseStreamer.cxx b/Control/AthContainers/Root/dict/ViewVectorBaseStreamer.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/dict/ViewVectorBaseStreamer.cxx
rename to Control/AthContainers/Root/dict/ViewVectorBaseStreamer.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/error.cxx b/Control/AthContainers/Root/error.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/error.cxx
rename to Control/AthContainers/Root/error.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/exceptions.cxx b/Control/AthContainers/Root/exceptions.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/exceptions.cxx
rename to Control/AthContainers/Root/exceptions.cxx
diff --git a/EDM/calypso/Control/AthContainers/Root/normalizedTypeinfoName.cxx b/Control/AthContainers/Root/normalizedTypeinfoName.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/Root/normalizedTypeinfoName.cxx
rename to Control/AthContainers/Root/normalizedTypeinfoName.cxx
diff --git a/EDM/calypso/Control/AthContainers/cmt/Makefile.RootCore b/Control/AthContainers/cmt/Makefile.RootCore
similarity index 100%
rename from EDM/calypso/Control/AthContainers/cmt/Makefile.RootCore
rename to Control/AthContainers/cmt/Makefile.RootCore
diff --git a/EDM/calypso/Control/AthContainers/cmt/requirements b/Control/AthContainers/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/AthContainers/cmt/requirements
rename to Control/AthContainers/cmt/requirements
diff --git a/EDM/calypso/Control/AthContainers/ispellwords b/Control/AthContainers/ispellwords
similarity index 100%
rename from EDM/calypso/Control/AthContainers/ispellwords
rename to Control/AthContainers/ispellwords
diff --git a/EDM/calypso/Control/AthContainers/share/AuxElementComplete_test.ref b/Control/AthContainers/share/AuxElementComplete_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/AuxElementComplete_test.ref
rename to Control/AthContainers/share/AuxElementComplete_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/AuxElement_test.ref b/Control/AthContainers/share/AuxElement_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/AuxElement_test.ref
rename to Control/AthContainers/share/AuxElement_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/AuxStoreInternal_test.ref b/Control/AthContainers/share/AuxStoreInternal_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/AuxStoreInternal_test.ref
rename to Control/AthContainers/share/AuxStoreInternal_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/AuxStoreStandalone_test.ref b/Control/AthContainers/share/AuxStoreStandalone_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/AuxStoreStandalone_test.ref
rename to Control/AthContainers/share/AuxStoreStandalone_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/AuxTypeRegistry_test.ref b/Control/AthContainers/share/AuxTypeRegistry_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/AuxTypeRegistry_test.ref
rename to Control/AthContainers/share/AuxTypeRegistry_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/AuxTypeVectorFactory_test.ref b/Control/AthContainers/share/AuxTypeVectorFactory_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/AuxTypeVectorFactory_test.ref
rename to Control/AthContainers/share/AuxTypeVectorFactory_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/AuxTypeVector_test.ref b/Control/AthContainers/share/AuxTypeVector_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/AuxTypeVector_test.ref
rename to Control/AthContainers/share/AuxTypeVector_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/AuxVectorBase_test.ref b/Control/AthContainers/share/AuxVectorBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/AuxVectorBase_test.ref
rename to Control/AthContainers/share/AuxVectorBase_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/AuxVectorData_test.ref b/Control/AthContainers/share/AuxVectorData_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/AuxVectorData_test.ref
rename to Control/AthContainers/share/AuxVectorData_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DVLCast_test.ref b/Control/AthContainers/share/DVLCast_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DVLCast_test.ref
rename to Control/AthContainers/share/DVLCast_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DVLDataBucket_test.ref b/Control/AthContainers/share/DVLDataBucket_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DVLDataBucket_test.ref
rename to Control/AthContainers/share/DVLDataBucket_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DVLInfo_test.ref b/Control/AthContainers/share/DVLInfo_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DVLInfo_test.ref
rename to Control/AthContainers/share/DVLInfo_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DVLIterator_test.ref b/Control/AthContainers/share/DVLIterator_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DVLIterator_test.ref
rename to Control/AthContainers/share/DVLIterator_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DVL_iter_swap_test.ref b/Control/AthContainers/share/DVL_iter_swap_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DVL_iter_swap_test.ref
rename to Control/AthContainers/share/DVL_iter_swap_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DataList_test.ref b/Control/AthContainers/share/DataList_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DataList_test.ref
rename to Control/AthContainers/share/DataList_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DataVector_a_test.ref b/Control/AthContainers/share/DataVector_a_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DataVector_a_test.ref
rename to Control/AthContainers/share/DataVector_a_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DataVector_b_test.ref b/Control/AthContainers/share/DataVector_b_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DataVector_b_test.ref
rename to Control/AthContainers/share/DataVector_b_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DataVector_c_test.ref b/Control/AthContainers/share/DataVector_c_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DataVector_c_test.ref
rename to Control/AthContainers/share/DataVector_c_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DataVector_d_test.ref b/Control/AthContainers/share/DataVector_d_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DataVector_d_test.ref
rename to Control/AthContainers/share/DataVector_d_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DataVector_e_test.ref b/Control/AthContainers/share/DataVector_e_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DataVector_e_test.ref
rename to Control/AthContainers/share/DataVector_e_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DataVector_f_test.ref b/Control/AthContainers/share/DataVector_f_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DataVector_f_test.ref
rename to Control/AthContainers/share/DataVector_f_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/DataVector_test.ref b/Control/AthContainers/share/DataVector_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/DataVector_test.ref
rename to Control/AthContainers/share/DataVector_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/ElementProxy_test.ref b/Control/AthContainers/share/ElementProxy_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/ElementProxy_test.ref
rename to Control/AthContainers/share/ElementProxy_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/IsMostDerivedFlag_test.ref b/Control/AthContainers/share/IsMostDerivedFlag_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/IsMostDerivedFlag_test.ref
rename to Control/AthContainers/share/IsMostDerivedFlag_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/PackedContainer_test.ref b/Control/AthContainers/share/PackedContainer_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/PackedContainer_test.ref
rename to Control/AthContainers/share/PackedContainer_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/PackedConverter_test.ref b/Control/AthContainers/share/PackedConverter_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/PackedConverter_test.ref
rename to Control/AthContainers/share/PackedConverter_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/PackedParameters_test.ref b/Control/AthContainers/share/PackedParameters_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/PackedParameters_test.ref
rename to Control/AthContainers/share/PackedParameters_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/ViewVectorBase_test.ref b/Control/AthContainers/share/ViewVectorBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/ViewVectorBase_test.ref
rename to Control/AthContainers/share/ViewVectorBase_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/ViewVector_test.ref b/Control/AthContainers/share/ViewVector_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/ViewVector_test.ref
rename to Control/AthContainers/share/ViewVector_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/copyAuxStoreThinned_test.ref b/Control/AthContainers/share/copyAuxStoreThinned_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/copyAuxStoreThinned_test.ref
rename to Control/AthContainers/share/copyAuxStoreThinned_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/copyThinned_test.ref b/Control/AthContainers/share/copyThinned_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/copyThinned_test.ref
rename to Control/AthContainers/share/copyThinned_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/dataVectorAsELV_test.ref b/Control/AthContainers/share/dataVectorAsELV_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/dataVectorAsELV_test.ref
rename to Control/AthContainers/share/dataVectorAsELV_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/debug_test.ref b/Control/AthContainers/share/debug_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/debug_test.ref
rename to Control/AthContainers/share/debug_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/error_test.ref b/Control/AthContainers/share/error_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/error_test.ref
rename to Control/AthContainers/share/error_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/exceptions_test.ref b/Control/AthContainers/share/exceptions_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/exceptions_test.ref
rename to Control/AthContainers/share/exceptions_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/foreach_test.ref b/Control/AthContainers/share/foreach_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/foreach_test.ref
rename to Control/AthContainers/share/foreach_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/getThinnedFlags_test.ref b/Control/AthContainers/share/getThinnedFlags_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/getThinnedFlags_test.ref
rename to Control/AthContainers/share/getThinnedFlags_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/normalizedTypeinfoName_test.ref b/Control/AthContainers/share/normalizedTypeinfoName_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/normalizedTypeinfoName_test.ref
rename to Control/AthContainers/share/normalizedTypeinfoName_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/removeDuplicates_test.ref b/Control/AthContainers/share/removeDuplicates_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/removeDuplicates_test.ref
rename to Control/AthContainers/share/removeDuplicates_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/threading_nothreads_test.ref b/Control/AthContainers/share/threading_nothreads_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/threading_nothreads_test.ref
rename to Control/AthContainers/share/threading_nothreads_test.ref
diff --git a/EDM/calypso/Control/AthContainers/share/threading_test.ref b/Control/AthContainers/share/threading_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainers/share/threading_test.ref
rename to Control/AthContainers/share/threading_test.ref
diff --git a/EDM/calypso/Control/AthContainers/src/copyAuxStoreThinned.cxx b/Control/AthContainers/src/copyAuxStoreThinned.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/src/copyAuxStoreThinned.cxx
rename to Control/AthContainers/src/copyAuxStoreThinned.cxx
diff --git a/EDM/calypso/Control/AthContainers/src/getThinnedFlags.cxx b/Control/AthContainers/src/getThinnedFlags.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/src/getThinnedFlags.cxx
rename to Control/AthContainers/src/getThinnedFlags.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/AthContainers.xml b/Control/AthContainers/test/AthContainers.xml
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AthContainers.xml
rename to Control/AthContainers/test/AthContainers.xml
diff --git a/EDM/calypso/Control/AthContainers/test/AuxElementComplete_test.cxx b/Control/AthContainers/test/AuxElementComplete_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AuxElementComplete_test.cxx
rename to Control/AthContainers/test/AuxElementComplete_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/AuxElement_test.cxx b/Control/AthContainers/test/AuxElement_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AuxElement_test.cxx
rename to Control/AthContainers/test/AuxElement_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/AuxStoreInternal_test.cxx b/Control/AthContainers/test/AuxStoreInternal_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AuxStoreInternal_test.cxx
rename to Control/AthContainers/test/AuxStoreInternal_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/AuxStoreStandalone_test.cxx b/Control/AthContainers/test/AuxStoreStandalone_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AuxStoreStandalone_test.cxx
rename to Control/AthContainers/test/AuxStoreStandalone_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/AuxTypeRegistry_test.cxx b/Control/AthContainers/test/AuxTypeRegistry_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AuxTypeRegistry_test.cxx
rename to Control/AthContainers/test/AuxTypeRegistry_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/AuxTypeVectorFactory_test.cxx b/Control/AthContainers/test/AuxTypeVectorFactory_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AuxTypeVectorFactory_test.cxx
rename to Control/AthContainers/test/AuxTypeVectorFactory_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/AuxTypeVector_test.cxx b/Control/AthContainers/test/AuxTypeVector_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AuxTypeVector_test.cxx
rename to Control/AthContainers/test/AuxTypeVector_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/AuxVectorBase_test.cxx b/Control/AthContainers/test/AuxVectorBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AuxVectorBase_test.cxx
rename to Control/AthContainers/test/AuxVectorBase_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/AuxVectorData_test.cxx b/Control/AthContainers/test/AuxVectorData_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/AuxVectorData_test.cxx
rename to Control/AthContainers/test/AuxVectorData_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DVLCast_test.cxx b/Control/AthContainers/test/DVLCast_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DVLCast_test.cxx
rename to Control/AthContainers/test/DVLCast_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DVLDataBucket_test.cxx b/Control/AthContainers/test/DVLDataBucket_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DVLDataBucket_test.cxx
rename to Control/AthContainers/test/DVLDataBucket_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DVLInfo_test.cxx b/Control/AthContainers/test/DVLInfo_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DVLInfo_test.cxx
rename to Control/AthContainers/test/DVLInfo_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DVLIterator_test.cxx b/Control/AthContainers/test/DVLIterator_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DVLIterator_test.cxx
rename to Control/AthContainers/test/DVLIterator_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DVL_iter_swap_test.cxx b/Control/AthContainers/test/DVL_iter_swap_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DVL_iter_swap_test.cxx
rename to Control/AthContainers/test/DVL_iter_swap_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DataList_test.cxx b/Control/AthContainers/test/DataList_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DataList_test.cxx
rename to Control/AthContainers/test/DataList_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DataVector_a_test.cxx b/Control/AthContainers/test/DataVector_a_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DataVector_a_test.cxx
rename to Control/AthContainers/test/DataVector_a_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DataVector_b_test.cxx b/Control/AthContainers/test/DataVector_b_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DataVector_b_test.cxx
rename to Control/AthContainers/test/DataVector_b_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DataVector_c_test.cxx b/Control/AthContainers/test/DataVector_c_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DataVector_c_test.cxx
rename to Control/AthContainers/test/DataVector_c_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DataVector_d_test.cxx b/Control/AthContainers/test/DataVector_d_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DataVector_d_test.cxx
rename to Control/AthContainers/test/DataVector_d_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DataVector_e_test.cxx b/Control/AthContainers/test/DataVector_e_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DataVector_e_test.cxx
rename to Control/AthContainers/test/DataVector_e_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DataVector_f_test.cxx b/Control/AthContainers/test/DataVector_f_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DataVector_f_test.cxx
rename to Control/AthContainers/test/DataVector_f_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DataVector_test.cxx b/Control/AthContainers/test/DataVector_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DataVector_test.cxx
rename to Control/AthContainers/test/DataVector_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/DataVector_test.icc b/Control/AthContainers/test/DataVector_test.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/DataVector_test.icc
rename to Control/AthContainers/test/DataVector_test.icc
diff --git a/EDM/calypso/Control/AthContainers/test/ElementProxy_test.cxx b/Control/AthContainers/test/ElementProxy_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/ElementProxy_test.cxx
rename to Control/AthContainers/test/ElementProxy_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/IsMostDerivedFlag_test.cxx b/Control/AthContainers/test/IsMostDerivedFlag_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/IsMostDerivedFlag_test.cxx
rename to Control/AthContainers/test/IsMostDerivedFlag_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/PackedContainer_test.cxx b/Control/AthContainers/test/PackedContainer_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/PackedContainer_test.cxx
rename to Control/AthContainers/test/PackedContainer_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/PackedConverter_test.cxx b/Control/AthContainers/test/PackedConverter_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/PackedConverter_test.cxx
rename to Control/AthContainers/test/PackedConverter_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/PackedParameters_test.cxx b/Control/AthContainers/test/PackedParameters_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/PackedParameters_test.cxx
rename to Control/AthContainers/test/PackedParameters_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/TestThinningSvc.icc b/Control/AthContainers/test/TestThinningSvc.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/TestThinningSvc.icc
rename to Control/AthContainers/test/TestThinningSvc.icc
diff --git a/EDM/calypso/Control/AthContainers/test/ViewVectorBase_test.cxx b/Control/AthContainers/test/ViewVectorBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/ViewVectorBase_test.cxx
rename to Control/AthContainers/test/ViewVectorBase_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/ViewVector_test.cxx b/Control/AthContainers/test/ViewVector_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/ViewVector_test.cxx
rename to Control/AthContainers/test/ViewVector_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/auxid_set_equal.icc b/Control/AthContainers/test/auxid_set_equal.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/auxid_set_equal.icc
rename to Control/AthContainers/test/auxid_set_equal.icc
diff --git a/EDM/calypso/Control/AthContainers/test/copyAuxStoreThinned_test.cxx b/Control/AthContainers/test/copyAuxStoreThinned_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/copyAuxStoreThinned_test.cxx
rename to Control/AthContainers/test/copyAuxStoreThinned_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/copyThinned_test.cxx b/Control/AthContainers/test/copyThinned_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/copyThinned_test.cxx
rename to Control/AthContainers/test/copyThinned_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/dataVectorAsELV_test.cxx b/Control/AthContainers/test/dataVectorAsELV_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/dataVectorAsELV_test.cxx
rename to Control/AthContainers/test/dataVectorAsELV_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/debug_test.cxx b/Control/AthContainers/test/debug_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/debug_test.cxx
rename to Control/AthContainers/test/debug_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/error_test.cxx b/Control/AthContainers/test/error_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/error_test.cxx
rename to Control/AthContainers/test/error_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/exceptions_test.cxx b/Control/AthContainers/test/exceptions_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/exceptions_test.cxx
rename to Control/AthContainers/test/exceptions_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/foreach_test.cxx b/Control/AthContainers/test/foreach_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/foreach_test.cxx
rename to Control/AthContainers/test/foreach_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/getThinnedFlags_test.cxx b/Control/AthContainers/test/getThinnedFlags_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/getThinnedFlags_test.cxx
rename to Control/AthContainers/test/getThinnedFlags_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/normalizedTypeinfoName_test.cxx b/Control/AthContainers/test/normalizedTypeinfoName_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/normalizedTypeinfoName_test.cxx
rename to Control/AthContainers/test/normalizedTypeinfoName_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/removeDuplicates_test.cxx b/Control/AthContainers/test/removeDuplicates_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/removeDuplicates_test.cxx
rename to Control/AthContainers/test/removeDuplicates_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/threading_nothreads_test.cxx b/Control/AthContainers/test/threading_nothreads_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/threading_nothreads_test.cxx
rename to Control/AthContainers/test/threading_nothreads_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/threading_test.cxx b/Control/AthContainers/test/threading_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/threading_test.cxx
rename to Control/AthContainers/test/threading_test.cxx
diff --git a/EDM/calypso/Control/AthContainers/test/ut_ConstDataVector_basic_test.cxx b/Control/AthContainers/test/ut_ConstDataVector_basic_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainers/test/ut_ConstDataVector_basic_test.cxx
rename to Control/AthContainers/test/ut_ConstDataVector_basic_test.cxx
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.h b/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.icc b/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.icc
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.icc
rename to Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.icc
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/AuxStore_traits.h b/Control/AthContainersInterfaces/AthContainersInterfaces/AuxStore_traits.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/AuxStore_traits.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/AuxStore_traits.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/AuxTypes.h b/Control/AthContainersInterfaces/AthContainersInterfaces/AuxTypes.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/AuxTypes.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/AuxTypes.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/CLASS_AUXSTORE.h b/Control/AthContainersInterfaces/AthContainersInterfaces/CLASS_AUXSTORE.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/CLASS_AUXSTORE.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/CLASS_AUXSTORE.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxElement.h b/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxElement.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxElement.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/IAuxElement.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxSetOption.h b/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxSetOption.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxSetOption.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/IAuxSetOption.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStore.h b/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStore.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStore.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStore.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStoreHolder.h b/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStoreHolder.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStoreHolder.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStoreHolder.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStoreIO.h b/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStoreIO.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStoreIO.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/IAuxStoreIO.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxTypeVector.h b/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxTypeVector.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxTypeVector.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/IAuxTypeVector.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxTypeVectorFactory.h b/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxTypeVectorFactory.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IAuxTypeVectorFactory.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/IAuxTypeVectorFactory.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IConstAuxStore.h b/Control/AthContainersInterfaces/AthContainersInterfaces/IConstAuxStore.h
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/AthContainersInterfaces/IConstAuxStore.h
rename to Control/AthContainersInterfaces/AthContainersInterfaces/IConstAuxStore.h
diff --git a/EDM/calypso/Control/AthContainersInterfaces/CMakeLists.txt b/Control/AthContainersInterfaces/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/CMakeLists.txt
rename to Control/AthContainersInterfaces/CMakeLists.txt
diff --git a/EDM/calypso/Control/AthContainersInterfaces/cmt/Makefile.RootCore b/Control/AthContainersInterfaces/cmt/Makefile.RootCore
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/cmt/Makefile.RootCore
rename to Control/AthContainersInterfaces/cmt/Makefile.RootCore
diff --git a/EDM/calypso/Control/AthContainersInterfaces/cmt/requirements b/Control/AthContainersInterfaces/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/cmt/requirements
rename to Control/AthContainersInterfaces/cmt/requirements
diff --git a/EDM/calypso/Control/AthContainersInterfaces/ispellwords b/Control/AthContainersInterfaces/ispellwords
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/ispellwords
rename to Control/AthContainersInterfaces/ispellwords
diff --git a/EDM/calypso/Control/AthContainersInterfaces/share/AuxDataOption_test.ref b/Control/AthContainersInterfaces/share/AuxDataOption_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/share/AuxDataOption_test.ref
rename to Control/AthContainersInterfaces/share/AuxDataOption_test.ref
diff --git a/EDM/calypso/Control/AthContainersInterfaces/share/AuxStore_traits_test.ref b/Control/AthContainersInterfaces/share/AuxStore_traits_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/share/AuxStore_traits_test.ref
rename to Control/AthContainersInterfaces/share/AuxStore_traits_test.ref
diff --git a/EDM/calypso/Control/AthContainersInterfaces/test/AuxDataOption_test.cxx b/Control/AthContainersInterfaces/test/AuxDataOption_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/test/AuxDataOption_test.cxx
rename to Control/AthContainersInterfaces/test/AuxDataOption_test.cxx
diff --git a/EDM/calypso/Control/AthContainersInterfaces/test/AuxStore_traits_test.cxx b/Control/AthContainersInterfaces/test/AuxStore_traits_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthContainersInterfaces/test/AuxStore_traits_test.cxx
rename to Control/AthContainersInterfaces/test/AuxStore_traits_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/AssociationMap.h b/Control/AthLinks/AthLinks/AssociationMap.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/AssociationMap.h
rename to Control/AthLinks/AthLinks/AssociationMap.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/AssociationMap.icc b/Control/AthLinks/AthLinks/AssociationMap.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/AssociationMap.icc
rename to Control/AthLinks/AthLinks/AssociationMap.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/AthLinksDict.h b/Control/AthLinks/AthLinks/AthLinksDict.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/AthLinksDict.h
rename to Control/AthLinks/AthLinks/AthLinksDict.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/DataLink.h b/Control/AthLinks/AthLinks/DataLink.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/DataLink.h
rename to Control/AthLinks/AthLinks/DataLink.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/DataLink.icc b/Control/AthLinks/AthLinks/DataLink.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/DataLink.icc
rename to Control/AthLinks/AthLinks/DataLink.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/DataLinkBase.h b/Control/AthLinks/AthLinks/DataLinkBase.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/DataLinkBase.h
rename to Control/AthLinks/AthLinks/DataLinkBase.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/DataLinkBase.icc b/Control/AthLinks/AthLinks/DataLinkBase.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/DataLinkBase.icc
rename to Control/AthLinks/AthLinks/DataLinkBase.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/DataPtr.h b/Control/AthLinks/AthLinks/DataPtr.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/DataPtr.h
rename to Control/AthLinks/AthLinks/DataPtr.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/DeclareIndexingPolicy.h b/Control/AthLinks/AthLinks/DeclareIndexingPolicy.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/DeclareIndexingPolicy.h
rename to Control/AthLinks/AthLinks/DeclareIndexingPolicy.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/ElementLink.h b/Control/AthLinks/AthLinks/ElementLink.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/ElementLink.h
rename to Control/AthLinks/AthLinks/ElementLink.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/ElementLink.icc b/Control/AthLinks/AthLinks/ElementLink.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/ElementLink.icc
rename to Control/AthLinks/AthLinks/ElementLink.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/ElementLinkBase.h b/Control/AthLinks/AthLinks/ElementLinkBase.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/ElementLinkBase.h
rename to Control/AthLinks/AthLinks/ElementLinkBase.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/ElementLinkBase.icc b/Control/AthLinks/AthLinks/ElementLinkBase.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/ElementLinkBase.icc
rename to Control/AthLinks/AthLinks/ElementLinkBase.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/ElementLinkVector.h b/Control/AthLinks/AthLinks/ElementLinkVector.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/ElementLinkVector.h
rename to Control/AthLinks/AthLinks/ElementLinkVector.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/ElementLinkVector.icc b/Control/AthLinks/AthLinks/ElementLinkVector.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/ElementLinkVector.icc
rename to Control/AthLinks/AthLinks/ElementLinkVector.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/ElementLinkVectorBase.h b/Control/AthLinks/AthLinks/ElementLinkVectorBase.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/ElementLinkVectorBase.h
rename to Control/AthLinks/AthLinks/ElementLinkVectorBase.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/GenericElementLinkBase.h b/Control/AthLinks/AthLinks/GenericElementLinkBase.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/GenericElementLinkBase.h
rename to Control/AthLinks/AthLinks/GenericElementLinkBase.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/GenericElementLinkBase.icc b/Control/AthLinks/AthLinks/GenericElementLinkBase.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/GenericElementLinkBase.icc
rename to Control/AthLinks/AthLinks/GenericElementLinkBase.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/exceptions.h b/Control/AthLinks/AthLinks/exceptions.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/exceptions.h
rename to Control/AthLinks/AthLinks/exceptions.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/selection.xml b/Control/AthLinks/AthLinks/selection.xml
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/selection.xml
rename to Control/AthLinks/AthLinks/selection.xml
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/AssociationObjectIterator.h b/Control/AthLinks/AthLinks/tools/AssociationObjectIterator.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/AssociationObjectIterator.h
rename to Control/AthLinks/AthLinks/tools/AssociationObjectIterator.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/AssociationVectorIterator.h b/Control/AthLinks/AthLinks/tools/AssociationVectorIterator.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/AssociationVectorIterator.h
rename to Control/AthLinks/AthLinks/tools/AssociationVectorIterator.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/DataProxyHolder.h b/Control/AthLinks/AthLinks/tools/DataProxyHolder.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/DataProxyHolder.h
rename to Control/AthLinks/AthLinks/tools/DataProxyHolder.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/DataProxyHolder.icc b/Control/AthLinks/AthLinks/tools/DataProxyHolder.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/DataProxyHolder.icc
rename to Control/AthLinks/AthLinks/tools/DataProxyHolder.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/DefaultIndexingPolicy.h b/Control/AthLinks/AthLinks/tools/DefaultIndexingPolicy.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/DefaultIndexingPolicy.h
rename to Control/AthLinks/AthLinks/tools/DefaultIndexingPolicy.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/ElementLinkTraits.h b/Control/AthLinks/AthLinks/tools/ElementLinkTraits.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/ElementLinkTraits.h
rename to Control/AthLinks/AthLinks/tools/ElementLinkTraits.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/ForwardIndexingPolicy.h b/Control/AthLinks/AthLinks/tools/ForwardIndexingPolicy.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/ForwardIndexingPolicy.h
rename to Control/AthLinks/AthLinks/tools/ForwardIndexingPolicy.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/ForwardIndexingPolicy.icc b/Control/AthLinks/AthLinks/tools/ForwardIndexingPolicy.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/ForwardIndexingPolicy.icc
rename to Control/AthLinks/AthLinks/tools/ForwardIndexingPolicy.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/GenerateIndexingPolicy.h b/Control/AthLinks/AthLinks/tools/GenerateIndexingPolicy.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/GenerateIndexingPolicy.h
rename to Control/AthLinks/AthLinks/tools/GenerateIndexingPolicy.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/IdentContIndex.h b/Control/AthLinks/AthLinks/tools/IdentContIndex.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/IdentContIndex.h
rename to Control/AthLinks/AthLinks/tools/IdentContIndex.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/IdentContIndexingPolicy.h b/Control/AthLinks/AthLinks/tools/IdentContIndexingPolicy.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/IdentContIndexingPolicy.h
rename to Control/AthLinks/AthLinks/tools/IdentContIndexingPolicy.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/IdentContIndexingPolicy.icc b/Control/AthLinks/AthLinks/tools/IdentContIndexingPolicy.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/IdentContIndexingPolicy.icc
rename to Control/AthLinks/AthLinks/tools/IdentContIndexingPolicy.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/IndexHolder.h b/Control/AthLinks/AthLinks/tools/IndexHolder.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/IndexHolder.h
rename to Control/AthLinks/AthLinks/tools/IndexHolder.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/IsSTLSequence.h b/Control/AthLinks/AthLinks/tools/IsSTLSequence.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/IsSTLSequence.h
rename to Control/AthLinks/AthLinks/tools/IsSTLSequence.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/MapIndexingPolicy.h b/Control/AthLinks/AthLinks/tools/MapIndexingPolicy.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/MapIndexingPolicy.h
rename to Control/AthLinks/AthLinks/tools/MapIndexingPolicy.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/MapIndexingPolicy.icc b/Control/AthLinks/AthLinks/tools/MapIndexingPolicy.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/MapIndexingPolicy.icc
rename to Control/AthLinks/AthLinks/tools/MapIndexingPolicy.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/RemoveDataPtr.h b/Control/AthLinks/AthLinks/tools/RemoveDataPtr.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/RemoveDataPtr.h
rename to Control/AthLinks/AthLinks/tools/RemoveDataPtr.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/SGELVRef.h b/Control/AthLinks/AthLinks/tools/SGELVRef.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/SGELVRef.h
rename to Control/AthLinks/AthLinks/tools/SGELVRef.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/SGELVRef.icc b/Control/AthLinks/AthLinks/tools/SGELVRef.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/SGELVRef.icc
rename to Control/AthLinks/AthLinks/tools/SGELVRef.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/SetIndexingPolicy.h b/Control/AthLinks/AthLinks/tools/SetIndexingPolicy.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/SetIndexingPolicy.h
rename to Control/AthLinks/AthLinks/tools/SetIndexingPolicy.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/SetIndexingPolicy.icc b/Control/AthLinks/AthLinks/tools/SetIndexingPolicy.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/SetIndexingPolicy.icc
rename to Control/AthLinks/AthLinks/tools/SetIndexingPolicy.icc
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/findInContainer.h b/Control/AthLinks/AthLinks/tools/findInContainer.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/findInContainer.h
rename to Control/AthLinks/AthLinks/tools/findInContainer.h
diff --git a/EDM/calypso/Control/AthLinks/AthLinks/tools/selection_ns.h b/Control/AthLinks/AthLinks/tools/selection_ns.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/AthLinks/tools/selection_ns.h
rename to Control/AthLinks/AthLinks/tools/selection_ns.h
diff --git a/EDM/calypso/Control/AthLinks/CMakeLists.txt b/Control/AthLinks/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/AthLinks/CMakeLists.txt
rename to Control/AthLinks/CMakeLists.txt
diff --git a/EDM/calypso/Control/AthLinks/cmt/requirements b/Control/AthLinks/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/AthLinks/cmt/requirements
rename to Control/AthLinks/cmt/requirements
diff --git a/EDM/calypso/Control/AthLinks/ispellwords b/Control/AthLinks/ispellwords
similarity index 100%
rename from EDM/calypso/Control/AthLinks/ispellwords
rename to Control/AthLinks/ispellwords
diff --git a/EDM/calypso/Control/AthLinks/share/AssociationMap_test.ref b/Control/AthLinks/share/AssociationMap_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/AssociationMap_test.ref
rename to Control/AthLinks/share/AssociationMap_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/DataLinkBase_test.ref b/Control/AthLinks/share/DataLinkBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/DataLinkBase_test.ref
rename to Control/AthLinks/share/DataLinkBase_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/DataLink_test.ref b/Control/AthLinks/share/DataLink_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/DataLink_test.ref
rename to Control/AthLinks/share/DataLink_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/DataProxyHolder_test.ref b/Control/AthLinks/share/DataProxyHolder_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/DataProxyHolder_test.ref
rename to Control/AthLinks/share/DataProxyHolder_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/DataProxyStorageData_test.ref b/Control/AthLinks/share/DataProxyStorageData_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/DataProxyStorageData_test.ref
rename to Control/AthLinks/share/DataProxyStorageData_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/DataProxyStorage_test.ref b/Control/AthLinks/share/DataProxyStorage_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/DataProxyStorage_test.ref
rename to Control/AthLinks/share/DataProxyStorage_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/DataPtr_test.ref b/Control/AthLinks/share/DataPtr_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/DataPtr_test.ref
rename to Control/AthLinks/share/DataPtr_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/ElementHolder_test.ref b/Control/AthLinks/share/ElementHolder_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/ElementHolder_test.ref
rename to Control/AthLinks/share/ElementHolder_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/ElementLinkBase_test.ref b/Control/AthLinks/share/ElementLinkBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/ElementLinkBase_test.ref
rename to Control/AthLinks/share/ElementLinkBase_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/ElementLinkFwd_test.ref b/Control/AthLinks/share/ElementLinkFwd_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/ElementLinkFwd_test.ref
rename to Control/AthLinks/share/ElementLinkFwd_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/ElementLink_test.ref b/Control/AthLinks/share/ElementLink_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/ElementLink_test.ref
rename to Control/AthLinks/share/ElementLink_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/ForwardIndexingPolicy_test.ref b/Control/AthLinks/share/ForwardIndexingPolicy_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/ForwardIndexingPolicy_test.ref
rename to Control/AthLinks/share/ForwardIndexingPolicy_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/GenericElementLinkBase_test.ref b/Control/AthLinks/share/GenericElementLinkBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/GenericElementLinkBase_test.ref
rename to Control/AthLinks/share/GenericElementLinkBase_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/IdentContIndex_test.ref b/Control/AthLinks/share/IdentContIndex_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/IdentContIndex_test.ref
rename to Control/AthLinks/share/IdentContIndex_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/IdentContIndexingPolicy_test.ref b/Control/AthLinks/share/IdentContIndexingPolicy_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/IdentContIndexingPolicy_test.ref
rename to Control/AthLinks/share/IdentContIndexingPolicy_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/IndexHolder_test.ref b/Control/AthLinks/share/IndexHolder_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/IndexHolder_test.ref
rename to Control/AthLinks/share/IndexHolder_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/IsSTLSequence_test.ref b/Control/AthLinks/share/IsSTLSequence_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/IsSTLSequence_test.ref
rename to Control/AthLinks/share/IsSTLSequence_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/MapIndexingPolicy_test.ref b/Control/AthLinks/share/MapIndexingPolicy_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/MapIndexingPolicy_test.ref
rename to Control/AthLinks/share/MapIndexingPolicy_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/SetIndexingPolicy_test.ref b/Control/AthLinks/share/SetIndexingPolicy_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/SetIndexingPolicy_test.ref
rename to Control/AthLinks/share/SetIndexingPolicy_test.ref
diff --git a/EDM/calypso/Control/AthLinks/share/exceptions_test.ref b/Control/AthLinks/share/exceptions_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthLinks/share/exceptions_test.ref
rename to Control/AthLinks/share/exceptions_test.ref
diff --git a/EDM/calypso/Control/AthLinks/src/DataProxyHolder.cxx b/Control/AthLinks/src/DataProxyHolder.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/src/DataProxyHolder.cxx
rename to Control/AthLinks/src/DataProxyHolder.cxx
diff --git a/EDM/calypso/Control/AthLinks/src/ElementLinkVectorBase.cxx b/Control/AthLinks/src/ElementLinkVectorBase.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/src/ElementLinkVectorBase.cxx
rename to Control/AthLinks/src/ElementLinkVectorBase.cxx
diff --git a/EDM/calypso/Control/AthLinks/src/exceptions.cxx b/Control/AthLinks/src/exceptions.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/src/exceptions.cxx
rename to Control/AthLinks/src/exceptions.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/AssociationMap_test.cxx b/Control/AthLinks/test/AssociationMap_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/AssociationMap_test.cxx
rename to Control/AthLinks/test/AssociationMap_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/AthLinks.xml b/Control/AthLinks/test/AthLinks.xml
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/AthLinks.xml
rename to Control/AthLinks/test/AthLinks.xml
diff --git a/EDM/calypso/Control/AthLinks/test/DataLinkBase_test.cxx b/Control/AthLinks/test/DataLinkBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/DataLinkBase_test.cxx
rename to Control/AthLinks/test/DataLinkBase_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/DataLink_test.cxx b/Control/AthLinks/test/DataLink_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/DataLink_test.cxx
rename to Control/AthLinks/test/DataLink_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/DataProxyHolder_test.cxx b/Control/AthLinks/test/DataProxyHolder_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/DataProxyHolder_test.cxx
rename to Control/AthLinks/test/DataProxyHolder_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/DataPtr_test.cxx b/Control/AthLinks/test/DataPtr_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/DataPtr_test.cxx
rename to Control/AthLinks/test/DataPtr_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/ELFCont.h b/Control/AthLinks/test/ELFCont.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/ELFCont.h
rename to Control/AthLinks/test/ELFCont.h
diff --git a/EDM/calypso/Control/AthLinks/test/ELFElt.h b/Control/AthLinks/test/ELFElt.h
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/ELFElt.h
rename to Control/AthLinks/test/ELFElt.h
diff --git a/EDM/calypso/Control/AthLinks/test/ElementLinkBase_test.cxx b/Control/AthLinks/test/ElementLinkBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/ElementLinkBase_test.cxx
rename to Control/AthLinks/test/ElementLinkBase_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/ElementLinkFwd_test.cxx b/Control/AthLinks/test/ElementLinkFwd_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/ElementLinkFwd_test.cxx
rename to Control/AthLinks/test/ElementLinkFwd_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/ElementLink_test.cxx b/Control/AthLinks/test/ElementLink_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/ElementLink_test.cxx
rename to Control/AthLinks/test/ElementLink_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/ForwardIndexingPolicy_test.cxx b/Control/AthLinks/test/ForwardIndexingPolicy_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/ForwardIndexingPolicy_test.cxx
rename to Control/AthLinks/test/ForwardIndexingPolicy_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/GenericElementLinkBase_test.cxx b/Control/AthLinks/test/GenericElementLinkBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/GenericElementLinkBase_test.cxx
rename to Control/AthLinks/test/GenericElementLinkBase_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/IdentContIndex_test.cxx b/Control/AthLinks/test/IdentContIndex_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/IdentContIndex_test.cxx
rename to Control/AthLinks/test/IdentContIndex_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/IdentContIndexingPolicy_test.cxx b/Control/AthLinks/test/IdentContIndexingPolicy_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/IdentContIndexingPolicy_test.cxx
rename to Control/AthLinks/test/IdentContIndexingPolicy_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/IndexHolder_test.cxx b/Control/AthLinks/test/IndexHolder_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/IndexHolder_test.cxx
rename to Control/AthLinks/test/IndexHolder_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/IsSTLSequence_test.cxx b/Control/AthLinks/test/IsSTLSequence_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/IsSTLSequence_test.cxx
rename to Control/AthLinks/test/IsSTLSequence_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/MapIndexingPolicy_test.cxx b/Control/AthLinks/test/MapIndexingPolicy_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/MapIndexingPolicy_test.cxx
rename to Control/AthLinks/test/MapIndexingPolicy_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/SetIndexingPolicy_test.cxx b/Control/AthLinks/test/SetIndexingPolicy_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/SetIndexingPolicy_test.cxx
rename to Control/AthLinks/test/SetIndexingPolicy_test.cxx
diff --git a/EDM/calypso/Control/AthLinks/test/TestThinningSvc.icc b/Control/AthLinks/test/TestThinningSvc.icc
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/TestThinningSvc.icc
rename to Control/AthLinks/test/TestThinningSvc.icc
diff --git a/EDM/calypso/Control/AthLinks/test/exceptions_test.cxx b/Control/AthLinks/test/exceptions_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthLinks/test/exceptions_test.cxx
rename to Control/AthLinks/test/exceptions_test.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthAlgTool.h b/Control/AthenaBaseComps/AthenaBaseComps/AthAlgTool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthAlgTool.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthAlgTool.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/AthAlgorithm.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthAlgorithm.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthAlgorithm.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthCheckMacros.h b/Control/AthenaBaseComps/AthenaBaseComps/AthCheckMacros.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthCheckMacros.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthCheckMacros.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthCnvSvc.h b/Control/AthenaBaseComps/AthenaBaseComps/AthCnvSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthCnvSvc.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthCnvSvc.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramAlgorithm.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramAlgorithm.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthHistogramAlgorithm.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramFilterAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramFilterAlgorithm.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramFilterAlgorithm.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthHistogramFilterAlgorithm.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramTool.h b/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramTool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramTool.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthHistogramTool.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramming.h b/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramming.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthHistogramming.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthHistogramming.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthMemMacros.h b/Control/AthenaBaseComps/AthenaBaseComps/AthMemMacros.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthMemMacros.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthMemMacros.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h b/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthMsgStreamMacros.h b/Control/AthenaBaseComps/AthenaBaseComps/AthMsgStreamMacros.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthMsgStreamMacros.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthMsgStreamMacros.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthService.h b/Control/AthenaBaseComps/AthenaBaseComps/AthService.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/AthService.h
rename to Control/AthenaBaseComps/AthenaBaseComps/AthService.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h
rename to Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h
diff --git a/EDM/calypso/Control/AthenaBaseComps/CMakeLists.txt b/Control/AthenaBaseComps/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/CMakeLists.txt
rename to Control/AthenaBaseComps/CMakeLists.txt
diff --git a/EDM/calypso/Control/AthenaBaseComps/cmt/requirements b/Control/AthenaBaseComps/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/cmt/requirements
rename to Control/AthenaBaseComps/cmt/requirements
diff --git a/EDM/calypso/Control/AthenaBaseComps/share/AthReentrantAlgorithm_test.ref b/Control/AthenaBaseComps/share/AthReentrantAlgorithm_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/share/AthReentrantAlgorithm_test.ref
rename to Control/AthenaBaseComps/share/AthReentrantAlgorithm_test.ref
diff --git a/EDM/calypso/Control/AthenaBaseComps/share/propertyHandling_test.ref b/Control/AthenaBaseComps/share/propertyHandling_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/share/propertyHandling_test.ref
rename to Control/AthenaBaseComps/share/propertyHandling_test.ref
diff --git a/EDM/calypso/Control/AthenaBaseComps/share/propertyHandling_test.txt b/Control/AthenaBaseComps/share/propertyHandling_test.txt
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/share/propertyHandling_test.txt
rename to Control/AthenaBaseComps/share/propertyHandling_test.txt
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthAlgTool.cxx b/Control/AthenaBaseComps/src/AthAlgTool.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthAlgTool.cxx
rename to Control/AthenaBaseComps/src/AthAlgTool.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthAlgorithm.cxx b/Control/AthenaBaseComps/src/AthAlgorithm.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthAlgorithm.cxx
rename to Control/AthenaBaseComps/src/AthAlgorithm.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthCnvSvc.cxx b/Control/AthenaBaseComps/src/AthCnvSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthCnvSvc.cxx
rename to Control/AthenaBaseComps/src/AthCnvSvc.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx b/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx
rename to Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx b/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx
rename to Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx b/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx
rename to Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthHistogramTool.cxx b/Control/AthenaBaseComps/src/AthHistogramTool.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthHistogramTool.cxx
rename to Control/AthenaBaseComps/src/AthHistogramTool.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthHistogramming.cxx b/Control/AthenaBaseComps/src/AthHistogramming.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthHistogramming.cxx
rename to Control/AthenaBaseComps/src/AthHistogramming.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthMessaging.cxx b/Control/AthenaBaseComps/src/AthMessaging.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthMessaging.cxx
rename to Control/AthenaBaseComps/src/AthMessaging.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx b/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx
rename to Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/AthService.cxx b/Control/AthenaBaseComps/src/AthService.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/AthService.cxx
rename to Control/AthenaBaseComps/src/AthService.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/src/FilteredAlgorithm.cxx b/Control/AthenaBaseComps/src/FilteredAlgorithm.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/src/FilteredAlgorithm.cxx
rename to Control/AthenaBaseComps/src/FilteredAlgorithm.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx b/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx
rename to Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx
diff --git a/EDM/calypso/Control/AthenaBaseComps/test/AthenaBaseComps.xml b/Control/AthenaBaseComps/test/AthenaBaseComps.xml
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/test/AthenaBaseComps.xml
rename to Control/AthenaBaseComps/test/AthenaBaseComps.xml
diff --git a/EDM/calypso/Control/AthenaBaseComps/test/propertyHandling_test.cxx b/Control/AthenaBaseComps/test/propertyHandling_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaBaseComps/test/propertyHandling_test.cxx
rename to Control/AthenaBaseComps/test/propertyHandling_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/AddressProviderSvc.h b/Control/AthenaKernel/AthenaKernel/AddressProviderSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/AddressProviderSvc.h
rename to Control/AthenaKernel/AthenaKernel/AddressProviderSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/AlgorithmTimer.h b/Control/AthenaKernel/AthenaKernel/AlgorithmTimer.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/AlgorithmTimer.h
rename to Control/AthenaKernel/AthenaKernel/AlgorithmTimer.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/AthDsoUtils.h b/Control/AthenaKernel/AthenaKernel/AthDsoUtils.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/AthDsoUtils.h
rename to Control/AthenaKernel/AthenaKernel/AthDsoUtils.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/AthenaKernelDict.h b/Control/AthenaKernel/AthenaKernel/AthenaKernelDict.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/AthenaKernelDict.h
rename to Control/AthenaKernel/AthenaKernel/AthenaKernelDict.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/Chrono.h b/Control/AthenaKernel/AthenaKernel/Chrono.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/Chrono.h
rename to Control/AthenaKernel/AthenaKernel/Chrono.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/CloneService.h b/Control/AthenaKernel/AthenaKernel/CloneService.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/CloneService.h
rename to Control/AthenaKernel/AthenaKernel/CloneService.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/CloneTool.h b/Control/AthenaKernel/AthenaKernel/CloneTool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/CloneTool.h
rename to Control/AthenaKernel/AthenaKernel/CloneTool.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/CondCont.h b/Control/AthenaKernel/AthenaKernel/CondCont.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/CondCont.h
rename to Control/AthenaKernel/AthenaKernel/CondCont.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/DataObjectSharedPtr.h b/Control/AthenaKernel/AthenaKernel/DataObjectSharedPtr.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/DataObjectSharedPtr.h
rename to Control/AthenaKernel/AthenaKernel/DataObjectSharedPtr.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/DefaultKey.h b/Control/AthenaKernel/AthenaKernel/DefaultKey.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/DefaultKey.h
rename to Control/AthenaKernel/AthenaKernel/DefaultKey.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/DirSearchPath.h b/Control/AthenaKernel/AthenaKernel/DirSearchPath.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/DirSearchPath.h
rename to Control/AthenaKernel/AthenaKernel/DirSearchPath.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/DsoDb.h b/Control/AthenaKernel/AthenaKernel/DsoDb.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/DsoDb.h
rename to Control/AthenaKernel/AthenaKernel/DsoDb.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAddressProvider.h b/Control/AthenaKernel/AthenaKernel/IAddressProvider.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAddressProvider.h
rename to Control/AthenaKernel/AthenaKernel/IAddressProvider.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAtRndmGenSvc.h b/Control/AthenaKernel/AthenaKernel/IAtRndmGenSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAtRndmGenSvc.h
rename to Control/AthenaKernel/AthenaKernel/IAtRndmGenSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaBarCode.h b/Control/AthenaKernel/AthenaKernel/IAthenaBarCode.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaBarCode.h
rename to Control/AthenaKernel/AthenaKernel/IAthenaBarCode.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaEvtLoopPreSelectTool.h b/Control/AthenaKernel/AthenaKernel/IAthenaEvtLoopPreSelectTool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaEvtLoopPreSelectTool.h
rename to Control/AthenaKernel/AthenaKernel/IAthenaEvtLoopPreSelectTool.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaIPCTool.h b/Control/AthenaKernel/AthenaKernel/IAthenaIPCTool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaIPCTool.h
rename to Control/AthenaKernel/AthenaKernel/IAthenaIPCTool.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaOutputStreamTool.h b/Control/AthenaKernel/AthenaKernel/IAthenaOutputStreamTool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaOutputStreamTool.h
rename to Control/AthenaKernel/AthenaKernel/IAthenaOutputStreamTool.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaOutputTool.h b/Control/AthenaKernel/AthenaKernel/IAthenaOutputTool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaOutputTool.h
rename to Control/AthenaKernel/AthenaKernel/IAthenaOutputTool.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaSealSvc.h b/Control/AthenaKernel/AthenaKernel/IAthenaSealSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaSealSvc.h
rename to Control/AthenaKernel/AthenaKernel/IAthenaSealSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaSelectorTool.h b/Control/AthenaKernel/AthenaKernel/IAthenaSelectorTool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaSelectorTool.h
rename to Control/AthenaKernel/AthenaKernel/IAthenaSelectorTool.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaSerializeSvc.h b/Control/AthenaKernel/AthenaKernel/IAthenaSerializeSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaSerializeSvc.h
rename to Control/AthenaKernel/AthenaKernel/IAthenaSerializeSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaSummarySvc.h b/Control/AthenaKernel/AthenaKernel/IAthenaSummarySvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IAthenaSummarySvc.h
rename to Control/AthenaKernel/AthenaKernel/IAthenaSummarySvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IClassIDSvc.h b/Control/AthenaKernel/AthenaKernel/IClassIDSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IClassIDSvc.h
rename to Control/AthenaKernel/AthenaKernel/IClassIDSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ICollectionSize.h b/Control/AthenaKernel/AthenaKernel/ICollectionSize.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ICollectionSize.h
rename to Control/AthenaKernel/AthenaKernel/ICollectionSize.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ICoreDumpSvc.h b/Control/AthenaKernel/AthenaKernel/ICoreDumpSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ICoreDumpSvc.h
rename to Control/AthenaKernel/AthenaKernel/ICoreDumpSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ICutFlowSvc.h b/Control/AthenaKernel/AthenaKernel/ICutFlowSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ICutFlowSvc.h
rename to Control/AthenaKernel/AthenaKernel/ICutFlowSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IDataShare.h b/Control/AthenaKernel/AthenaKernel/IDataShare.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IDataShare.h
rename to Control/AthenaKernel/AthenaKernel/IDataShare.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IDecisionSvc.h b/Control/AthenaKernel/AthenaKernel/IDecisionSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IDecisionSvc.h
rename to Control/AthenaKernel/AthenaKernel/IDecisionSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IDictLoaderSvc.h b/Control/AthenaKernel/AthenaKernel/IDictLoaderSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IDictLoaderSvc.h
rename to Control/AthenaKernel/AthenaKernel/IDictLoaderSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IEventDumperSvc.h b/Control/AthenaKernel/AthenaKernel/IEventDumperSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IEventDumperSvc.h
rename to Control/AthenaKernel/AthenaKernel/IEventDumperSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IEventSeek.h b/Control/AthenaKernel/AthenaKernel/IEventSeek.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IEventSeek.h
rename to Control/AthenaKernel/AthenaKernel/IEventSeek.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IEventShare.h b/Control/AthenaKernel/AthenaKernel/IEventShare.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IEventShare.h
rename to Control/AthenaKernel/AthenaKernel/IEventShare.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IEvtIdModifierSvc.h b/Control/AthenaKernel/AthenaKernel/IEvtIdModifierSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IEvtIdModifierSvc.h
rename to Control/AthenaKernel/AthenaKernel/IEvtIdModifierSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IGMASvc.h b/Control/AthenaKernel/AthenaKernel/IGMASvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IGMASvc.h
rename to Control/AthenaKernel/AthenaKernel/IGMASvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IHiveStore.h b/Control/AthenaKernel/AthenaKernel/IHiveStore.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IHiveStore.h
rename to Control/AthenaKernel/AthenaKernel/IHiveStore.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IHiveStoreMgr.h b/Control/AthenaKernel/AthenaKernel/IHiveStoreMgr.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IHiveStoreMgr.h
rename to Control/AthenaKernel/AthenaKernel/IHiveStoreMgr.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IIOVDbSvc.h b/Control/AthenaKernel/AthenaKernel/IIOVDbSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IIOVDbSvc.h
rename to Control/AthenaKernel/AthenaKernel/IIOVDbSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IIOVSvc.h b/Control/AthenaKernel/AthenaKernel/IIOVSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IIOVSvc.h
rename to Control/AthenaKernel/AthenaKernel/IIOVSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IInputRename.h b/Control/AthenaKernel/AthenaKernel/IInputRename.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IInputRename.h
rename to Control/AthenaKernel/AthenaKernel/IInputRename.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IIoComponent.h b/Control/AthenaKernel/AthenaKernel/IIoComponent.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IIoComponent.h
rename to Control/AthenaKernel/AthenaKernel/IIoComponent.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IIoComponentMgr.h b/Control/AthenaKernel/AthenaKernel/IIoComponentMgr.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IIoComponentMgr.h
rename to Control/AthenaKernel/AthenaKernel/IIoComponentMgr.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IItemListSvc.h b/Control/AthenaKernel/AthenaKernel/IItemListSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IItemListSvc.h
rename to Control/AthenaKernel/AthenaKernel/IItemListSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IJobIDSvc.h b/Control/AthenaKernel/AthenaKernel/IJobIDSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IJobIDSvc.h
rename to Control/AthenaKernel/AthenaKernel/IJobIDSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ILockable.h b/Control/AthenaKernel/AthenaKernel/ILockable.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ILockable.h
rename to Control/AthenaKernel/AthenaKernel/ILockable.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ILoggedMessageSvc.h b/Control/AthenaKernel/AthenaKernel/ILoggedMessageSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ILoggedMessageSvc.h
rename to Control/AthenaKernel/AthenaKernel/ILoggedMessageSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IMemoryMonitorSvc.h b/Control/AthenaKernel/AthenaKernel/IMemoryMonitorSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IMemoryMonitorSvc.h
rename to Control/AthenaKernel/AthenaKernel/IMemoryMonitorSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/INextPassFilter.h b/Control/AthenaKernel/AthenaKernel/INextPassFilter.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/INextPassFilter.h
rename to Control/AthenaKernel/AthenaKernel/INextPassFilter.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IOVEntryT.h b/Control/AthenaKernel/AthenaKernel/IOVEntryT.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IOVEntryT.h
rename to Control/AthenaKernel/AthenaKernel/IOVEntryT.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IOVRange.h b/Control/AthenaKernel/AthenaKernel/IOVRange.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IOVRange.h
rename to Control/AthenaKernel/AthenaKernel/IOVRange.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IOVSvcDefs.h b/Control/AthenaKernel/AthenaKernel/IOVSvcDefs.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IOVSvcDefs.h
rename to Control/AthenaKernel/AthenaKernel/IOVSvcDefs.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IOVTime.h b/Control/AthenaKernel/AthenaKernel/IOVTime.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IOVTime.h
rename to Control/AthenaKernel/AthenaKernel/IOVTime.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IPageAccessControlSvc.h b/Control/AthenaKernel/AthenaKernel/IPageAccessControlSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IPageAccessControlSvc.h
rename to Control/AthenaKernel/AthenaKernel/IPageAccessControlSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IProxyDict.h b/Control/AthenaKernel/AthenaKernel/IProxyDict.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IProxyDict.h
rename to Control/AthenaKernel/AthenaKernel/IProxyDict.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IProxyProviderSvc.h b/Control/AthenaKernel/AthenaKernel/IProxyProviderSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IProxyProviderSvc.h
rename to Control/AthenaKernel/AthenaKernel/IProxyProviderSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IProxyRegistry.h b/Control/AthenaKernel/AthenaKernel/IProxyRegistry.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IProxyRegistry.h
rename to Control/AthenaKernel/AthenaKernel/IProxyRegistry.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IRCUSvc.h b/Control/AthenaKernel/AthenaKernel/IRCUSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IRCUSvc.h
rename to Control/AthenaKernel/AthenaKernel/IRCUSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IRegistrationStreamTool.h b/Control/AthenaKernel/AthenaKernel/IRegistrationStreamTool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IRegistrationStreamTool.h
rename to Control/AthenaKernel/AthenaKernel/IRegistrationStreamTool.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IResetable.h b/Control/AthenaKernel/AthenaKernel/IResetable.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IResetable.h
rename to Control/AthenaKernel/AthenaKernel/IResetable.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ISlimmingHdlr.h b/Control/AthenaKernel/AthenaKernel/ISlimmingHdlr.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ISlimmingHdlr.h
rename to Control/AthenaKernel/AthenaKernel/ISlimmingHdlr.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IStringPool.h b/Control/AthenaKernel/AthenaKernel/IStringPool.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IStringPool.h
rename to Control/AthenaKernel/AthenaKernel/IStringPool.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ITPCnvBase.h b/Control/AthenaKernel/AthenaKernel/ITPCnvBase.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ITPCnvBase.h
rename to Control/AthenaKernel/AthenaKernel/ITPCnvBase.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ITPCnvSvc.h b/Control/AthenaKernel/AthenaKernel/ITPCnvSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ITPCnvSvc.h
rename to Control/AthenaKernel/AthenaKernel/ITPCnvSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IThinningHdlr.h b/Control/AthenaKernel/AthenaKernel/IThinningHdlr.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IThinningHdlr.h
rename to Control/AthenaKernel/AthenaKernel/IThinningHdlr.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IThinningSvc.h b/Control/AthenaKernel/AthenaKernel/IThinningSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IThinningSvc.h
rename to Control/AthenaKernel/AthenaKernel/IThinningSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ITimeKeeper.h b/Control/AthenaKernel/AthenaKernel/ITimeKeeper.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ITimeKeeper.h
rename to Control/AthenaKernel/AthenaKernel/ITimeKeeper.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/ITriggerTime.h b/Control/AthenaKernel/AthenaKernel/ITriggerTime.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/ITriggerTime.h
rename to Control/AthenaKernel/AthenaKernel/ITriggerTime.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IUserDataSvc.h b/Control/AthenaKernel/AthenaKernel/IUserDataSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IUserDataSvc.h
rename to Control/AthenaKernel/AthenaKernel/IUserDataSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h b/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h
rename to Control/AthenaKernel/AthenaKernel/IValgrindSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/MsgStreamMember.h b/Control/AthenaKernel/AthenaKernel/MsgStreamMember.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/MsgStreamMember.h
rename to Control/AthenaKernel/AthenaKernel/MsgStreamMember.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/POSIXTimeKeeper.h b/Control/AthenaKernel/AthenaKernel/POSIXTimeKeeper.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/POSIXTimeKeeper.h
rename to Control/AthenaKernel/AthenaKernel/POSIXTimeKeeper.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/RCUObject.h b/Control/AthenaKernel/AthenaKernel/RCUObject.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/RCUObject.h
rename to Control/AthenaKernel/AthenaKernel/RCUObject.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/RCUObject.icc b/Control/AthenaKernel/AthenaKernel/RCUObject.icc
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/RCUObject.icc
rename to Control/AthenaKernel/AthenaKernel/RCUObject.icc
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/StoreID.h b/Control/AthenaKernel/AthenaKernel/StoreID.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/StoreID.h
rename to Control/AthenaKernel/AthenaKernel/StoreID.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/TPCnvFactory.h b/Control/AthenaKernel/AthenaKernel/TPCnvFactory.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/TPCnvFactory.h
rename to Control/AthenaKernel/AthenaKernel/TPCnvFactory.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/TimeKeeper.h b/Control/AthenaKernel/AthenaKernel/TimeKeeper.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/TimeKeeper.h
rename to Control/AthenaKernel/AthenaKernel/TimeKeeper.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/Timeout.h b/Control/AthenaKernel/AthenaKernel/Timeout.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/Timeout.h
rename to Control/AthenaKernel/AthenaKernel/Timeout.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/Units.h b/Control/AthenaKernel/AthenaKernel/Units.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/Units.h
rename to Control/AthenaKernel/AthenaKernel/Units.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/errorcheck.h b/Control/AthenaKernel/AthenaKernel/errorcheck.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/errorcheck.h
rename to Control/AthenaKernel/AthenaKernel/errorcheck.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/getMessageSvc.h b/Control/AthenaKernel/AthenaKernel/getMessageSvc.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/getMessageSvc.h
rename to Control/AthenaKernel/AthenaKernel/getMessageSvc.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/selection.xml b/Control/AthenaKernel/AthenaKernel/selection.xml
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/selection.xml
rename to Control/AthenaKernel/AthenaKernel/selection.xml
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/sgkey_t.h b/Control/AthenaKernel/AthenaKernel/sgkey_t.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/sgkey_t.h
rename to Control/AthenaKernel/AthenaKernel/sgkey_t.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/tools/AthenaPackageInfo.h b/Control/AthenaKernel/AthenaKernel/tools/AthenaPackageInfo.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/tools/AthenaPackageInfo.h
rename to Control/AthenaKernel/AthenaKernel/tools/AthenaPackageInfo.h
diff --git a/EDM/calypso/Control/AthenaKernel/AthenaKernel/tools/type_tools.h b/Control/AthenaKernel/AthenaKernel/tools/type_tools.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/AthenaKernel/tools/type_tools.h
rename to Control/AthenaKernel/AthenaKernel/tools/type_tools.h
diff --git a/EDM/calypso/Control/AthenaKernel/CMakeLists.txt b/Control/AthenaKernel/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/CMakeLists.txt
rename to Control/AthenaKernel/CMakeLists.txt
diff --git a/EDM/calypso/Control/AthenaKernel/cmt/requirements b/Control/AthenaKernel/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/cmt/requirements
rename to Control/AthenaKernel/cmt/requirements
diff --git a/EDM/calypso/Control/AthenaKernel/doc/MainPage.h b/Control/AthenaKernel/doc/MainPage.h
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/doc/MainPage.h
rename to Control/AthenaKernel/doc/MainPage.h
diff --git a/EDM/calypso/Control/AthenaKernel/share/AthenaPackageInfo_test.ref b/Control/AthenaKernel/share/AthenaPackageInfo_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/AthenaPackageInfo_test.ref
rename to Control/AthenaKernel/share/AthenaPackageInfo_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/Chrono_test.ref b/Control/AthenaKernel/share/Chrono_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/Chrono_test.ref
rename to Control/AthenaKernel/share/Chrono_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/DataObjectSharedPtr_test.ref b/Control/AthenaKernel/share/DataObjectSharedPtr_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/DataObjectSharedPtr_test.ref
rename to Control/AthenaKernel/share/DataObjectSharedPtr_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/DirSearchPath_test.ref b/Control/AthenaKernel/share/DirSearchPath_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/DirSearchPath_test.ref
rename to Control/AthenaKernel/share/DirSearchPath_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/IRCUSvc_test.ref b/Control/AthenaKernel/share/IRCUSvc_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/IRCUSvc_test.ref
rename to Control/AthenaKernel/share/IRCUSvc_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/MsgStreamMember_test.ref b/Control/AthenaKernel/share/MsgStreamMember_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/MsgStreamMember_test.ref
rename to Control/AthenaKernel/share/MsgStreamMember_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/RCUObject_test.ref b/Control/AthenaKernel/share/RCUObject_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/RCUObject_test.ref
rename to Control/AthenaKernel/share/RCUObject_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/Units_test.ref b/Control/AthenaKernel/share/Units_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/Units_test.ref
rename to Control/AthenaKernel/share/Units_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/errorcheck_test.ref b/Control/AthenaKernel/share/errorcheck_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/errorcheck_test.ref
rename to Control/AthenaKernel/share/errorcheck_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/getMessageSvc_test.ref b/Control/AthenaKernel/share/getMessageSvc_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/getMessageSvc_test.ref
rename to Control/AthenaKernel/share/getMessageSvc_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/share/type_tools_test.ref b/Control/AthenaKernel/share/type_tools_test.ref
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/share/type_tools_test.ref
rename to Control/AthenaKernel/share/type_tools_test.ref
diff --git a/EDM/calypso/Control/AthenaKernel/src/AddressProviderSvc.cxx b/Control/AthenaKernel/src/AddressProviderSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/AddressProviderSvc.cxx
rename to Control/AthenaKernel/src/AddressProviderSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/AlgorithmTimer.cxx b/Control/AthenaKernel/src/AlgorithmTimer.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/AlgorithmTimer.cxx
rename to Control/AthenaKernel/src/AlgorithmTimer.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/AthDsoUtils.cxx b/Control/AthenaKernel/src/AthDsoUtils.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/AthDsoUtils.cxx
rename to Control/AthenaKernel/src/AthDsoUtils.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/AthenaPackageInfo.cxx b/Control/AthenaKernel/src/AthenaPackageInfo.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/AthenaPackageInfo.cxx
rename to Control/AthenaKernel/src/AthenaPackageInfo.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/CloneService.cxx b/Control/AthenaKernel/src/CloneService.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/CloneService.cxx
rename to Control/AthenaKernel/src/CloneService.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/CloneTool.cxx b/Control/AthenaKernel/src/CloneTool.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/CloneTool.cxx
rename to Control/AthenaKernel/src/CloneTool.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/DsoDb.cxx b/Control/AthenaKernel/src/DsoDb.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/DsoDb.cxx
rename to Control/AthenaKernel/src/DsoDb.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IAtRndmGenSvc.cxx b/Control/AthenaKernel/src/IAtRndmGenSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IAtRndmGenSvc.cxx
rename to Control/AthenaKernel/src/IAtRndmGenSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IAthenaBarCode.cxx b/Control/AthenaKernel/src/IAthenaBarCode.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IAthenaBarCode.cxx
rename to Control/AthenaKernel/src/IAthenaBarCode.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IAthenaIPCTool.cxx b/Control/AthenaKernel/src/IAthenaIPCTool.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IAthenaIPCTool.cxx
rename to Control/AthenaKernel/src/IAthenaIPCTool.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IAthenaSerializeSvc.cxx b/Control/AthenaKernel/src/IAthenaSerializeSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IAthenaSerializeSvc.cxx
rename to Control/AthenaKernel/src/IAthenaSerializeSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IAthenaSummarySvc.cxx b/Control/AthenaKernel/src/IAthenaSummarySvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IAthenaSummarySvc.cxx
rename to Control/AthenaKernel/src/IAthenaSummarySvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/ICutFlowSvc.cxx b/Control/AthenaKernel/src/ICutFlowSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/ICutFlowSvc.cxx
rename to Control/AthenaKernel/src/ICutFlowSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IDataShare.cxx b/Control/AthenaKernel/src/IDataShare.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IDataShare.cxx
rename to Control/AthenaKernel/src/IDataShare.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IDecisionSvc.cxx b/Control/AthenaKernel/src/IDecisionSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IDecisionSvc.cxx
rename to Control/AthenaKernel/src/IDecisionSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IDictLoaderSvc.cxx b/Control/AthenaKernel/src/IDictLoaderSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IDictLoaderSvc.cxx
rename to Control/AthenaKernel/src/IDictLoaderSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IEventShare.cxx b/Control/AthenaKernel/src/IEventShare.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IEventShare.cxx
rename to Control/AthenaKernel/src/IEventShare.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IEvtIdModifierSvc.cxx b/Control/AthenaKernel/src/IEvtIdModifierSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IEvtIdModifierSvc.cxx
rename to Control/AthenaKernel/src/IEvtIdModifierSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IItemListSvc.cxx b/Control/AthenaKernel/src/IItemListSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IItemListSvc.cxx
rename to Control/AthenaKernel/src/IItemListSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IJobIDSvc.cxx b/Control/AthenaKernel/src/IJobIDSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IJobIDSvc.cxx
rename to Control/AthenaKernel/src/IJobIDSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/ILoggedMessageSvc.cxx b/Control/AthenaKernel/src/ILoggedMessageSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/ILoggedMessageSvc.cxx
rename to Control/AthenaKernel/src/ILoggedMessageSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IOVRange.cxx b/Control/AthenaKernel/src/IOVRange.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IOVRange.cxx
rename to Control/AthenaKernel/src/IOVRange.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IOVTime.cxx b/Control/AthenaKernel/src/IOVTime.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IOVTime.cxx
rename to Control/AthenaKernel/src/IOVTime.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IProxyDict.cxx b/Control/AthenaKernel/src/IProxyDict.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IProxyDict.cxx
rename to Control/AthenaKernel/src/IProxyDict.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/ISlimmingHdlr.cxx b/Control/AthenaKernel/src/ISlimmingHdlr.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/ISlimmingHdlr.cxx
rename to Control/AthenaKernel/src/ISlimmingHdlr.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/ITPCnvBase.cxx b/Control/AthenaKernel/src/ITPCnvBase.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/ITPCnvBase.cxx
rename to Control/AthenaKernel/src/ITPCnvBase.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/ITPCnvSvc.cxx b/Control/AthenaKernel/src/ITPCnvSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/ITPCnvSvc.cxx
rename to Control/AthenaKernel/src/ITPCnvSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IThinningHdlr.cxx b/Control/AthenaKernel/src/IThinningHdlr.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IThinningHdlr.cxx
rename to Control/AthenaKernel/src/IThinningHdlr.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IThinningSvc.cxx b/Control/AthenaKernel/src/IThinningSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IThinningSvc.cxx
rename to Control/AthenaKernel/src/IThinningSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/ITimeKeeper.cxx b/Control/AthenaKernel/src/ITimeKeeper.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/ITimeKeeper.cxx
rename to Control/AthenaKernel/src/ITimeKeeper.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/IValgrindSvc.cxx b/Control/AthenaKernel/src/IValgrindSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/IValgrindSvc.cxx
rename to Control/AthenaKernel/src/IValgrindSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/MsgStreamMember.cxx b/Control/AthenaKernel/src/MsgStreamMember.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/MsgStreamMember.cxx
rename to Control/AthenaKernel/src/MsgStreamMember.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/POSIXTimeKeeper.cxx b/Control/AthenaKernel/src/POSIXTimeKeeper.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/POSIXTimeKeeper.cxx
rename to Control/AthenaKernel/src/POSIXTimeKeeper.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/RCUObject.cxx b/Control/AthenaKernel/src/RCUObject.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/RCUObject.cxx
rename to Control/AthenaKernel/src/RCUObject.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/TimeKeeper.cxx b/Control/AthenaKernel/src/TimeKeeper.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/TimeKeeper.cxx
rename to Control/AthenaKernel/src/TimeKeeper.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/errorcheck.cxx b/Control/AthenaKernel/src/errorcheck.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/errorcheck.cxx
rename to Control/AthenaKernel/src/errorcheck.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/getMessageSvc.cxx b/Control/AthenaKernel/src/getMessageSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/getMessageSvc.cxx
rename to Control/AthenaKernel/src/getMessageSvc.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/src/ubsan_boost_suppress.cxx b/Control/AthenaKernel/src/ubsan_boost_suppress.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/src/ubsan_boost_suppress.cxx
rename to Control/AthenaKernel/src/ubsan_boost_suppress.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/AthenaKernel.xml b/Control/AthenaKernel/test/AthenaKernel.xml
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/AthenaKernel.xml
rename to Control/AthenaKernel/test/AthenaKernel.xml
diff --git a/EDM/calypso/Control/AthenaKernel/test/AthenaPackageInfo_test.cxx b/Control/AthenaKernel/test/AthenaPackageInfo_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/AthenaPackageInfo_test.cxx
rename to Control/AthenaKernel/test/AthenaPackageInfo_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/Chrono_test.cxx b/Control/AthenaKernel/test/Chrono_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/Chrono_test.cxx
rename to Control/AthenaKernel/test/Chrono_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/DataObjectSharedPtr_test.cxx b/Control/AthenaKernel/test/DataObjectSharedPtr_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/DataObjectSharedPtr_test.cxx
rename to Control/AthenaKernel/test/DataObjectSharedPtr_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/DirSearchPath_test.cxx b/Control/AthenaKernel/test/DirSearchPath_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/DirSearchPath_test.cxx
rename to Control/AthenaKernel/test/DirSearchPath_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/IRCUSvc_test.cxx b/Control/AthenaKernel/test/IRCUSvc_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/IRCUSvc_test.cxx
rename to Control/AthenaKernel/test/IRCUSvc_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/MsgStreamMember_test.cxx b/Control/AthenaKernel/test/MsgStreamMember_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/MsgStreamMember_test.cxx
rename to Control/AthenaKernel/test/MsgStreamMember_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/RCUObject_test.cxx b/Control/AthenaKernel/test/RCUObject_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/RCUObject_test.cxx
rename to Control/AthenaKernel/test/RCUObject_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/Units_test.cxx b/Control/AthenaKernel/test/Units_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/Units_test.cxx
rename to Control/AthenaKernel/test/Units_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/errorcheck_test.cxx b/Control/AthenaKernel/test/errorcheck_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/errorcheck_test.cxx
rename to Control/AthenaKernel/test/errorcheck_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/getMessageSvc_test.cxx b/Control/AthenaKernel/test/getMessageSvc_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/getMessageSvc_test.cxx
rename to Control/AthenaKernel/test/getMessageSvc_test.cxx
diff --git a/EDM/calypso/Control/AthenaKernel/test/type_tools_test.cxx b/Control/AthenaKernel/test/type_tools_test.cxx
similarity index 100%
rename from EDM/calypso/Control/AthenaKernel/test/type_tools_test.cxx
rename to Control/AthenaKernel/test/type_tools_test.cxx
diff --git a/EDM/calypso/Control/CLIDComps/CMakeLists.txt b/Control/CLIDComps/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/CMakeLists.txt
rename to Control/CLIDComps/CMakeLists.txt
diff --git a/EDM/calypso/Control/CLIDComps/cmt/requirements b/Control/CLIDComps/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/cmt/requirements
rename to Control/CLIDComps/cmt/requirements
diff --git a/EDM/calypso/Control/CLIDComps/python/__init__.py b/Control/CLIDComps/python/__init__.py
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/python/__init__.py
rename to Control/CLIDComps/python/__init__.py
diff --git a/EDM/calypso/Control/CLIDComps/python/clidGenerator.py b/Control/CLIDComps/python/clidGenerator.py
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/python/clidGenerator.py
rename to Control/CLIDComps/python/clidGenerator.py
diff --git a/EDM/calypso/Control/CLIDComps/share/ClassIDSvc_test.ref b/Control/CLIDComps/share/ClassIDSvc_test.ref
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/share/ClassIDSvc_test.ref
rename to Control/CLIDComps/share/ClassIDSvc_test.ref
diff --git a/EDM/calypso/Control/CLIDComps/share/ClassIDSvc_test.txt b/Control/CLIDComps/share/ClassIDSvc_test.txt
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/share/ClassIDSvc_test.txt
rename to Control/CLIDComps/share/ClassIDSvc_test.txt
diff --git a/EDM/calypso/Control/CLIDComps/share/Gaudi_clid.db b/Control/CLIDComps/share/Gaudi_clid.db
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/share/Gaudi_clid.db
rename to Control/CLIDComps/share/Gaudi_clid.db
diff --git a/EDM/calypso/Control/CLIDComps/share/PYTHONSTARTUP b/Control/CLIDComps/share/PYTHONSTARTUP
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/share/PYTHONSTARTUP
rename to Control/CLIDComps/share/PYTHONSTARTUP
diff --git a/EDM/calypso/Control/CLIDComps/share/clid b/Control/CLIDComps/share/clid
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/share/clid
rename to Control/CLIDComps/share/clid
diff --git a/EDM/calypso/Control/CLIDComps/share/cvs2cliddb.csh b/Control/CLIDComps/share/cvs2cliddb.csh
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/share/cvs2cliddb.csh
rename to Control/CLIDComps/share/cvs2cliddb.csh
diff --git a/EDM/calypso/Control/CLIDComps/share/minimalPrintout.opts b/Control/CLIDComps/share/minimalPrintout.opts
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/share/minimalPrintout.opts
rename to Control/CLIDComps/share/minimalPrintout.opts
diff --git a/EDM/calypso/Control/CLIDComps/src/ClassIDSvc.cxx b/Control/CLIDComps/src/ClassIDSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/src/ClassIDSvc.cxx
rename to Control/CLIDComps/src/ClassIDSvc.cxx
diff --git a/EDM/calypso/Control/CLIDComps/src/ClassIDSvc.h b/Control/CLIDComps/src/ClassIDSvc.h
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/src/ClassIDSvc.h
rename to Control/CLIDComps/src/ClassIDSvc.h
diff --git a/EDM/calypso/Control/CLIDComps/src/components/CLIDComps_entries.cxx b/Control/CLIDComps/src/components/CLIDComps_entries.cxx
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/src/components/CLIDComps_entries.cxx
rename to Control/CLIDComps/src/components/CLIDComps_entries.cxx
diff --git a/EDM/calypso/Control/CLIDComps/src/components/CLIDComps_load.cxx b/Control/CLIDComps/src/components/CLIDComps_load.cxx
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/src/components/CLIDComps_load.cxx
rename to Control/CLIDComps/src/components/CLIDComps_load.cxx
diff --git a/EDM/calypso/Control/CLIDComps/test/CLIDComps.xml b/Control/CLIDComps/test/CLIDComps.xml
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/test/CLIDComps.xml
rename to Control/CLIDComps/test/CLIDComps.xml
diff --git a/EDM/calypso/Control/CLIDComps/test/ClassIDSvc_test.cxx b/Control/CLIDComps/test/ClassIDSvc_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/test/ClassIDSvc_test.cxx
rename to Control/CLIDComps/test/ClassIDSvc_test.cxx
diff --git a/EDM/calypso/Control/CLIDComps/test/_clid_unittest.py b/Control/CLIDComps/test/_clid_unittest.py
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/test/_clid_unittest.py
rename to Control/CLIDComps/test/_clid_unittest.py
diff --git a/EDM/calypso/Control/CLIDComps/util/genCLIDDB.cxx b/Control/CLIDComps/util/genCLIDDB.cxx
similarity index 100%
rename from EDM/calypso/Control/CLIDComps/util/genCLIDDB.cxx
rename to Control/CLIDComps/util/genCLIDDB.cxx
diff --git a/EDM/calypso/Control/CxxUtils/CMakeLists.txt b/Control/CxxUtils/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CMakeLists.txt
rename to Control/CxxUtils/CMakeLists.txt
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/Array.h b/Control/CxxUtils/CxxUtils/Array.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/Array.h
rename to Control/CxxUtils/CxxUtils/Array.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/Array.icc b/Control/CxxUtils/CxxUtils/Array.icc
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/Array.icc
rename to Control/CxxUtils/CxxUtils/Array.icc
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/ArrayScanner.h b/Control/CxxUtils/CxxUtils/ArrayScanner.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/ArrayScanner.h
rename to Control/CxxUtils/CxxUtils/ArrayScanner.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/ArrayScanner.icc b/Control/CxxUtils/CxxUtils/ArrayScanner.icc
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/ArrayScanner.icc
rename to Control/CxxUtils/CxxUtils/ArrayScanner.icc
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/Arrayrep.h b/Control/CxxUtils/CxxUtils/Arrayrep.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/Arrayrep.h
rename to Control/CxxUtils/CxxUtils/Arrayrep.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/AthDsoCbk.h b/Control/CxxUtils/CxxUtils/AthDsoCbk.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/AthDsoCbk.h
rename to Control/CxxUtils/CxxUtils/AthDsoCbk.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/AthUnlikelyMacros.h b/Control/CxxUtils/CxxUtils/AthUnlikelyMacros.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/AthUnlikelyMacros.h
rename to Control/CxxUtils/CxxUtils/AthUnlikelyMacros.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/BasicTypes.h b/Control/CxxUtils/CxxUtils/BasicTypes.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/BasicTypes.h
rename to Control/CxxUtils/CxxUtils/BasicTypes.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/BitPacker.h b/Control/CxxUtils/CxxUtils/BitPacker.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/BitPacker.h
rename to Control/CxxUtils/CxxUtils/BitPacker.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/BitPacker.icc b/Control/CxxUtils/CxxUtils/BitPacker.icc
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/BitPacker.icc
rename to Control/CxxUtils/CxxUtils/BitPacker.icc
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/BitUnpacker.h b/Control/CxxUtils/CxxUtils/BitUnpacker.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/BitUnpacker.h
rename to Control/CxxUtils/CxxUtils/BitUnpacker.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/BitUnpacker.icc b/Control/CxxUtils/CxxUtils/BitUnpacker.icc
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/BitUnpacker.icc
rename to Control/CxxUtils/CxxUtils/BitUnpacker.icc
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/ClassName.h b/Control/CxxUtils/CxxUtils/ClassName.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/ClassName.h
rename to Control/CxxUtils/CxxUtils/ClassName.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/FloatPacker.h b/Control/CxxUtils/CxxUtils/FloatPacker.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/FloatPacker.h
rename to Control/CxxUtils/CxxUtils/FloatPacker.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/MD5.h b/Control/CxxUtils/CxxUtils/MD5.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/MD5.h
rename to Control/CxxUtils/CxxUtils/MD5.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/PackedArray.h b/Control/CxxUtils/CxxUtils/PackedArray.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/PackedArray.h
rename to Control/CxxUtils/CxxUtils/PackedArray.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/PageAccessControl.h b/Control/CxxUtils/CxxUtils/PageAccessControl.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/PageAccessControl.h
rename to Control/CxxUtils/CxxUtils/PageAccessControl.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/PtrAccessSEGVHandler.h b/Control/CxxUtils/CxxUtils/PtrAccessSEGVHandler.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/PtrAccessSEGVHandler.h
rename to Control/CxxUtils/CxxUtils/PtrAccessSEGVHandler.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/SealCommon.h b/Control/CxxUtils/CxxUtils/SealCommon.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/SealCommon.h
rename to Control/CxxUtils/CxxUtils/SealCommon.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/SealDebug.h b/Control/CxxUtils/CxxUtils/SealDebug.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/SealDebug.h
rename to Control/CxxUtils/CxxUtils/SealDebug.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/SealSharedLib.h b/Control/CxxUtils/CxxUtils/SealSharedLib.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/SealSharedLib.h
rename to Control/CxxUtils/CxxUtils/SealSharedLib.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/SealSignal.h b/Control/CxxUtils/CxxUtils/SealSignal.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/SealSignal.h
rename to Control/CxxUtils/CxxUtils/SealSignal.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/StrFormat.h b/Control/CxxUtils/CxxUtils/StrFormat.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/StrFormat.h
rename to Control/CxxUtils/CxxUtils/StrFormat.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/StringUtils.h b/Control/CxxUtils/CxxUtils/StringUtils.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/StringUtils.h
rename to Control/CxxUtils/CxxUtils/StringUtils.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/algorithms.h b/Control/CxxUtils/CxxUtils/algorithms.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/algorithms.h
rename to Control/CxxUtils/CxxUtils/algorithms.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/bitscan.h b/Control/CxxUtils/CxxUtils/bitscan.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/bitscan.h
rename to Control/CxxUtils/CxxUtils/bitscan.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/cPtrAccessSEGVHandler.h b/Control/CxxUtils/CxxUtils/cPtrAccessSEGVHandler.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/cPtrAccessSEGVHandler.h
rename to Control/CxxUtils/CxxUtils/cPtrAccessSEGVHandler.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/clock.h b/Control/CxxUtils/CxxUtils/clock.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/clock.h
rename to Control/CxxUtils/CxxUtils/clock.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/copy_bounded.h b/Control/CxxUtils/CxxUtils/copy_bounded.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/copy_bounded.h
rename to Control/CxxUtils/CxxUtils/copy_bounded.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/enable_if.h b/Control/CxxUtils/CxxUtils/enable_if.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/enable_if.h
rename to Control/CxxUtils/CxxUtils/enable_if.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/excepts.h b/Control/CxxUtils/CxxUtils/excepts.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/excepts.h
rename to Control/CxxUtils/CxxUtils/excepts.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/exctrace.h b/Control/CxxUtils/CxxUtils/exctrace.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/exctrace.h
rename to Control/CxxUtils/CxxUtils/exctrace.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/final.h b/Control/CxxUtils/CxxUtils/final.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/final.h
rename to Control/CxxUtils/CxxUtils/final.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/fpcompare.h b/Control/CxxUtils/CxxUtils/fpcompare.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/fpcompare.h
rename to Control/CxxUtils/CxxUtils/fpcompare.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/hashtable.h b/Control/CxxUtils/CxxUtils/hashtable.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/hashtable.h
rename to Control/CxxUtils/CxxUtils/hashtable.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/arraylist.h b/Control/CxxUtils/CxxUtils/libcalg/arraylist.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/arraylist.h
rename to Control/CxxUtils/CxxUtils/libcalg/arraylist.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/avl-tree.h b/Control/CxxUtils/CxxUtils/libcalg/avl-tree.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/avl-tree.h
rename to Control/CxxUtils/CxxUtils/libcalg/avl-tree.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/binary-heap.h b/Control/CxxUtils/CxxUtils/libcalg/binary-heap.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/binary-heap.h
rename to Control/CxxUtils/CxxUtils/libcalg/binary-heap.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/binomial-heap.h b/Control/CxxUtils/CxxUtils/libcalg/binomial-heap.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/binomial-heap.h
rename to Control/CxxUtils/CxxUtils/libcalg/binomial-heap.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/bloom-filter.h b/Control/CxxUtils/CxxUtils/libcalg/bloom-filter.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/bloom-filter.h
rename to Control/CxxUtils/CxxUtils/libcalg/bloom-filter.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/compare-int.h b/Control/CxxUtils/CxxUtils/libcalg/compare-int.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/compare-int.h
rename to Control/CxxUtils/CxxUtils/libcalg/compare-int.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/compare-pointer.h b/Control/CxxUtils/CxxUtils/libcalg/compare-pointer.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/compare-pointer.h
rename to Control/CxxUtils/CxxUtils/libcalg/compare-pointer.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/compare-string.h b/Control/CxxUtils/CxxUtils/libcalg/compare-string.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/compare-string.h
rename to Control/CxxUtils/CxxUtils/libcalg/compare-string.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/hash-int.h b/Control/CxxUtils/CxxUtils/libcalg/hash-int.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/hash-int.h
rename to Control/CxxUtils/CxxUtils/libcalg/hash-int.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/hash-pointer.h b/Control/CxxUtils/CxxUtils/libcalg/hash-pointer.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/hash-pointer.h
rename to Control/CxxUtils/CxxUtils/libcalg/hash-pointer.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/hash-string.h b/Control/CxxUtils/CxxUtils/libcalg/hash-string.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/hash-string.h
rename to Control/CxxUtils/CxxUtils/libcalg/hash-string.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/hash-table.h b/Control/CxxUtils/CxxUtils/libcalg/hash-table.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/hash-table.h
rename to Control/CxxUtils/CxxUtils/libcalg/hash-table.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/libcalg.h b/Control/CxxUtils/CxxUtils/libcalg/libcalg.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/libcalg.h
rename to Control/CxxUtils/CxxUtils/libcalg/libcalg.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/list.h b/Control/CxxUtils/CxxUtils/libcalg/list.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/list.h
rename to Control/CxxUtils/CxxUtils/libcalg/list.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/queue.h b/Control/CxxUtils/CxxUtils/libcalg/queue.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/queue.h
rename to Control/CxxUtils/CxxUtils/libcalg/queue.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/set.h b/Control/CxxUtils/CxxUtils/libcalg/set.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/set.h
rename to Control/CxxUtils/CxxUtils/libcalg/set.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/slist.h b/Control/CxxUtils/CxxUtils/libcalg/slist.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/slist.h
rename to Control/CxxUtils/CxxUtils/libcalg/slist.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/trie.h b/Control/CxxUtils/CxxUtils/libcalg/trie.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/libcalg/trie.h
rename to Control/CxxUtils/CxxUtils/libcalg/trie.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/make_unique.h b/Control/CxxUtils/CxxUtils/make_unique.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/make_unique.h
rename to Control/CxxUtils/CxxUtils/make_unique.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/no_conversion_warning.h b/Control/CxxUtils/CxxUtils/no_conversion_warning.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/no_conversion_warning.h
rename to Control/CxxUtils/CxxUtils/no_conversion_warning.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/no_sanitize_undefined.h b/Control/CxxUtils/CxxUtils/no_sanitize_undefined.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/no_sanitize_undefined.h
rename to Control/CxxUtils/CxxUtils/no_sanitize_undefined.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/noreturn.h b/Control/CxxUtils/CxxUtils/noreturn.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/noreturn.h
rename to Control/CxxUtils/CxxUtils/noreturn.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/ones.h b/Control/CxxUtils/CxxUtils/ones.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/ones.h
rename to Control/CxxUtils/CxxUtils/ones.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/override.h b/Control/CxxUtils/CxxUtils/override.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/override.h
rename to Control/CxxUtils/CxxUtils/override.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/page_access.h b/Control/CxxUtils/CxxUtils/page_access.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/page_access.h
rename to Control/CxxUtils/CxxUtils/page_access.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/pointer_list.h b/Control/CxxUtils/CxxUtils/pointer_list.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/pointer_list.h
rename to Control/CxxUtils/CxxUtils/pointer_list.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/pointer_list.icc b/Control/CxxUtils/CxxUtils/pointer_list.icc
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/pointer_list.icc
rename to Control/CxxUtils/CxxUtils/pointer_list.icc
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/prefetch.h b/Control/CxxUtils/CxxUtils/prefetch.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/prefetch.h
rename to Control/CxxUtils/CxxUtils/prefetch.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/procmaps.h b/Control/CxxUtils/CxxUtils/procmaps.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/procmaps.h
rename to Control/CxxUtils/CxxUtils/procmaps.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/read_athena_statm.h b/Control/CxxUtils/CxxUtils/read_athena_statm.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/read_athena_statm.h
rename to Control/CxxUtils/CxxUtils/read_athena_statm.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/sincos.h b/Control/CxxUtils/CxxUtils/sincos.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/sincos.h
rename to Control/CxxUtils/CxxUtils/sincos.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/sincosf.h b/Control/CxxUtils/CxxUtils/sincosf.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/sincosf.h
rename to Control/CxxUtils/CxxUtils/sincosf.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/ubsan_suppress.h b/Control/CxxUtils/CxxUtils/ubsan_suppress.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/ubsan_suppress.h
rename to Control/CxxUtils/CxxUtils/ubsan_suppress.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/unordered_map.h b/Control/CxxUtils/CxxUtils/unordered_map.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/unordered_map.h
rename to Control/CxxUtils/CxxUtils/unordered_map.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/unordered_set.h b/Control/CxxUtils/CxxUtils/unordered_set.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/unordered_set.h
rename to Control/CxxUtils/CxxUtils/unordered_set.h
diff --git a/EDM/calypso/Control/CxxUtils/CxxUtils/unused.h b/Control/CxxUtils/CxxUtils/unused.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/CxxUtils/unused.h
rename to Control/CxxUtils/CxxUtils/unused.h
diff --git a/EDM/calypso/Control/CxxUtils/Root/Array.cxx b/Control/CxxUtils/Root/Array.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/Array.cxx
rename to Control/CxxUtils/Root/Array.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/ArrayScanner.cxx b/Control/CxxUtils/Root/ArrayScanner.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/ArrayScanner.cxx
rename to Control/CxxUtils/Root/ArrayScanner.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/Arrayrep.cxx b/Control/CxxUtils/Root/Arrayrep.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/Arrayrep.cxx
rename to Control/CxxUtils/Root/Arrayrep.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/ClassName.cxx b/Control/CxxUtils/Root/ClassName.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/ClassName.cxx
rename to Control/CxxUtils/Root/ClassName.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/FloatPacker.cxx b/Control/CxxUtils/Root/FloatPacker.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/FloatPacker.cxx
rename to Control/CxxUtils/Root/FloatPacker.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/MD5.cxx b/Control/CxxUtils/Root/MD5.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/MD5.cxx
rename to Control/CxxUtils/Root/MD5.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/PackedArray.cxx b/Control/CxxUtils/Root/PackedArray.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/PackedArray.cxx
rename to Control/CxxUtils/Root/PackedArray.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/PageAccessControl.cxx b/Control/CxxUtils/Root/PageAccessControl.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/PageAccessControl.cxx
rename to Control/CxxUtils/Root/PageAccessControl.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/PtrAccessSEGVHandler.cxx b/Control/CxxUtils/Root/PtrAccessSEGVHandler.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/PtrAccessSEGVHandler.cxx
rename to Control/CxxUtils/Root/PtrAccessSEGVHandler.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/SealDebug.cxx b/Control/CxxUtils/Root/SealDebug.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/SealDebug.cxx
rename to Control/CxxUtils/Root/SealDebug.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/SealSharedLib.cxx b/Control/CxxUtils/Root/SealSharedLib.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/SealSharedLib.cxx
rename to Control/CxxUtils/Root/SealSharedLib.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/SealSignal.cxx b/Control/CxxUtils/Root/SealSignal.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/SealSignal.cxx
rename to Control/CxxUtils/Root/SealSignal.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/StrFormat.cxx b/Control/CxxUtils/Root/StrFormat.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/StrFormat.cxx
rename to Control/CxxUtils/Root/StrFormat.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/StringUtils.cxx b/Control/CxxUtils/Root/StringUtils.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/StringUtils.cxx
rename to Control/CxxUtils/Root/StringUtils.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/StringUtils_aux.h b/Control/CxxUtils/Root/StringUtils_aux.h
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/StringUtils_aux.h
rename to Control/CxxUtils/Root/StringUtils_aux.h
diff --git a/EDM/calypso/Control/CxxUtils/Root/cPtrAccessSEGVHandler.cxx b/Control/CxxUtils/Root/cPtrAccessSEGVHandler.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/cPtrAccessSEGVHandler.cxx
rename to Control/CxxUtils/Root/cPtrAccessSEGVHandler.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/clock.cxx b/Control/CxxUtils/Root/clock.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/clock.cxx
rename to Control/CxxUtils/Root/clock.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/excepts.cxx b/Control/CxxUtils/Root/excepts.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/excepts.cxx
rename to Control/CxxUtils/Root/excepts.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/exctrace.cxx b/Control/CxxUtils/Root/exctrace.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/exctrace.cxx
rename to Control/CxxUtils/Root/exctrace.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/hashtable.cxx b/Control/CxxUtils/Root/hashtable.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/hashtable.cxx
rename to Control/CxxUtils/Root/hashtable.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/page_access.cxx b/Control/CxxUtils/Root/page_access.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/page_access.cxx
rename to Control/CxxUtils/Root/page_access.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/pointer_list.cxx b/Control/CxxUtils/Root/pointer_list.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/pointer_list.cxx
rename to Control/CxxUtils/Root/pointer_list.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/procmaps.cxx b/Control/CxxUtils/Root/procmaps.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/procmaps.cxx
rename to Control/CxxUtils/Root/procmaps.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/read_athena_statm.cxx b/Control/CxxUtils/Root/read_athena_statm.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/read_athena_statm.cxx
rename to Control/CxxUtils/Root/read_athena_statm.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/sincosf.cxx b/Control/CxxUtils/Root/sincosf.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/sincosf.cxx
rename to Control/CxxUtils/Root/sincosf.cxx
diff --git a/EDM/calypso/Control/CxxUtils/Root/ubsan_suppress.cxx b/Control/CxxUtils/Root/ubsan_suppress.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/Root/ubsan_suppress.cxx
rename to Control/CxxUtils/Root/ubsan_suppress.cxx
diff --git a/EDM/calypso/Control/CxxUtils/cmt/Makefile.RootCore b/Control/CxxUtils/cmt/Makefile.RootCore
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/cmt/Makefile.RootCore
rename to Control/CxxUtils/cmt/Makefile.RootCore
diff --git a/EDM/calypso/Control/CxxUtils/cmt/requirements b/Control/CxxUtils/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/cmt/requirements
rename to Control/CxxUtils/cmt/requirements
diff --git a/EDM/calypso/Control/CxxUtils/ispellwords b/Control/CxxUtils/ispellwords
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/ispellwords
rename to Control/CxxUtils/ispellwords
diff --git a/EDM/calypso/Control/CxxUtils/share/ArrayScanner_test.ref b/Control/CxxUtils/share/ArrayScanner_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/ArrayScanner_test.ref
rename to Control/CxxUtils/share/ArrayScanner_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/Array_test.ref b/Control/CxxUtils/share/Array_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/Array_test.ref
rename to Control/CxxUtils/share/Array_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/Arrayrep_test.ref b/Control/CxxUtils/share/Arrayrep_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/Arrayrep_test.ref
rename to Control/CxxUtils/share/Arrayrep_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/BitPackerUnpacker_test.ref b/Control/CxxUtils/share/BitPackerUnpacker_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/BitPackerUnpacker_test.ref
rename to Control/CxxUtils/share/BitPackerUnpacker_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/ClassName_test.ref b/Control/CxxUtils/share/ClassName_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/ClassName_test.ref
rename to Control/CxxUtils/share/ClassName_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/FloatPacker_test.ref b/Control/CxxUtils/share/FloatPacker_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/FloatPacker_test.ref
rename to Control/CxxUtils/share/FloatPacker_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/PackedArray_test.ref b/Control/CxxUtils/share/PackedArray_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/PackedArray_test.ref
rename to Control/CxxUtils/share/PackedArray_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/PageAccessControl_test.ref b/Control/CxxUtils/share/PageAccessControl_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/PageAccessControl_test.ref
rename to Control/CxxUtils/share/PageAccessControl_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/SEGVHandler_test.ref b/Control/CxxUtils/share/SEGVHandler_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/SEGVHandler_test.ref
rename to Control/CxxUtils/share/SEGVHandler_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/StrFormat_test.ref b/Control/CxxUtils/share/StrFormat_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/StrFormat_test.ref
rename to Control/CxxUtils/share/StrFormat_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/copy_bounded_test.ref b/Control/CxxUtils/share/copy_bounded_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/copy_bounded_test.ref
rename to Control/CxxUtils/share/copy_bounded_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/copyif_test.ref b/Control/CxxUtils/share/copyif_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/copyif_test.ref
rename to Control/CxxUtils/share/copyif_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/exctrace1_test.ref b/Control/CxxUtils/share/exctrace1_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/exctrace1_test.ref
rename to Control/CxxUtils/share/exctrace1_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/exctrace2_test.ref b/Control/CxxUtils/share/exctrace2_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/exctrace2_test.ref
rename to Control/CxxUtils/share/exctrace2_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/fpcompare_test.ref b/Control/CxxUtils/share/fpcompare_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/fpcompare_test.ref
rename to Control/CxxUtils/share/fpcompare_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/hashtable_test.ref b/Control/CxxUtils/share/hashtable_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/hashtable_test.ref
rename to Control/CxxUtils/share/hashtable_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/make_unique_test.ref b/Control/CxxUtils/share/make_unique_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/make_unique_test.ref
rename to Control/CxxUtils/share/make_unique_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/ones_test.ref b/Control/CxxUtils/share/ones_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/ones_test.ref
rename to Control/CxxUtils/share/ones_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/pointer_list_test.ref b/Control/CxxUtils/share/pointer_list_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/pointer_list_test.ref
rename to Control/CxxUtils/share/pointer_list_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/prefetch_test.ref b/Control/CxxUtils/share/prefetch_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/prefetch_test.ref
rename to Control/CxxUtils/share/prefetch_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/procmaps_test.ref b/Control/CxxUtils/share/procmaps_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/procmaps_test.ref
rename to Control/CxxUtils/share/procmaps_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/read_athena_statm_test.ref b/Control/CxxUtils/share/read_athena_statm_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/read_athena_statm_test.ref
rename to Control/CxxUtils/share/read_athena_statm_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/sincos_test.ref b/Control/CxxUtils/share/sincos_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/sincos_test.ref
rename to Control/CxxUtils/share/sincos_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/stacktrace_test.ref b/Control/CxxUtils/share/stacktrace_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/stacktrace_test.ref
rename to Control/CxxUtils/share/stacktrace_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/stringformconvert_test.ref b/Control/CxxUtils/share/stringformconvert_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/stringformconvert_test.ref
rename to Control/CxxUtils/share/stringformconvert_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/share/utf8trim_test.ref b/Control/CxxUtils/share/utf8trim_test.ref
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/share/utf8trim_test.ref
rename to Control/CxxUtils/share/utf8trim_test.ref
diff --git a/EDM/calypso/Control/CxxUtils/src/AthDsoCbk.c b/Control/CxxUtils/src/AthDsoCbk.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/AthDsoCbk.c
rename to Control/CxxUtils/src/AthDsoCbk.c
diff --git a/EDM/calypso/Control/CxxUtils/src/exctrace/exctrace_collector.cxx b/Control/CxxUtils/src/exctrace/exctrace_collector.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/exctrace/exctrace_collector.cxx
rename to Control/CxxUtils/src/exctrace/exctrace_collector.cxx
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/arraylist.c b/Control/CxxUtils/src/libcalg/arraylist.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/arraylist.c
rename to Control/CxxUtils/src/libcalg/arraylist.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/avl-tree.c b/Control/CxxUtils/src/libcalg/avl-tree.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/avl-tree.c
rename to Control/CxxUtils/src/libcalg/avl-tree.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/binary-heap.c b/Control/CxxUtils/src/libcalg/binary-heap.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/binary-heap.c
rename to Control/CxxUtils/src/libcalg/binary-heap.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/binomial-heap.c b/Control/CxxUtils/src/libcalg/binomial-heap.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/binomial-heap.c
rename to Control/CxxUtils/src/libcalg/binomial-heap.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/bloom-filter.c b/Control/CxxUtils/src/libcalg/bloom-filter.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/bloom-filter.c
rename to Control/CxxUtils/src/libcalg/bloom-filter.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/compare-int.c b/Control/CxxUtils/src/libcalg/compare-int.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/compare-int.c
rename to Control/CxxUtils/src/libcalg/compare-int.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/compare-pointer.c b/Control/CxxUtils/src/libcalg/compare-pointer.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/compare-pointer.c
rename to Control/CxxUtils/src/libcalg/compare-pointer.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/compare-string.c b/Control/CxxUtils/src/libcalg/compare-string.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/compare-string.c
rename to Control/CxxUtils/src/libcalg/compare-string.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/hash-int.c b/Control/CxxUtils/src/libcalg/hash-int.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/hash-int.c
rename to Control/CxxUtils/src/libcalg/hash-int.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/hash-pointer.c b/Control/CxxUtils/src/libcalg/hash-pointer.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/hash-pointer.c
rename to Control/CxxUtils/src/libcalg/hash-pointer.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/hash-string.c b/Control/CxxUtils/src/libcalg/hash-string.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/hash-string.c
rename to Control/CxxUtils/src/libcalg/hash-string.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/hash-table.c b/Control/CxxUtils/src/libcalg/hash-table.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/hash-table.c
rename to Control/CxxUtils/src/libcalg/hash-table.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/list.c b/Control/CxxUtils/src/libcalg/list.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/list.c
rename to Control/CxxUtils/src/libcalg/list.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/queue.c b/Control/CxxUtils/src/libcalg/queue.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/queue.c
rename to Control/CxxUtils/src/libcalg/queue.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/set.c b/Control/CxxUtils/src/libcalg/set.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/set.c
rename to Control/CxxUtils/src/libcalg/set.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/slist.c b/Control/CxxUtils/src/libcalg/slist.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/slist.c
rename to Control/CxxUtils/src/libcalg/slist.c
diff --git a/EDM/calypso/Control/CxxUtils/src/libcalg/trie.c b/Control/CxxUtils/src/libcalg/trie.c
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/src/libcalg/trie.c
rename to Control/CxxUtils/src/libcalg/trie.c
diff --git a/EDM/calypso/Control/CxxUtils/test/ArrayScanner_test.cxx b/Control/CxxUtils/test/ArrayScanner_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/ArrayScanner_test.cxx
rename to Control/CxxUtils/test/ArrayScanner_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/Array_test.cxx b/Control/CxxUtils/test/Array_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/Array_test.cxx
rename to Control/CxxUtils/test/Array_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/Arrayrep_test.cxx b/Control/CxxUtils/test/Arrayrep_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/Arrayrep_test.cxx
rename to Control/CxxUtils/test/Arrayrep_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/BitPackerUnpacker_test.cxx b/Control/CxxUtils/test/BitPackerUnpacker_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/BitPackerUnpacker_test.cxx
rename to Control/CxxUtils/test/BitPackerUnpacker_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/ClassName_test.cxx b/Control/CxxUtils/test/ClassName_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/ClassName_test.cxx
rename to Control/CxxUtils/test/ClassName_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/CxxUtils.xml b/Control/CxxUtils/test/CxxUtils.xml
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/CxxUtils.xml
rename to Control/CxxUtils/test/CxxUtils.xml
diff --git a/EDM/calypso/Control/CxxUtils/test/FloatPacker_test.cxx b/Control/CxxUtils/test/FloatPacker_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/FloatPacker_test.cxx
rename to Control/CxxUtils/test/FloatPacker_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/PackedArray_test.cxx b/Control/CxxUtils/test/PackedArray_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/PackedArray_test.cxx
rename to Control/CxxUtils/test/PackedArray_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/PageAccessControl_test.cxx b/Control/CxxUtils/test/PageAccessControl_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/PageAccessControl_test.cxx
rename to Control/CxxUtils/test/PageAccessControl_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/SEGVHandler_test.cxx b/Control/CxxUtils/test/SEGVHandler_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/SEGVHandler_test.cxx
rename to Control/CxxUtils/test/SEGVHandler_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/StrFormat_test.cxx b/Control/CxxUtils/test/StrFormat_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/StrFormat_test.cxx
rename to Control/CxxUtils/test/StrFormat_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/bitscan_test.cxx b/Control/CxxUtils/test/bitscan_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/bitscan_test.cxx
rename to Control/CxxUtils/test/bitscan_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/copy_bounded_test.cxx b/Control/CxxUtils/test/copy_bounded_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/copy_bounded_test.cxx
rename to Control/CxxUtils/test/copy_bounded_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/copyif_test.cxx b/Control/CxxUtils/test/copyif_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/copyif_test.cxx
rename to Control/CxxUtils/test/copyif_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/exctrace1_test.cxx b/Control/CxxUtils/test/exctrace1_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/exctrace1_test.cxx
rename to Control/CxxUtils/test/exctrace1_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/exctrace2_test.cxx b/Control/CxxUtils/test/exctrace2_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/exctrace2_test.cxx
rename to Control/CxxUtils/test/exctrace2_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/expect_exception.icc b/Control/CxxUtils/test/expect_exception.icc
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/expect_exception.icc
rename to Control/CxxUtils/test/expect_exception.icc
diff --git a/EDM/calypso/Control/CxxUtils/test/fpcompare_test.cxx b/Control/CxxUtils/test/fpcompare_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/fpcompare_test.cxx
rename to Control/CxxUtils/test/fpcompare_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/hashtable_test.cxx b/Control/CxxUtils/test/hashtable_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/hashtable_test.cxx
rename to Control/CxxUtils/test/hashtable_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/make_unique_test.cxx b/Control/CxxUtils/test/make_unique_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/make_unique_test.cxx
rename to Control/CxxUtils/test/make_unique_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/ones_test.cxx b/Control/CxxUtils/test/ones_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/ones_test.cxx
rename to Control/CxxUtils/test/ones_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/pointer_list_test.cxx b/Control/CxxUtils/test/pointer_list_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/pointer_list_test.cxx
rename to Control/CxxUtils/test/pointer_list_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/prefetch_test.cxx b/Control/CxxUtils/test/prefetch_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/prefetch_test.cxx
rename to Control/CxxUtils/test/prefetch_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/procmaps_test.cxx b/Control/CxxUtils/test/procmaps_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/procmaps_test.cxx
rename to Control/CxxUtils/test/procmaps_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/read_athena_statm_test.cxx b/Control/CxxUtils/test/read_athena_statm_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/read_athena_statm_test.cxx
rename to Control/CxxUtils/test/read_athena_statm_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/sincos_test.cxx b/Control/CxxUtils/test/sincos_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/sincos_test.cxx
rename to Control/CxxUtils/test/sincos_test.cxx
diff --git a/EDM/calypso/Control/CxxUtils/test/stacktrace_test.cxx b/Control/CxxUtils/test/stacktrace_test.cxx
similarity index 100%
rename from EDM/calypso/Control/CxxUtils/test/stacktrace_test.cxx
rename to Control/CxxUtils/test/stacktrace_test.cxx
diff --git a/EDM/calypso/Control/DataModel/CMakeLists.txt b/Control/DataModel/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/DataModel/CMakeLists.txt
rename to Control/DataModel/CMakeLists.txt
diff --git a/EDM/calypso/Control/DataModel/DataModel/Arena.h b/Control/DataModel/DataModel/Arena.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/Arena.h
rename to Control/DataModel/DataModel/Arena.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/AssociationMap.h b/Control/DataModel/DataModel/AssociationMap.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/AssociationMap.h
rename to Control/DataModel/DataModel/AssociationMap.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/ClassName.h b/Control/DataModel/DataModel/ClassName.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/ClassName.h
rename to Control/DataModel/DataModel/ClassName.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/ConstDataVector.h b/Control/DataModel/DataModel/ConstDataVector.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/ConstDataVector.h
rename to Control/DataModel/DataModel/ConstDataVector.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/DataLink.h b/Control/DataModel/DataModel/DataLink.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/DataLink.h
rename to Control/DataModel/DataModel/DataLink.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/DataList.h b/Control/DataModel/DataModel/DataList.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/DataList.h
rename to Control/DataModel/DataModel/DataList.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/DataPool.h b/Control/DataModel/DataModel/DataPool.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/DataPool.h
rename to Control/DataModel/DataModel/DataPool.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/DataVector.h b/Control/DataModel/DataModel/DataVector.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/DataVector.h
rename to Control/DataModel/DataModel/DataVector.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/ElementLink.h b/Control/DataModel/DataModel/ElementLink.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/ElementLink.h
rename to Control/DataModel/DataModel/ElementLink.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/ElementLinkVector.h b/Control/DataModel/DataModel/ElementLinkVector.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/ElementLinkVector.h
rename to Control/DataModel/DataModel/ElementLinkVector.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/OwnershipPolicy.h b/Control/DataModel/DataModel/OwnershipPolicy.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/OwnershipPolicy.h
rename to Control/DataModel/DataModel/OwnershipPolicy.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/UserDataStore.h b/Control/DataModel/DataModel/UserDataStore.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/UserDataStore.h
rename to Control/DataModel/DataModel/UserDataStore.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/tools/ArenaPoolSTLAllocator.h b/Control/DataModel/DataModel/tools/ArenaPoolSTLAllocator.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/tools/ArenaPoolSTLAllocator.h
rename to Control/DataModel/DataModel/tools/ArenaPoolSTLAllocator.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/tools/ArenaSharedHeapSTLAllocator.h b/Control/DataModel/DataModel/tools/ArenaSharedHeapSTLAllocator.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/tools/ArenaSharedHeapSTLAllocator.h
rename to Control/DataModel/DataModel/tools/ArenaSharedHeapSTLAllocator.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/tools/DVLInfo.h b/Control/DataModel/DataModel/tools/DVLInfo.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/tools/DVLInfo.h
rename to Control/DataModel/DataModel/tools/DVLInfo.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/tools/IdentContIndex.h b/Control/DataModel/DataModel/tools/IdentContIndex.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/tools/IdentContIndex.h
rename to Control/DataModel/DataModel/tools/IdentContIndex.h
diff --git a/EDM/calypso/Control/DataModel/DataModel/unordered_map.h b/Control/DataModel/DataModel/unordered_map.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/DataModel/unordered_map.h
rename to Control/DataModel/DataModel/unordered_map.h
diff --git a/EDM/calypso/Control/DataModel/cmt/requirements b/Control/DataModel/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/DataModel/cmt/requirements
rename to Control/DataModel/cmt/requirements
diff --git a/EDM/calypso/Control/DataModel/doc/MainPage.h b/Control/DataModel/doc/MainPage.h
similarity index 100%
rename from EDM/calypso/Control/DataModel/doc/MainPage.h
rename to Control/DataModel/doc/MainPage.h
diff --git a/EDM/calypso/Control/DataModel/ispellwords b/Control/DataModel/ispellwords
similarity index 100%
rename from EDM/calypso/Control/DataModel/ispellwords
rename to Control/DataModel/ispellwords
diff --git a/EDM/calypso/Control/DataModelRoot/CMakeLists.txt b/Control/DataModelRoot/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/DataModelRoot/CMakeLists.txt
rename to Control/DataModelRoot/CMakeLists.txt
diff --git a/EDM/calypso/Control/DataModelRoot/DataModelRoot/DataModelRootDict.h b/Control/DataModelRoot/DataModelRoot/DataModelRootDict.h
similarity index 100%
rename from EDM/calypso/Control/DataModelRoot/DataModelRoot/DataModelRootDict.h
rename to Control/DataModelRoot/DataModelRoot/DataModelRootDict.h
diff --git a/EDM/calypso/Control/DataModelRoot/DataModelRoot/RootType.h b/Control/DataModelRoot/DataModelRoot/RootType.h
similarity index 100%
rename from EDM/calypso/Control/DataModelRoot/DataModelRoot/RootType.h
rename to Control/DataModelRoot/DataModelRoot/RootType.h
diff --git a/EDM/calypso/Control/DataModelRoot/DataModelRoot/selection.xml b/Control/DataModelRoot/DataModelRoot/selection.xml
similarity index 100%
rename from EDM/calypso/Control/DataModelRoot/DataModelRoot/selection.xml
rename to Control/DataModelRoot/DataModelRoot/selection.xml
diff --git a/EDM/calypso/Control/DataModelRoot/cmt/requirements b/Control/DataModelRoot/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/DataModelRoot/cmt/requirements
rename to Control/DataModelRoot/cmt/requirements
diff --git a/EDM/calypso/Control/DataModelRoot/src/RootType.cxx b/Control/DataModelRoot/src/RootType.cxx
similarity index 100%
rename from EDM/calypso/Control/DataModelRoot/src/RootType.cxx
rename to Control/DataModelRoot/src/RootType.cxx
diff --git a/EDM/calypso/Control/SGMon/SGAudCore/CMakeLists.txt b/Control/SGMon/SGAudCore/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudCore/CMakeLists.txt
rename to Control/SGMon/SGAudCore/CMakeLists.txt
diff --git a/EDM/calypso/Control/SGMon/SGAudCore/SGAudCore/ISGAudSvc.h b/Control/SGMon/SGAudCore/SGAudCore/ISGAudSvc.h
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudCore/SGAudCore/ISGAudSvc.h
rename to Control/SGMon/SGAudCore/SGAudCore/ISGAudSvc.h
diff --git a/EDM/calypso/Control/SGMon/SGAudCore/cmt/requirements b/Control/SGMon/SGAudCore/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudCore/cmt/requirements
rename to Control/SGMon/SGAudCore/cmt/requirements
diff --git a/EDM/calypso/Control/SGMon/SGAudCore/src/ISGAudSvc.cxx b/Control/SGMon/SGAudCore/src/ISGAudSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudCore/src/ISGAudSvc.cxx
rename to Control/SGMon/SGAudCore/src/ISGAudSvc.cxx
diff --git a/EDM/calypso/Control/SGMon/SGAudSvc/CMakeLists.txt b/Control/SGMon/SGAudSvc/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudSvc/CMakeLists.txt
rename to Control/SGMon/SGAudSvc/CMakeLists.txt
diff --git a/EDM/calypso/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h b/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h
rename to Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h
diff --git a/EDM/calypso/Control/SGMon/SGAudSvc/cmt/requirements b/Control/SGMon/SGAudSvc/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudSvc/cmt/requirements
rename to Control/SGMon/SGAudSvc/cmt/requirements
diff --git a/EDM/calypso/Control/SGMon/SGAudSvc/doc/mainpage.h b/Control/SGMon/SGAudSvc/doc/mainpage.h
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudSvc/doc/mainpage.h
rename to Control/SGMon/SGAudSvc/doc/mainpage.h
diff --git a/EDM/calypso/Control/SGMon/SGAudSvc/share/SGout2dot.py b/Control/SGMon/SGAudSvc/share/SGout2dot.py
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudSvc/share/SGout2dot.py
rename to Control/SGMon/SGAudSvc/share/SGout2dot.py
diff --git a/EDM/calypso/Control/SGMon/SGAudSvc/share/checkFileSG.py b/Control/SGMon/SGAudSvc/share/checkFileSG.py
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudSvc/share/checkFileSG.py
rename to Control/SGMon/SGAudSvc/share/checkFileSG.py
diff --git a/EDM/calypso/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx b/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
rename to Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
diff --git a/EDM/calypso/Control/SGMon/SGAudSvc/src/components/SGAudSvc_entries.cxx b/Control/SGMon/SGAudSvc/src/components/SGAudSvc_entries.cxx
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudSvc/src/components/SGAudSvc_entries.cxx
rename to Control/SGMon/SGAudSvc/src/components/SGAudSvc_entries.cxx
diff --git a/EDM/calypso/Control/SGMon/SGAudSvc/src/components/SGAudSvc_load.cxx b/Control/SGMon/SGAudSvc/src/components/SGAudSvc_load.cxx
similarity index 100%
rename from EDM/calypso/Control/SGMon/SGAudSvc/src/components/SGAudSvc_load.cxx
rename to Control/SGMon/SGAudSvc/src/components/SGAudSvc_load.cxx
diff --git a/EDM/calypso/Control/SGTools/CMakeLists.txt b/Control/SGTools/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/SGTools/CMakeLists.txt
rename to Control/SGTools/CMakeLists.txt
diff --git a/EDM/calypso/Control/SGTools/SGTools/BaseInfo.h b/Control/SGTools/SGTools/BaseInfo.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/BaseInfo.h
rename to Control/SGTools/SGTools/BaseInfo.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/BaseInfo.icc b/Control/SGTools/SGTools/BaseInfo.icc
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/BaseInfo.icc
rename to Control/SGTools/SGTools/BaseInfo.icc
diff --git a/EDM/calypso/Control/SGTools/SGTools/BuiltinsClids.h b/Control/SGTools/SGTools/BuiltinsClids.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/BuiltinsClids.h
rename to Control/SGTools/SGTools/BuiltinsClids.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/CLASS_DEF.h b/Control/SGTools/SGTools/CLASS_DEF.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/CLASS_DEF.h
rename to Control/SGTools/SGTools/CLASS_DEF.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/CLIDRegistry.h b/Control/SGTools/SGTools/CLIDRegistry.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/CLIDRegistry.h
rename to Control/SGTools/SGTools/CLIDRegistry.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/CallBackID.h b/Control/SGTools/SGTools/CallBackID.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/CallBackID.h
rename to Control/SGTools/SGTools/CallBackID.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/CallBackID.icc b/Control/SGTools/SGTools/CallBackID.icc
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/CallBackID.icc
rename to Control/SGTools/SGTools/CallBackID.icc
diff --git a/EDM/calypso/Control/SGTools/SGTools/ClassID_traits.h b/Control/SGTools/SGTools/ClassID_traits.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/ClassID_traits.h
rename to Control/SGTools/SGTools/ClassID_traits.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/ClassName.h b/Control/SGTools/SGTools/ClassName.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/ClassName.h
rename to Control/SGTools/SGTools/ClassName.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/ClassName.icc b/Control/SGTools/SGTools/ClassName.icc
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/ClassName.icc
rename to Control/SGTools/SGTools/ClassName.icc
diff --git a/EDM/calypso/Control/SGTools/SGTools/CurrentEventStore.h b/Control/SGTools/SGTools/CurrentEventStore.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/CurrentEventStore.h
rename to Control/SGTools/SGTools/CurrentEventStore.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/CurrentEventStore.icc b/Control/SGTools/SGTools/CurrentEventStore.icc
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/CurrentEventStore.icc
rename to Control/SGTools/SGTools/CurrentEventStore.icc
diff --git a/EDM/calypso/Control/SGTools/SGTools/DataBucket.h b/Control/SGTools/SGTools/DataBucket.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/DataBucket.h
rename to Control/SGTools/SGTools/DataBucket.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/DataBucket.icc b/Control/SGTools/SGTools/DataBucket.icc
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/DataBucket.icc
rename to Control/SGTools/SGTools/DataBucket.icc
diff --git a/EDM/calypso/Control/SGTools/SGTools/DataBucketBase.h b/Control/SGTools/SGTools/DataBucketBase.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/DataBucketBase.h
rename to Control/SGTools/SGTools/DataBucketBase.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/DataBucketBase.icc b/Control/SGTools/SGTools/DataBucketBase.icc
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/DataBucketBase.icc
rename to Control/SGTools/SGTools/DataBucketBase.icc
diff --git a/EDM/calypso/Control/SGTools/SGTools/DataBucketTraitFwd.h b/Control/SGTools/SGTools/DataBucketTraitFwd.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/DataBucketTraitFwd.h
rename to Control/SGTools/SGTools/DataBucketTraitFwd.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/DataHandleBase.h b/Control/SGTools/SGTools/DataHandleBase.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/DataHandleBase.h
rename to Control/SGTools/SGTools/DataHandleBase.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/DataProxy.h b/Control/SGTools/SGTools/DataProxy.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/DataProxy.h
rename to Control/SGTools/SGTools/DataProxy.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/DataProxy.icc b/Control/SGTools/SGTools/DataProxy.icc
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/DataProxy.icc
rename to Control/SGTools/SGTools/DataProxy.icc
diff --git a/EDM/calypso/Control/SGTools/SGTools/DataStore.h b/Control/SGTools/SGTools/DataStore.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/DataStore.h
rename to Control/SGTools/SGTools/DataStore.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/IProxyDictWithPool.h b/Control/SGTools/SGTools/IProxyDictWithPool.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/IProxyDictWithPool.h
rename to Control/SGTools/SGTools/IProxyDictWithPool.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/IRegisterTransient.h b/Control/SGTools/SGTools/IRegisterTransient.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/IRegisterTransient.h
rename to Control/SGTools/SGTools/IRegisterTransient.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/IStringPool.h b/Control/SGTools/SGTools/IStringPool.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/IStringPool.h
rename to Control/SGTools/SGTools/IStringPool.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/ProxyMap.h b/Control/SGTools/SGTools/ProxyMap.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/ProxyMap.h
rename to Control/SGTools/SGTools/ProxyMap.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/SGFolderItem.h b/Control/SGTools/SGTools/SGFolderItem.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/SGFolderItem.h
rename to Control/SGTools/SGTools/SGFolderItem.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/SGIFolder.h b/Control/SGTools/SGTools/SGIFolder.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/SGIFolder.h
rename to Control/SGTools/SGTools/SGIFolder.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/SGToolsDict.h b/Control/SGTools/SGTools/SGToolsDict.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/SGToolsDict.h
rename to Control/SGTools/SGTools/SGToolsDict.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/SGVersionedKey.h b/Control/SGTools/SGTools/SGVersionedKey.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/SGVersionedKey.h
rename to Control/SGTools/SGTools/SGVersionedKey.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/StlMapClids.h b/Control/SGTools/SGTools/StlMapClids.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/StlMapClids.h
rename to Control/SGTools/SGTools/StlMapClids.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/StlVectorClids.h b/Control/SGTools/SGTools/StlVectorClids.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/StlVectorClids.h
rename to Control/SGTools/SGTools/StlVectorClids.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/StorableConversions.h b/Control/SGTools/SGTools/StorableConversions.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/StorableConversions.h
rename to Control/SGTools/SGTools/StorableConversions.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/StringPool.h b/Control/SGTools/SGTools/StringPool.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/StringPool.h
rename to Control/SGTools/SGTools/StringPool.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/T2pMap.h b/Control/SGTools/SGTools/T2pMap.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/T2pMap.h
rename to Control/SGTools/SGTools/T2pMap.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/TestStore.h b/Control/SGTools/SGTools/TestStore.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/TestStore.h
rename to Control/SGTools/SGTools/TestStore.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/TransientAddress.h b/Control/SGTools/SGTools/TransientAddress.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/TransientAddress.h
rename to Control/SGTools/SGTools/TransientAddress.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/crc64.h b/Control/SGTools/SGTools/crc64.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/crc64.h
rename to Control/SGTools/SGTools/crc64.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/exceptions.h b/Control/SGTools/SGTools/exceptions.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/exceptions.h
rename to Control/SGTools/SGTools/exceptions.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/hashtable.h b/Control/SGTools/SGTools/hashtable.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/hashtable.h
rename to Control/SGTools/SGTools/hashtable.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/ptrhash.h b/Control/SGTools/SGTools/ptrhash.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/ptrhash.h
rename to Control/SGTools/SGTools/ptrhash.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/safe_clid.h b/Control/SGTools/SGTools/safe_clid.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/safe_clid.h
rename to Control/SGTools/SGTools/safe_clid.h
diff --git a/EDM/calypso/Control/SGTools/SGTools/safe_clid.icc b/Control/SGTools/SGTools/safe_clid.icc
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/safe_clid.icc
rename to Control/SGTools/SGTools/safe_clid.icc
diff --git a/EDM/calypso/Control/SGTools/SGTools/selection.xml b/Control/SGTools/SGTools/selection.xml
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/selection.xml
rename to Control/SGTools/SGTools/selection.xml
diff --git a/EDM/calypso/Control/SGTools/SGTools/unordered_map.h b/Control/SGTools/SGTools/unordered_map.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/SGTools/unordered_map.h
rename to Control/SGTools/SGTools/unordered_map.h
diff --git a/EDM/calypso/Control/SGTools/cmt/requirements b/Control/SGTools/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/SGTools/cmt/requirements
rename to Control/SGTools/cmt/requirements
diff --git a/EDM/calypso/Control/SGTools/doc/MainPage.h b/Control/SGTools/doc/MainPage.h
similarity index 100%
rename from EDM/calypso/Control/SGTools/doc/MainPage.h
rename to Control/SGTools/doc/MainPage.h
diff --git a/EDM/calypso/Control/SGTools/ispellwords b/Control/SGTools/ispellwords
similarity index 100%
rename from EDM/calypso/Control/SGTools/ispellwords
rename to Control/SGTools/ispellwords
diff --git a/EDM/calypso/Control/SGTools/share/BaseInfo_test.ref b/Control/SGTools/share/BaseInfo_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/BaseInfo_test.ref
rename to Control/SGTools/share/BaseInfo_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/CLIDRegistry_test.ref b/Control/SGTools/share/CLIDRegistry_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/CLIDRegistry_test.ref
rename to Control/SGTools/share/CLIDRegistry_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/ClassName_test.ref b/Control/SGTools/share/ClassName_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/ClassName_test.ref
rename to Control/SGTools/share/ClassName_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/CurrentEventStore_test.ref b/Control/SGTools/share/CurrentEventStore_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/CurrentEventStore_test.ref
rename to Control/SGTools/share/CurrentEventStore_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/DataBucket_test.ref b/Control/SGTools/share/DataBucket_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/DataBucket_test.ref
rename to Control/SGTools/share/DataBucket_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/DataProxy_test.ref b/Control/SGTools/share/DataProxy_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/DataProxy_test.ref
rename to Control/SGTools/share/DataProxy_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/DataStore_test.ref b/Control/SGTools/share/DataStore_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/DataStore_test.ref
rename to Control/SGTools/share/DataStore_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/SGFolderItem_test.ref b/Control/SGTools/share/SGFolderItem_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/SGFolderItem_test.ref
rename to Control/SGTools/share/SGFolderItem_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/StringPool_test.ref b/Control/SGTools/share/StringPool_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/StringPool_test.ref
rename to Control/SGTools/share/StringPool_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/TransientAddress_test.ref b/Control/SGTools/share/TransientAddress_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/TransientAddress_test.ref
rename to Control/SGTools/share/TransientAddress_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/VersionedKey_test.ref b/Control/SGTools/share/VersionedKey_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/VersionedKey_test.ref
rename to Control/SGTools/share/VersionedKey_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/crc64_test.ref b/Control/SGTools/share/crc64_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/crc64_test.ref
rename to Control/SGTools/share/crc64_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/exceptions_test.ref b/Control/SGTools/share/exceptions_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/exceptions_test.ref
rename to Control/SGTools/share/exceptions_test.ref
diff --git a/EDM/calypso/Control/SGTools/share/safe_clid_test.ref b/Control/SGTools/share/safe_clid_test.ref
similarity index 100%
rename from EDM/calypso/Control/SGTools/share/safe_clid_test.ref
rename to Control/SGTools/share/safe_clid_test.ref
diff --git a/EDM/calypso/Control/SGTools/src/BaseInfo.cxx b/Control/SGTools/src/BaseInfo.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/BaseInfo.cxx
rename to Control/SGTools/src/BaseInfo.cxx
diff --git a/EDM/calypso/Control/SGTools/src/CLIDRegistry.cxx b/Control/SGTools/src/CLIDRegistry.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/CLIDRegistry.cxx
rename to Control/SGTools/src/CLIDRegistry.cxx
diff --git a/EDM/calypso/Control/SGTools/src/CurrentEventStore.cxx b/Control/SGTools/src/CurrentEventStore.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/CurrentEventStore.cxx
rename to Control/SGTools/src/CurrentEventStore.cxx
diff --git a/EDM/calypso/Control/SGTools/src/DataHandleBase.cxx b/Control/SGTools/src/DataHandleBase.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/DataHandleBase.cxx
rename to Control/SGTools/src/DataHandleBase.cxx
diff --git a/EDM/calypso/Control/SGTools/src/DataProxy.cxx b/Control/SGTools/src/DataProxy.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/DataProxy.cxx
rename to Control/SGTools/src/DataProxy.cxx
diff --git a/EDM/calypso/Control/SGTools/src/DataStore.cxx b/Control/SGTools/src/DataStore.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/DataStore.cxx
rename to Control/SGTools/src/DataStore.cxx
diff --git a/EDM/calypso/Control/SGTools/src/SGFolderItem.cxx b/Control/SGTools/src/SGFolderItem.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/SGFolderItem.cxx
rename to Control/SGTools/src/SGFolderItem.cxx
diff --git a/EDM/calypso/Control/SGTools/src/SGToolsClids.cxx b/Control/SGTools/src/SGToolsClids.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/SGToolsClids.cxx
rename to Control/SGTools/src/SGToolsClids.cxx
diff --git a/EDM/calypso/Control/SGTools/src/SGVersionedKey.cxx b/Control/SGTools/src/SGVersionedKey.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/SGVersionedKey.cxx
rename to Control/SGTools/src/SGVersionedKey.cxx
diff --git a/EDM/calypso/Control/SGTools/src/StorableConversions.cxx b/Control/SGTools/src/StorableConversions.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/StorableConversions.cxx
rename to Control/SGTools/src/StorableConversions.cxx
diff --git a/EDM/calypso/Control/SGTools/src/StringPool.cxx b/Control/SGTools/src/StringPool.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/StringPool.cxx
rename to Control/SGTools/src/StringPool.cxx
diff --git a/EDM/calypso/Control/SGTools/src/T2pMap.cxx b/Control/SGTools/src/T2pMap.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/T2pMap.cxx
rename to Control/SGTools/src/T2pMap.cxx
diff --git a/EDM/calypso/Control/SGTools/src/TestStore.cxx b/Control/SGTools/src/TestStore.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/TestStore.cxx
rename to Control/SGTools/src/TestStore.cxx
diff --git a/EDM/calypso/Control/SGTools/src/TransientAddress.cxx b/Control/SGTools/src/TransientAddress.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/TransientAddress.cxx
rename to Control/SGTools/src/TransientAddress.cxx
diff --git a/EDM/calypso/Control/SGTools/src/crc64.cxx b/Control/SGTools/src/crc64.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/crc64.cxx
rename to Control/SGTools/src/crc64.cxx
diff --git a/EDM/calypso/Control/SGTools/src/exceptions.cxx b/Control/SGTools/src/exceptions.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/src/exceptions.cxx
rename to Control/SGTools/src/exceptions.cxx
diff --git a/EDM/calypso/Control/SGTools/test/BaseInfo_test.cxx b/Control/SGTools/test/BaseInfo_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/BaseInfo_test.cxx
rename to Control/SGTools/test/BaseInfo_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/CLIDRegistry_test.cxx b/Control/SGTools/test/CLIDRegistry_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/CLIDRegistry_test.cxx
rename to Control/SGTools/test/CLIDRegistry_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/ClassName_test.cxx b/Control/SGTools/test/ClassName_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/ClassName_test.cxx
rename to Control/SGTools/test/ClassName_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/CurrentEventStore_test.cxx b/Control/SGTools/test/CurrentEventStore_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/CurrentEventStore_test.cxx
rename to Control/SGTools/test/CurrentEventStore_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/DataBucket_test.cxx b/Control/SGTools/test/DataBucket_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/DataBucket_test.cxx
rename to Control/SGTools/test/DataBucket_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/DataProxy_test.cxx b/Control/SGTools/test/DataProxy_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/DataProxy_test.cxx
rename to Control/SGTools/test/DataProxy_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/DataStore_test.cxx b/Control/SGTools/test/DataStore_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/DataStore_test.cxx
rename to Control/SGTools/test/DataStore_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/SGFolderItem_test.cxx b/Control/SGTools/test/SGFolderItem_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/SGFolderItem_test.cxx
rename to Control/SGTools/test/SGFolderItem_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/SGTools.xml b/Control/SGTools/test/SGTools.xml
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/SGTools.xml
rename to Control/SGTools/test/SGTools.xml
diff --git a/EDM/calypso/Control/SGTools/test/StringPool_test.cxx b/Control/SGTools/test/StringPool_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/StringPool_test.cxx
rename to Control/SGTools/test/StringPool_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/TransientAddress_test.cxx b/Control/SGTools/test/TransientAddress_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/TransientAddress_test.cxx
rename to Control/SGTools/test/TransientAddress_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/VersionedKey_test.cxx b/Control/SGTools/test/VersionedKey_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/VersionedKey_test.cxx
rename to Control/SGTools/test/VersionedKey_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/crc64_test.cxx b/Control/SGTools/test/crc64_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/crc64_test.cxx
rename to Control/SGTools/test/crc64_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/exceptions_test.cxx b/Control/SGTools/test/exceptions_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/exceptions_test.cxx
rename to Control/SGTools/test/exceptions_test.cxx
diff --git a/EDM/calypso/Control/SGTools/test/safe_clid_test.cxx b/Control/SGTools/test/safe_clid_test.cxx
similarity index 100%
rename from EDM/calypso/Control/SGTools/test/safe_clid_test.cxx
rename to Control/SGTools/test/safe_clid_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/AUTHORS b/Control/StoreGate/AUTHORS
similarity index 100%
rename from EDM/calypso/Control/StoreGate/AUTHORS
rename to Control/StoreGate/AUTHORS
diff --git a/EDM/calypso/Control/StoreGate/CMakeLists.txt b/Control/StoreGate/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Control/StoreGate/CMakeLists.txt
rename to Control/StoreGate/CMakeLists.txt
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/ActiveStoreSvc.h b/Control/StoreGate/StoreGate/ActiveStoreSvc.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/ActiveStoreSvc.h
rename to Control/StoreGate/StoreGate/ActiveStoreSvc.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/CondHandleKey.h b/Control/StoreGate/StoreGate/CondHandleKey.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/CondHandleKey.h
rename to Control/StoreGate/StoreGate/CondHandleKey.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/CondHandleKey.icc b/Control/StoreGate/StoreGate/CondHandleKey.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/CondHandleKey.icc
rename to Control/StoreGate/StoreGate/CondHandleKey.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/DataHandle.h b/Control/StoreGate/StoreGate/DataHandle.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/DataHandle.h
rename to Control/StoreGate/StoreGate/DataHandle.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/DataHandle.icc b/Control/StoreGate/StoreGate/DataHandle.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/DataHandle.icc
rename to Control/StoreGate/StoreGate/DataHandle.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/RVar.h b/Control/StoreGate/StoreGate/RVar.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/RVar.h
rename to Control/StoreGate/StoreGate/RVar.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/RWVar.h b/Control/StoreGate/StoreGate/RWVar.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/RWVar.h
rename to Control/StoreGate/StoreGate/RWVar.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/ReadCondHandle.h b/Control/StoreGate/StoreGate/ReadCondHandle.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/ReadCondHandle.h
rename to Control/StoreGate/StoreGate/ReadCondHandle.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/ReadCondHandleKey.h b/Control/StoreGate/StoreGate/ReadCondHandleKey.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/ReadCondHandleKey.h
rename to Control/StoreGate/StoreGate/ReadCondHandleKey.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/ReadHandle.h b/Control/StoreGate/StoreGate/ReadHandle.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/ReadHandle.h
rename to Control/StoreGate/StoreGate/ReadHandle.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/ReadHandle.icc b/Control/StoreGate/StoreGate/ReadHandle.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/ReadHandle.icc
rename to Control/StoreGate/StoreGate/ReadHandle.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/ReadHandleKey.h b/Control/StoreGate/StoreGate/ReadHandleKey.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/ReadHandleKey.h
rename to Control/StoreGate/StoreGate/ReadHandleKey.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/ReadHandleKey.icc b/Control/StoreGate/StoreGate/ReadHandleKey.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/ReadHandleKey.icc
rename to Control/StoreGate/StoreGate/ReadHandleKey.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/ReadHandleKeyArray.h b/Control/StoreGate/StoreGate/ReadHandleKeyArray.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/ReadHandleKeyArray.h
rename to Control/StoreGate/StoreGate/ReadHandleKeyArray.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/SGHiveEventSlot.h b/Control/StoreGate/StoreGate/SGHiveEventSlot.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/SGHiveEventSlot.h
rename to Control/StoreGate/StoreGate/SGHiveEventSlot.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/SGIterator.h b/Control/StoreGate/StoreGate/SGIterator.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/SGIterator.h
rename to Control/StoreGate/StoreGate/SGIterator.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/SGObjectWithVersion.h b/Control/StoreGate/StoreGate/SGObjectWithVersion.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/SGObjectWithVersion.h
rename to Control/StoreGate/StoreGate/SGObjectWithVersion.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/SGWPtr.h b/Control/StoreGate/StoreGate/SGWPtr.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/SGWPtr.h
rename to Control/StoreGate/StoreGate/SGWPtr.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/SGtests.h b/Control/StoreGate/StoreGate/SGtests.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/SGtests.h
rename to Control/StoreGate/StoreGate/SGtests.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/SegMemSvc.h b/Control/StoreGate/StoreGate/SegMemSvc.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/SegMemSvc.h
rename to Control/StoreGate/StoreGate/SegMemSvc.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/SegMemSvc.icc b/Control/StoreGate/StoreGate/SegMemSvc.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/SegMemSvc.icc
rename to Control/StoreGate/StoreGate/SegMemSvc.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/StoreClearedIncident.h b/Control/StoreGate/StoreGate/StoreClearedIncident.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/StoreClearedIncident.h
rename to Control/StoreGate/StoreGate/StoreClearedIncident.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/StoreGate.h b/Control/StoreGate/StoreGate/StoreGate.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/StoreGate.h
rename to Control/StoreGate/StoreGate/StoreGate.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/StoreGateSvc.h b/Control/StoreGate/StoreGate/StoreGateSvc.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/StoreGateSvc.h
rename to Control/StoreGate/StoreGate/StoreGateSvc.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/StoreGateSvc.icc b/Control/StoreGate/StoreGate/StoreGateSvc.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/StoreGateSvc.icc
rename to Control/StoreGate/StoreGate/StoreGateSvc.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/UpdateHandle.h b/Control/StoreGate/StoreGate/UpdateHandle.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/UpdateHandle.h
rename to Control/StoreGate/StoreGate/UpdateHandle.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/UpdateHandle.icc b/Control/StoreGate/StoreGate/UpdateHandle.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/UpdateHandle.icc
rename to Control/StoreGate/StoreGate/UpdateHandle.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/UpdateHandleKey.h b/Control/StoreGate/StoreGate/UpdateHandleKey.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/UpdateHandleKey.h
rename to Control/StoreGate/StoreGate/UpdateHandleKey.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/UpdateHandleKey.icc b/Control/StoreGate/StoreGate/UpdateHandleKey.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/UpdateHandleKey.icc
rename to Control/StoreGate/StoreGate/UpdateHandleKey.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/VarHandleBase.h b/Control/StoreGate/StoreGate/VarHandleBase.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/VarHandleBase.h
rename to Control/StoreGate/StoreGate/VarHandleBase.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/VarHandleBase.icc b/Control/StoreGate/StoreGate/VarHandleBase.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/VarHandleBase.icc
rename to Control/StoreGate/StoreGate/VarHandleBase.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/VarHandleKey.h b/Control/StoreGate/StoreGate/VarHandleKey.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/VarHandleKey.h
rename to Control/StoreGate/StoreGate/VarHandleKey.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/VarHandleKeyArray.h b/Control/StoreGate/StoreGate/VarHandleKeyArray.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/VarHandleKeyArray.h
rename to Control/StoreGate/StoreGate/VarHandleKeyArray.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/VarHandleKeyArray.icc b/Control/StoreGate/StoreGate/VarHandleKeyArray.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/VarHandleKeyArray.icc
rename to Control/StoreGate/StoreGate/VarHandleKeyArray.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h b/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h
rename to Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/VarHandleKeyProperty.h b/Control/StoreGate/StoreGate/VarHandleKeyProperty.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/VarHandleKeyProperty.h
rename to Control/StoreGate/StoreGate/VarHandleKeyProperty.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/VarHandleProperty.h b/Control/StoreGate/StoreGate/VarHandleProperty.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/VarHandleProperty.h
rename to Control/StoreGate/StoreGate/VarHandleProperty.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/WVar.h b/Control/StoreGate/StoreGate/WVar.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/WVar.h
rename to Control/StoreGate/StoreGate/WVar.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/WriteCondHandle.h b/Control/StoreGate/StoreGate/WriteCondHandle.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/WriteCondHandle.h
rename to Control/StoreGate/StoreGate/WriteCondHandle.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/WriteCondHandleKey.h b/Control/StoreGate/StoreGate/WriteCondHandleKey.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/WriteCondHandleKey.h
rename to Control/StoreGate/StoreGate/WriteCondHandleKey.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/WriteHandle.h b/Control/StoreGate/StoreGate/WriteHandle.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/WriteHandle.h
rename to Control/StoreGate/StoreGate/WriteHandle.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/WriteHandle.icc b/Control/StoreGate/StoreGate/WriteHandle.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/WriteHandle.icc
rename to Control/StoreGate/StoreGate/WriteHandle.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/WriteHandleKey.h b/Control/StoreGate/StoreGate/WriteHandleKey.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/WriteHandleKey.h
rename to Control/StoreGate/StoreGate/WriteHandleKey.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/WriteHandleKey.icc b/Control/StoreGate/StoreGate/WriteHandleKey.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/WriteHandleKey.icc
rename to Control/StoreGate/StoreGate/WriteHandleKey.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/WriteHandleKeyArray.h b/Control/StoreGate/StoreGate/WriteHandleKeyArray.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/WriteHandleKeyArray.h
rename to Control/StoreGate/StoreGate/WriteHandleKeyArray.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/constraints/KeyConcept.h b/Control/StoreGate/StoreGate/constraints/KeyConcept.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/constraints/KeyConcept.h
rename to Control/StoreGate/StoreGate/constraints/KeyConcept.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/exceptions.h b/Control/StoreGate/StoreGate/exceptions.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/exceptions.h
rename to Control/StoreGate/StoreGate/exceptions.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/setupStoreGate.h b/Control/StoreGate/StoreGate/setupStoreGate.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/setupStoreGate.h
rename to Control/StoreGate/StoreGate/setupStoreGate.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/tools/SGImplSvc.h b/Control/StoreGate/StoreGate/tools/SGImplSvc.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/tools/SGImplSvc.h
rename to Control/StoreGate/StoreGate/tools/SGImplSvc.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/tools/SGImplSvc.icc b/Control/StoreGate/StoreGate/tools/SGImplSvc.icc
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/tools/SGImplSvc.icc
rename to Control/StoreGate/StoreGate/tools/SGImplSvc.icc
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/tools/StorableConversions.h b/Control/StoreGate/StoreGate/tools/StorableConversions.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/tools/StorableConversions.h
rename to Control/StoreGate/StoreGate/tools/StorableConversions.h
diff --git a/EDM/calypso/Control/StoreGate/StoreGate/tools/hash_functions.h b/Control/StoreGate/StoreGate/tools/hash_functions.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/StoreGate/tools/hash_functions.h
rename to Control/StoreGate/StoreGate/tools/hash_functions.h
diff --git a/EDM/calypso/Control/StoreGate/cmt/requirements b/Control/StoreGate/cmt/requirements
similarity index 100%
rename from EDM/calypso/Control/StoreGate/cmt/requirements
rename to Control/StoreGate/cmt/requirements
diff --git a/EDM/calypso/Control/StoreGate/doc/MainPage.h b/Control/StoreGate/doc/MainPage.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/doc/MainPage.h
rename to Control/StoreGate/doc/MainPage.h
diff --git a/EDM/calypso/Control/StoreGate/python/Bindings.py b/Control/StoreGate/python/Bindings.py
similarity index 100%
rename from EDM/calypso/Control/StoreGate/python/Bindings.py
rename to Control/StoreGate/python/Bindings.py
diff --git a/EDM/calypso/Control/StoreGate/python/RedirectProxyProviderSvc.py b/Control/StoreGate/python/RedirectProxyProviderSvc.py
similarity index 100%
rename from EDM/calypso/Control/StoreGate/python/RedirectProxyProviderSvc.py
rename to Control/StoreGate/python/RedirectProxyProviderSvc.py
diff --git a/EDM/calypso/Control/StoreGate/python/__init__.py b/Control/StoreGate/python/__init__.py
similarity index 100%
rename from EDM/calypso/Control/StoreGate/python/__init__.py
rename to Control/StoreGate/python/__init__.py
diff --git a/EDM/calypso/Control/StoreGate/share/ActiveStoreHive_test.ref b/Control/StoreGate/share/ActiveStoreHive_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/ActiveStoreHive_test.ref
rename to Control/StoreGate/share/ActiveStoreHive_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/ActiveStore_test.ref b/Control/StoreGate/share/ActiveStore_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/ActiveStore_test.ref
rename to Control/StoreGate/share/ActiveStore_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/ActiveStore_test.txt b/Control/StoreGate/share/ActiveStore_test.txt
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/ActiveStore_test.txt
rename to Control/StoreGate/share/ActiveStore_test.txt
diff --git a/EDM/calypso/Control/StoreGate/share/DataHandle_test.ref b/Control/StoreGate/share/DataHandle_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/DataHandle_test.ref
rename to Control/StoreGate/share/DataHandle_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/KeyConcept_test.ref b/Control/StoreGate/share/KeyConcept_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/KeyConcept_test.ref
rename to Control/StoreGate/share/KeyConcept_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/ReadHandleKey_test.ref b/Control/StoreGate/share/ReadHandleKey_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/ReadHandleKey_test.ref
rename to Control/StoreGate/share/ReadHandleKey_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/ReadHandle_test.ref b/Control/StoreGate/share/ReadHandle_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/ReadHandle_test.ref
rename to Control/StoreGate/share/ReadHandle_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/SGHive_test.ref b/Control/StoreGate/share/SGHive_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/SGHive_test.ref
rename to Control/StoreGate/share/SGHive_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/SGHive_test.txt b/Control/StoreGate/share/SGHive_test.txt
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/SGHive_test.txt
rename to Control/StoreGate/share/SGHive_test.txt
diff --git a/EDM/calypso/Control/StoreGate/share/SGIterator_test.ref b/Control/StoreGate/share/SGIterator_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/SGIterator_test.ref
rename to Control/StoreGate/share/SGIterator_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/SegMemSvc_test.ref b/Control/StoreGate/share/SegMemSvc_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/SegMemSvc_test.ref
rename to Control/StoreGate/share/SegMemSvc_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/StoreClearedIncident_test.ref b/Control/StoreGate/share/StoreClearedIncident_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/StoreClearedIncident_test.ref
rename to Control/StoreGate/share/StoreClearedIncident_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/StoreGateSvcClient_test.txt b/Control/StoreGate/share/StoreGateSvcClient_test.txt
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/StoreGateSvcClient_test.txt
rename to Control/StoreGate/share/StoreGateSvcClient_test.txt
diff --git a/EDM/calypso/Control/StoreGate/share/StoreGate_jobOptions.py b/Control/StoreGate/share/StoreGate_jobOptions.py
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/StoreGate_jobOptions.py
rename to Control/StoreGate/share/StoreGate_jobOptions.py
diff --git a/EDM/calypso/Control/StoreGate/share/StoreGate_jobOptions.txt b/Control/StoreGate/share/StoreGate_jobOptions.txt
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/StoreGate_jobOptions.txt
rename to Control/StoreGate/share/StoreGate_jobOptions.txt
diff --git a/EDM/calypso/Control/StoreGate/share/UpdateHandleKey_test.ref b/Control/StoreGate/share/UpdateHandleKey_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/UpdateHandleKey_test.ref
rename to Control/StoreGate/share/UpdateHandleKey_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/UpdateHandle_test.ref b/Control/StoreGate/share/UpdateHandle_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/UpdateHandle_test.ref
rename to Control/StoreGate/share/UpdateHandle_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/VarHandleBase_test.ref b/Control/StoreGate/share/VarHandleBase_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/VarHandleBase_test.ref
rename to Control/StoreGate/share/VarHandleBase_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/VarHandleBase_test.txt b/Control/StoreGate/share/VarHandleBase_test.txt
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/VarHandleBase_test.txt
rename to Control/StoreGate/share/VarHandleBase_test.txt
diff --git a/EDM/calypso/Control/StoreGate/share/VarHandleKeyProperty_test.ref b/Control/StoreGate/share/VarHandleKeyProperty_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/VarHandleKeyProperty_test.ref
rename to Control/StoreGate/share/VarHandleKeyProperty_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/VarHandleKeyProperty_test.txt b/Control/StoreGate/share/VarHandleKeyProperty_test.txt
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/VarHandleKeyProperty_test.txt
rename to Control/StoreGate/share/VarHandleKeyProperty_test.txt
diff --git a/EDM/calypso/Control/StoreGate/share/VarHandleKey_test.ref b/Control/StoreGate/share/VarHandleKey_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/VarHandleKey_test.ref
rename to Control/StoreGate/share/VarHandleKey_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/VarHandleProperty_test.ref b/Control/StoreGate/share/VarHandleProperty_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/VarHandleProperty_test.ref
rename to Control/StoreGate/share/VarHandleProperty_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/VarHandleProperty_test.txt b/Control/StoreGate/share/VarHandleProperty_test.txt
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/VarHandleProperty_test.txt
rename to Control/StoreGate/share/VarHandleProperty_test.txt
diff --git a/EDM/calypso/Control/StoreGate/share/VarHandles_test.ref b/Control/StoreGate/share/VarHandles_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/VarHandles_test.ref
rename to Control/StoreGate/share/VarHandles_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/WriteHandleKey_test.ref b/Control/StoreGate/share/WriteHandleKey_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/WriteHandleKey_test.ref
rename to Control/StoreGate/share/WriteHandleKey_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/WriteHandle_test.ref b/Control/StoreGate/share/WriteHandle_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/WriteHandle_test.ref
rename to Control/StoreGate/share/WriteHandle_test.ref
diff --git a/EDM/calypso/Control/StoreGate/share/exceptions_test.ref b/Control/StoreGate/share/exceptions_test.ref
similarity index 100%
rename from EDM/calypso/Control/StoreGate/share/exceptions_test.ref
rename to Control/StoreGate/share/exceptions_test.ref
diff --git a/EDM/calypso/Control/StoreGate/src/ActiveStoreSvc.cxx b/Control/StoreGate/src/ActiveStoreSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/ActiveStoreSvc.cxx
rename to Control/StoreGate/src/ActiveStoreSvc.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/SGHiveMgrSvc.cxx b/Control/StoreGate/src/SGHiveMgrSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/SGHiveMgrSvc.cxx
rename to Control/StoreGate/src/SGHiveMgrSvc.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/SGHiveMgrSvc.h b/Control/StoreGate/src/SGHiveMgrSvc.h
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/SGHiveMgrSvc.h
rename to Control/StoreGate/src/SGHiveMgrSvc.h
diff --git a/EDM/calypso/Control/StoreGate/src/SGImplSvc.cxx b/Control/StoreGate/src/SGImplSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/SGImplSvc.cxx
rename to Control/StoreGate/src/SGImplSvc.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/SegMemSvc.cxx b/Control/StoreGate/src/SegMemSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/SegMemSvc.cxx
rename to Control/StoreGate/src/SegMemSvc.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/StoreClearedIncident.cxx b/Control/StoreGate/src/StoreClearedIncident.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/StoreClearedIncident.cxx
rename to Control/StoreGate/src/StoreClearedIncident.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/StoreGate.cxx b/Control/StoreGate/src/StoreGate.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/StoreGate.cxx
rename to Control/StoreGate/src/StoreGate.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/StoreGateSvc.cxx b/Control/StoreGate/src/StoreGateSvc.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/StoreGateSvc.cxx
rename to Control/StoreGate/src/StoreGateSvc.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/VarHandleBase.cxx b/Control/StoreGate/src/VarHandleBase.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/VarHandleBase.cxx
rename to Control/StoreGate/src/VarHandleBase.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/VarHandleKey.cxx b/Control/StoreGate/src/VarHandleKey.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/VarHandleKey.cxx
rename to Control/StoreGate/src/VarHandleKey.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx b/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx
rename to Control/StoreGate/src/VarHandleKeyArrayProperty.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/VarHandleKeyProperty.cxx b/Control/StoreGate/src/VarHandleKeyProperty.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/VarHandleKeyProperty.cxx
rename to Control/StoreGate/src/VarHandleKeyProperty.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/components/StoreGateSvc_entries.cxx b/Control/StoreGate/src/components/StoreGateSvc_entries.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/components/StoreGateSvc_entries.cxx
rename to Control/StoreGate/src/components/StoreGateSvc_entries.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/components/StoreGateSvc_load.cxx b/Control/StoreGate/src/components/StoreGateSvc_load.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/components/StoreGateSvc_load.cxx
rename to Control/StoreGate/src/components/StoreGateSvc_load.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/exceptions.cxx b/Control/StoreGate/src/exceptions.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/exceptions.cxx
rename to Control/StoreGate/src/exceptions.cxx
diff --git a/EDM/calypso/Control/StoreGate/src/setupStoreGate.cxx b/Control/StoreGate/src/setupStoreGate.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/src/setupStoreGate.cxx
rename to Control/StoreGate/src/setupStoreGate.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/ActiveStore_test.cxx b/Control/StoreGate/test/ActiveStore_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/ActiveStore_test.cxx
rename to Control/StoreGate/test/ActiveStore_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/DataHandle_test.cxx b/Control/StoreGate/test/DataHandle_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/DataHandle_test.cxx
rename to Control/StoreGate/test/DataHandle_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/KeyConcept_test.cxx b/Control/StoreGate/test/KeyConcept_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/KeyConcept_test.cxx
rename to Control/StoreGate/test/KeyConcept_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/ReadHandleKey_test.cxx b/Control/StoreGate/test/ReadHandleKey_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/ReadHandleKey_test.cxx
rename to Control/StoreGate/test/ReadHandleKey_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/ReadHandle_test.cxx b/Control/StoreGate/test/ReadHandle_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/ReadHandle_test.cxx
rename to Control/StoreGate/test/ReadHandle_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/SGHive_test.cxx b/Control/StoreGate/test/SGHive_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/SGHive_test.cxx
rename to Control/StoreGate/test/SGHive_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/SGIterator_test.cxx b/Control/StoreGate/test/SGIterator_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/SGIterator_test.cxx
rename to Control/StoreGate/test/SGIterator_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/SGtests.cxx b/Control/StoreGate/test/SGtests.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/SGtests.cxx
rename to Control/StoreGate/test/SGtests.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/SegMemSvc_test.cxx b/Control/StoreGate/test/SegMemSvc_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/SegMemSvc_test.cxx
rename to Control/StoreGate/test/SegMemSvc_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/StoreClearedIncident_test.cxx b/Control/StoreGate/test/StoreClearedIncident_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/StoreClearedIncident_test.cxx
rename to Control/StoreGate/test/StoreClearedIncident_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/StoreGate.xml b/Control/StoreGate/test/StoreGate.xml
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/StoreGate.xml
rename to Control/StoreGate/test/StoreGate.xml
diff --git a/EDM/calypso/Control/StoreGate/test/UpdateHandleKey_test.cxx b/Control/StoreGate/test/UpdateHandleKey_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/UpdateHandleKey_test.cxx
rename to Control/StoreGate/test/UpdateHandleKey_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/UpdateHandle_test.cxx b/Control/StoreGate/test/UpdateHandle_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/UpdateHandle_test.cxx
rename to Control/StoreGate/test/UpdateHandle_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/VarHandleBase_test.cxx b/Control/StoreGate/test/VarHandleBase_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/VarHandleBase_test.cxx
rename to Control/StoreGate/test/VarHandleBase_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/VarHandleKeyProperty_test.cxx b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
rename to Control/StoreGate/test/VarHandleKeyProperty_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/VarHandleKey_test.cxx b/Control/StoreGate/test/VarHandleKey_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/VarHandleKey_test.cxx
rename to Control/StoreGate/test/VarHandleKey_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/VarHandleProperty_test.cxx b/Control/StoreGate/test/VarHandleProperty_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/VarHandleProperty_test.cxx
rename to Control/StoreGate/test/VarHandleProperty_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/VarHandles_test.cxx b/Control/StoreGate/test/VarHandles_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/VarHandles_test.cxx
rename to Control/StoreGate/test/VarHandles_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/WriteHandleKey_test.cxx b/Control/StoreGate/test/WriteHandleKey_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/WriteHandleKey_test.cxx
rename to Control/StoreGate/test/WriteHandleKey_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/WriteHandle_test.cxx b/Control/StoreGate/test/WriteHandle_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/WriteHandle_test.cxx
rename to Control/StoreGate/test/WriteHandle_test.cxx
diff --git a/EDM/calypso/Control/StoreGate/test/exceptions_test.cxx b/Control/StoreGate/test/exceptions_test.cxx
similarity index 100%
rename from EDM/calypso/Control/StoreGate/test/exceptions_test.cxx
rename to Control/StoreGate/test/exceptions_test.cxx
diff --git a/EDM/README.md b/EDM/README.md
deleted file mode 100644
index 4e4449afc1ab375bb31403c6c8b5aeff795c14a1..0000000000000000000000000000000000000000
--- a/EDM/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-First barebone project for Calypso based on Athena 21.0. Only packages necessary to implement the current EDM in xAOD are included. The current build relies on Gaudi and AthenaExternals libraries. This should be okay for FASER, as we don.t want or need to build these two on our own.  It currently also uses some of the ATLAS scripts to set environment variables . these can be replaced with either the spelled-out commands or our own scripts in the future.
-
-The following sequence will allow you to compile Calypso 1.0 on any machine with cvmfs access, and the necessary compiler libraries installed.
-```
-#clone the (forked) project to your local machine
-git clone https://:@gitlab.cern.ch:8443/username/calypso.git 
-cd calypso/EDM/
-#The next four lines are used to pick up the latest Gaudi and AthenaExternals libraries, and set the correct compiler
-export ATLAS_LOCAL_ROOT_BASE=/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase 
-source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh
-asetup AthenaExternals,gcc62,latest,21.0
-source ./calypso/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
-mkdir build
-cd build
-#build calypso
-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCTEST_USE_LAUNCHERS=TRUE ../calypso/Projects/Calypso ; make
-#run a unittest for xAOD::StripCluster
-ctest -V -R xAODTracking_StripCluster_test
-```
-If everything worked out, you should see the following printout:
-```
-test 176
-    Start 176: xAODTracking_xAODTracking_StripCluster_test_ctest
-
-176: Test command: /home/calypso/EDM/build/xAOD/xAODTracking/CMakeFiles/xAODTracking_StripCluster_test.sh
-176: Test timeout computed to be: 120
-176: id = 0
-176: local x = 1, local y = 2, local x error = 0.2, local y error = 0.2, local xy correlation = 0.05
-176: global x = 225, global y = -151.4, global z = 144.4
-176:  Dumping StripClusterAuxContainer
-176: id:0, localX:1, localY:2, localXError:0.2, localYError:0.2, localXYCorrelation:0.05, globalX:225, globalY:-151.4, globalZ:144.4,
-```
diff --git a/EDM/calypso/Projects/Calypso/CMakeLists.txt b/Projects/Calypso/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Projects/Calypso/CMakeLists.txt
rename to Projects/Calypso/CMakeLists.txt
diff --git a/EDM/calypso/Projects/Calypso/PostConfig.cmake.in b/Projects/Calypso/PostConfig.cmake.in
similarity index 100%
rename from EDM/calypso/Projects/Calypso/PostConfig.cmake.in
rename to Projects/Calypso/PostConfig.cmake.in
diff --git a/EDM/calypso/Projects/Calypso/README.md b/Projects/Calypso/README.md
similarity index 100%
rename from EDM/calypso/Projects/Calypso/README.md
rename to Projects/Calypso/README.md
diff --git a/EDM/calypso/Projects/Calypso/build.sh b/Projects/Calypso/build.sh
similarity index 100%
rename from EDM/calypso/Projects/Calypso/build.sh
rename to Projects/Calypso/build.sh
diff --git a/EDM/calypso/Projects/Calypso/build_env.sh b/Projects/Calypso/build_env.sh
similarity index 100%
rename from EDM/calypso/Projects/Calypso/build_env.sh
rename to Projects/Calypso/build_env.sh
diff --git a/EDM/calypso/Projects/Calypso/build_externals.sh b/Projects/Calypso/build_externals.sh
similarity index 100%
rename from EDM/calypso/Projects/Calypso/build_externals.sh
rename to Projects/Calypso/build_externals.sh
diff --git a/EDM/calypso/Projects/Calypso/externals.txt b/Projects/Calypso/externals.txt
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals.txt
rename to Projects/Calypso/externals.txt
diff --git a/EDM/calypso/Projects/Calypso/externals/Crmc.cmake b/Projects/Calypso/externals/Crmc.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Crmc.cmake
rename to Projects/Calypso/externals/Crmc.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/EvtGen.cmake b/Projects/Calypso/externals/EvtGen.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/EvtGen.cmake
rename to Projects/Calypso/externals/EvtGen.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/HEPUtils.cmake b/Projects/Calypso/externals/HEPUtils.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/HEPUtils.cmake
rename to Projects/Calypso/externals/HEPUtils.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Herwig.cmake b/Projects/Calypso/externals/Herwig.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Herwig.cmake
rename to Projects/Calypso/externals/Herwig.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Herwig3.cmake b/Projects/Calypso/externals/Herwig3.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Herwig3.cmake
rename to Projects/Calypso/externals/Herwig3.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Hydjet.cmake b/Projects/Calypso/externals/Hydjet.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Hydjet.cmake
rename to Projects/Calypso/externals/Hydjet.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Lhapdf.cmake b/Projects/Calypso/externals/Lhapdf.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Lhapdf.cmake
rename to Projects/Calypso/externals/Lhapdf.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/MCUtils.cmake b/Projects/Calypso/externals/MCUtils.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/MCUtils.cmake
rename to Projects/Calypso/externals/MCUtils.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/MadGraph5Amc.cmake b/Projects/Calypso/externals/MadGraph5Amc.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/MadGraph5Amc.cmake
rename to Projects/Calypso/externals/MadGraph5Amc.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Photospp.cmake b/Projects/Calypso/externals/Photospp.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Photospp.cmake
rename to Projects/Calypso/externals/Photospp.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Pythia6.cmake b/Projects/Calypso/externals/Pythia6.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Pythia6.cmake
rename to Projects/Calypso/externals/Pythia6.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Pythia8.cmake b/Projects/Calypso/externals/Pythia8.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Pythia8.cmake
rename to Projects/Calypso/externals/Pythia8.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/README.md b/Projects/Calypso/externals/README.md
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/README.md
rename to Projects/Calypso/externals/README.md
diff --git a/EDM/calypso/Projects/Calypso/externals/Rivet.cmake b/Projects/Calypso/externals/Rivet.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Rivet.cmake
rename to Projects/Calypso/externals/Rivet.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Sherpa.cmake b/Projects/Calypso/externals/Sherpa.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Sherpa.cmake
rename to Projects/Calypso/externals/Sherpa.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Starlight.cmake b/Projects/Calypso/externals/Starlight.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Starlight.cmake
rename to Projects/Calypso/externals/Starlight.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/Tauolapp.cmake b/Projects/Calypso/externals/Tauolapp.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/Tauolapp.cmake
rename to Projects/Calypso/externals/Tauolapp.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/ThePEG.cmake b/Projects/Calypso/externals/ThePEG.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/ThePEG.cmake
rename to Projects/Calypso/externals/ThePEG.cmake
diff --git a/EDM/calypso/Projects/Calypso/externals/YODA.cmake b/Projects/Calypso/externals/YODA.cmake
similarity index 100%
rename from EDM/calypso/Projects/Calypso/externals/YODA.cmake
rename to Projects/Calypso/externals/YODA.cmake
diff --git a/EDM/calypso/Projects/Calypso/package_filters.txt b/Projects/Calypso/package_filters.txt
similarity index 100%
rename from EDM/calypso/Projects/Calypso/package_filters.txt
rename to Projects/Calypso/package_filters.txt
diff --git a/EDM/calypso/Projects/Calypso/version.txt b/Projects/Calypso/version.txt
similarity index 100%
rename from EDM/calypso/Projects/Calypso/version.txt
rename to Projects/Calypso/version.txt
diff --git a/EDM/calypso/Projects/WorkDir/CMakeLists.txt b/Projects/WorkDir/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/Projects/WorkDir/CMakeLists.txt
rename to Projects/WorkDir/CMakeLists.txt
diff --git a/EDM/calypso/Projects/WorkDir/README.md b/Projects/WorkDir/README.md
similarity index 100%
rename from EDM/calypso/Projects/WorkDir/README.md
rename to Projects/WorkDir/README.md
diff --git a/EDM/calypso/Projects/WorkDir/package_filters_example.txt b/Projects/WorkDir/package_filters_example.txt
similarity index 100%
rename from EDM/calypso/Projects/WorkDir/package_filters_example.txt
rename to Projects/WorkDir/package_filters_example.txt
diff --git a/README.md b/README.md
index 6e79783a7bd7709ef7d3fe1bfa63733cca15f138..4e4449afc1ab375bb31403c6c8b5aeff795c14a1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,32 @@
-# calypso
-
-FASER offline software project
\ No newline at end of file
+First barebone project for Calypso based on Athena 21.0. Only packages necessary to implement the current EDM in xAOD are included. The current build relies on Gaudi and AthenaExternals libraries. This should be okay for FASER, as we don.t want or need to build these two on our own.  It currently also uses some of the ATLAS scripts to set environment variables . these can be replaced with either the spelled-out commands or our own scripts in the future.
+
+The following sequence will allow you to compile Calypso 1.0 on any machine with cvmfs access, and the necessary compiler libraries installed.
+```
+#clone the (forked) project to your local machine
+git clone https://:@gitlab.cern.ch:8443/username/calypso.git 
+cd calypso/EDM/
+#The next four lines are used to pick up the latest Gaudi and AthenaExternals libraries, and set the correct compiler
+export ATLAS_LOCAL_ROOT_BASE=/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase 
+source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh
+asetup AthenaExternals,gcc62,latest,21.0
+source ./calypso/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
+mkdir build
+cd build
+#build calypso
+cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCTEST_USE_LAUNCHERS=TRUE ../calypso/Projects/Calypso ; make
+#run a unittest for xAOD::StripCluster
+ctest -V -R xAODTracking_StripCluster_test
+```
+If everything worked out, you should see the following printout:
+```
+test 176
+    Start 176: xAODTracking_xAODTracking_StripCluster_test_ctest
+
+176: Test command: /home/calypso/EDM/build/xAOD/xAODTracking/CMakeFiles/xAODTracking_StripCluster_test.sh
+176: Test timeout computed to be: 120
+176: id = 0
+176: local x = 1, local y = 2, local x error = 0.2, local y error = 0.2, local xy correlation = 0.05
+176: global x = 225, global y = -151.4, global z = 144.4
+176:  Dumping StripClusterAuxContainer
+176: id:0, localX:1, localY:2, localXError:0.2, localYError:0.2, localXYCorrelation:0.05, globalX:225, globalY:-151.4, globalZ:144.4,
+```
diff --git a/EDM/calypso/xAOD/xAODCore/CMakeLists.txt b/xAOD/xAODCore/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/CMakeLists.txt
rename to xAOD/xAODCore/CMakeLists.txt
diff --git a/EDM/calypso/xAOD/xAODCore/Root/AddDVProxy.cxx b/xAOD/xAODCore/Root/AddDVProxy.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/AddDVProxy.cxx
rename to xAOD/xAODCore/Root/AddDVProxy.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/AuxContainerBase.cxx b/xAOD/xAODCore/Root/AuxContainerBase.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/AuxContainerBase.cxx
rename to xAOD/xAODCore/Root/AuxContainerBase.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/AuxInfoBase.cxx b/xAOD/xAODCore/Root/AuxInfoBase.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/AuxInfoBase.cxx
rename to xAOD/xAODCore/Root/AuxInfoBase.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/AuxSelection.cxx b/xAOD/xAODCore/Root/AuxSelection.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/AuxSelection.cxx
rename to xAOD/xAODCore/Root/AuxSelection.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/FloatCompressor.cxx b/xAOD/xAODCore/Root/FloatCompressor.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/FloatCompressor.cxx
rename to xAOD/xAODCore/Root/FloatCompressor.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/IOStats.cxx b/xAOD/xAODCore/Root/IOStats.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/IOStats.cxx
rename to xAOD/xAODCore/Root/IOStats.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/LinkDef.h b/xAOD/xAODCore/Root/LinkDef.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/LinkDef.h
rename to xAOD/xAODCore/Root/LinkDef.h
diff --git a/EDM/calypso/xAOD/xAODCore/Root/PerfStats.cxx b/xAOD/xAODCore/Root/PerfStats.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/PerfStats.cxx
rename to xAOD/xAODCore/Root/PerfStats.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/PrintHelpers.cxx b/xAOD/xAODCore/Root/PrintHelpers.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/PrintHelpers.cxx
rename to xAOD/xAODCore/Root/PrintHelpers.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/ReadStats.cxx b/xAOD/xAODCore/Root/ReadStats.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/ReadStats.cxx
rename to xAOD/xAODCore/Root/ReadStats.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/SafeDeepCopy.cxx b/xAOD/xAODCore/Root/SafeDeepCopy.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/SafeDeepCopy.cxx
rename to xAOD/xAODCore/Root/SafeDeepCopy.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/ShallowAuxContainer.cxx b/xAOD/xAODCore/Root/ShallowAuxContainer.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/ShallowAuxContainer.cxx
rename to xAOD/xAODCore/Root/ShallowAuxContainer.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/ShallowAuxInfo.cxx b/xAOD/xAODCore/Root/ShallowAuxInfo.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/ShallowAuxInfo.cxx
rename to xAOD/xAODCore/Root/ShallowAuxInfo.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/TDVCollectionProxy.cxx b/xAOD/xAODCore/Root/TDVCollectionProxy.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/TDVCollectionProxy.cxx
rename to xAOD/xAODCore/Root/TDVCollectionProxy.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/Root/Utils.cxx b/xAOD/xAODCore/Root/Utils.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/Root/Utils.cxx
rename to xAOD/xAODCore/Root/Utils.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/cmt/Makefile.RootCore b/xAOD/xAODCore/cmt/Makefile.RootCore
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/cmt/Makefile.RootCore
rename to xAOD/xAODCore/cmt/Makefile.RootCore
diff --git a/EDM/calypso/xAOD/xAODCore/cmt/requirements b/xAOD/xAODCore/cmt/requirements
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/cmt/requirements
rename to xAOD/xAODCore/cmt/requirements
diff --git a/EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_auxcontainerbase_test.ref b/xAOD/xAODCore/share/ut_xaodcore_auxcontainerbase_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_auxcontainerbase_test.ref
rename to xAOD/xAODCore/share/ut_xaodcore_auxcontainerbase_test.ref
diff --git a/EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_auxselection_test.ref b/xAOD/xAODCore/share/ut_xaodcore_auxselection_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_auxselection_test.ref
rename to xAOD/xAODCore/share/ut_xaodcore_auxselection_test.ref
diff --git a/EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_class_def_test.ref b/xAOD/xAODCore/share/ut_xaodcore_class_def_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_class_def_test.ref
rename to xAOD/xAODCore/share/ut_xaodcore_class_def_test.ref
diff --git a/EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_clearDecorations_test.ref b/xAOD/xAODCore/share/ut_xaodcore_clearDecorations_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_clearDecorations_test.ref
rename to xAOD/xAODCore/share/ut_xaodcore_clearDecorations_test.ref
diff --git a/EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_floatcompression_test.ref b/xAOD/xAODCore/share/ut_xaodcore_floatcompression_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_floatcompression_test.ref
rename to xAOD/xAODCore/share/ut_xaodcore_floatcompression_test.ref
diff --git a/EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_printhelpers_test.ref b/xAOD/xAODCore/share/ut_xaodcore_printhelpers_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_printhelpers_test.ref
rename to xAOD/xAODCore/share/ut_xaodcore_printhelpers_test.ref
diff --git a/EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_safedeepcopy_test.ref b/xAOD/xAODCore/share/ut_xaodcore_safedeepcopy_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/share/ut_xaodcore_safedeepcopy_test.ref
rename to xAOD/xAODCore/share/ut_xaodcore_safedeepcopy_test.ref
diff --git a/EDM/calypso/xAOD/xAODCore/src/README b/xAOD/xAODCore/src/README
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/src/README
rename to xAOD/xAODCore/src/README
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_AddDVProxy.cxx b/xAOD/xAODCore/test/inc_AddDVProxy.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_AddDVProxy.cxx
rename to xAOD/xAODCore/test/inc_AddDVProxy.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_AuxContainerBase.cxx b/xAOD/xAODCore/test/inc_AuxContainerBase.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_AuxContainerBase.cxx
rename to xAOD/xAODCore/test/inc_AuxContainerBase.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_AuxSelection.cxx b/xAOD/xAODCore/test/inc_AuxSelection.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_AuxSelection.cxx
rename to xAOD/xAODCore/test/inc_AuxSelection.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_BaseInfo.cxx b/xAOD/xAODCore/test/inc_BaseInfo.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_BaseInfo.cxx
rename to xAOD/xAODCore/test/inc_BaseInfo.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_CLASS_DEF.cxx b/xAOD/xAODCore/test/inc_CLASS_DEF.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_CLASS_DEF.cxx
rename to xAOD/xAODCore/test/inc_CLASS_DEF.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_ClassID_traits.cxx b/xAOD/xAODCore/test/inc_ClassID_traits.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_ClassID_traits.cxx
rename to xAOD/xAODCore/test/inc_ClassID_traits.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_ShallowAuxContainer.cxx b/xAOD/xAODCore/test/inc_ShallowAuxContainer.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_ShallowAuxContainer.cxx
rename to xAOD/xAODCore/test/inc_ShallowAuxContainer.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_ShallowAuxInfo.cxx b/xAOD/xAODCore/test/inc_ShallowAuxInfo.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_ShallowAuxInfo.cxx
rename to xAOD/xAODCore/test/inc_ShallowAuxInfo.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_ShallowCopy.cxx b/xAOD/xAODCore/test/inc_ShallowCopy.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_ShallowCopy.cxx
rename to xAOD/xAODCore/test/inc_ShallowCopy.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_tools_AuxPersInfo.cxx b/xAOD/xAODCore/test/inc_tools_AuxPersInfo.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_tools_AuxPersInfo.cxx
rename to xAOD/xAODCore/test/inc_tools_AuxPersInfo.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_tools_AuxPersVector.cxx b/xAOD/xAODCore/test/inc_tools_AuxPersVector.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_tools_AuxPersVector.cxx
rename to xAOD/xAODCore/test/inc_tools_AuxPersVector.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_tools_IOStats.cxx b/xAOD/xAODCore/test/inc_tools_IOStats.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_tools_IOStats.cxx
rename to xAOD/xAODCore/test/inc_tools_IOStats.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_tools_PerfStats.cxx b/xAOD/xAODCore/test/inc_tools_PerfStats.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_tools_PerfStats.cxx
rename to xAOD/xAODCore/test/inc_tools_PerfStats.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_tools_PrintHelpers.cxx b/xAOD/xAODCore/test/inc_tools_PrintHelpers.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_tools_PrintHelpers.cxx
rename to xAOD/xAODCore/test/inc_tools_PrintHelpers.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_tools_ReadStats.cxx b/xAOD/xAODCore/test/inc_tools_ReadStats.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_tools_ReadStats.cxx
rename to xAOD/xAODCore/test/inc_tools_ReadStats.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_tools_SafeDeepCopy.cxx b/xAOD/xAODCore/test/inc_tools_SafeDeepCopy.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_tools_SafeDeepCopy.cxx
rename to xAOD/xAODCore/test/inc_tools_SafeDeepCopy.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_tools_TDVCollectionProxy.cxx b/xAOD/xAODCore/test/inc_tools_TDVCollectionProxy.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_tools_TDVCollectionProxy.cxx
rename to xAOD/xAODCore/test/inc_tools_TDVCollectionProxy.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/inc_tools_Utils.cxx b/xAOD/xAODCore/test/inc_tools_Utils.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/inc_tools_Utils.cxx
rename to xAOD/xAODCore/test/inc_tools_Utils.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/ut_class_def.cxx b/xAOD/xAODCore/test/ut_class_def.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/ut_class_def.cxx
rename to xAOD/xAODCore/test/ut_class_def.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_auxcontainerbase_test.cxx b/xAOD/xAODCore/test/ut_xaodcore_auxcontainerbase_test.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_auxcontainerbase_test.cxx
rename to xAOD/xAODCore/test/ut_xaodcore_auxcontainerbase_test.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_auxselection_test.cxx b/xAOD/xAODCore/test/ut_xaodcore_auxselection_test.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_auxselection_test.cxx
rename to xAOD/xAODCore/test/ut_xaodcore_auxselection_test.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_clearDecorations_test.cxx b/xAOD/xAODCore/test/ut_xaodcore_clearDecorations_test.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_clearDecorations_test.cxx
rename to xAOD/xAODCore/test/ut_xaodcore_clearDecorations_test.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_floatcompression_test.cxx b/xAOD/xAODCore/test/ut_xaodcore_floatcompression_test.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_floatcompression_test.cxx
rename to xAOD/xAODCore/test/ut_xaodcore_floatcompression_test.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_printhelpers_test.cxx b/xAOD/xAODCore/test/ut_xaodcore_printhelpers_test.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_printhelpers_test.cxx
rename to xAOD/xAODCore/test/ut_xaodcore_printhelpers_test.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_safedeepcopy_test.cxx b/xAOD/xAODCore/test/ut_xaodcore_safedeepcopy_test.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_safedeepcopy_test.cxx
rename to xAOD/xAODCore/test/ut_xaodcore_safedeepcopy_test.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_shallowcopy.cxx b/xAOD/xAODCore/test/ut_xaodcore_shallowcopy.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/ut_xaodcore_shallowcopy.cxx
rename to xAOD/xAODCore/test/ut_xaodcore_shallowcopy.cxx
diff --git a/EDM/calypso/xAOD/xAODCore/test/xAODCore_test.xml b/xAOD/xAODCore/test/xAODCore_test.xml
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/test/xAODCore_test.xml
rename to xAOD/xAODCore/test/xAODCore_test.xml
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/AddDVProxy.h b/xAOD/xAODCore/xAODCore/AddDVProxy.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/AddDVProxy.h
rename to xAOD/xAODCore/xAODCore/AddDVProxy.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/AuxContainerBase.h b/xAOD/xAODCore/xAODCore/AuxContainerBase.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/AuxContainerBase.h
rename to xAOD/xAODCore/xAODCore/AuxContainerBase.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/AuxContainerBase.icc b/xAOD/xAODCore/xAODCore/AuxContainerBase.icc
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/AuxContainerBase.icc
rename to xAOD/xAODCore/xAODCore/AuxContainerBase.icc
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/AuxInfoBase.h b/xAOD/xAODCore/xAODCore/AuxInfoBase.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/AuxInfoBase.h
rename to xAOD/xAODCore/xAODCore/AuxInfoBase.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/AuxInfoBase.icc b/xAOD/xAODCore/xAODCore/AuxInfoBase.icc
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/AuxInfoBase.icc
rename to xAOD/xAODCore/xAODCore/AuxInfoBase.icc
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/AuxSelection.h b/xAOD/xAODCore/xAODCore/AuxSelection.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/AuxSelection.h
rename to xAOD/xAODCore/xAODCore/AuxSelection.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/AuxStoreAccessorMacros.h b/xAOD/xAODCore/xAODCore/AuxStoreAccessorMacros.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/AuxStoreAccessorMacros.h
rename to xAOD/xAODCore/xAODCore/AuxStoreAccessorMacros.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/BaseInfo.h b/xAOD/xAODCore/xAODCore/BaseInfo.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/BaseInfo.h
rename to xAOD/xAODCore/xAODCore/BaseInfo.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/CLASS_DEF.h b/xAOD/xAODCore/xAODCore/CLASS_DEF.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/CLASS_DEF.h
rename to xAOD/xAODCore/xAODCore/CLASS_DEF.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/ClassID_traits.h b/xAOD/xAODCore/xAODCore/ClassID_traits.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/ClassID_traits.h
rename to xAOD/xAODCore/xAODCore/ClassID_traits.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/ShallowAuxContainer.h b/xAOD/xAODCore/xAODCore/ShallowAuxContainer.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/ShallowAuxContainer.h
rename to xAOD/xAODCore/xAODCore/ShallowAuxContainer.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/ShallowAuxInfo.h b/xAOD/xAODCore/xAODCore/ShallowAuxInfo.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/ShallowAuxInfo.h
rename to xAOD/xAODCore/xAODCore/ShallowAuxInfo.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/ShallowCopy.h b/xAOD/xAODCore/xAODCore/ShallowCopy.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/ShallowCopy.h
rename to xAOD/xAODCore/xAODCore/ShallowCopy.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/selection.xml b/xAOD/xAODCore/xAODCore/selection.xml
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/selection.xml
rename to xAOD/xAODCore/xAODCore/selection.xml
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/selectionAthSuppress.xml b/xAOD/xAODCore/xAODCore/selectionAthSuppress.xml
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/selectionAthSuppress.xml
rename to xAOD/xAODCore/xAODCore/selectionAthSuppress.xml
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/selectionAthena.xml b/xAOD/xAODCore/xAODCore/selectionAthena.xml
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/selectionAthena.xml
rename to xAOD/xAODCore/xAODCore/selectionAthena.xml
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/AuxPersInfo.h b/xAOD/xAODCore/xAODCore/tools/AuxPersInfo.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/AuxPersInfo.h
rename to xAOD/xAODCore/xAODCore/tools/AuxPersInfo.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/AuxPersVector.h b/xAOD/xAODCore/xAODCore/tools/AuxPersVector.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/AuxPersVector.h
rename to xAOD/xAODCore/xAODCore/tools/AuxPersVector.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/FloatCompressor.h b/xAOD/xAODCore/xAODCore/tools/FloatCompressor.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/FloatCompressor.h
rename to xAOD/xAODCore/xAODCore/tools/FloatCompressor.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/IOStats.h b/xAOD/xAODCore/xAODCore/tools/IOStats.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/IOStats.h
rename to xAOD/xAODCore/xAODCore/tools/IOStats.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/PerfStats.h b/xAOD/xAODCore/xAODCore/tools/PerfStats.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/PerfStats.h
rename to xAOD/xAODCore/xAODCore/tools/PerfStats.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/PrintHelpers.h b/xAOD/xAODCore/xAODCore/tools/PrintHelpers.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/PrintHelpers.h
rename to xAOD/xAODCore/xAODCore/tools/PrintHelpers.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/ReadStats.h b/xAOD/xAODCore/xAODCore/tools/ReadStats.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/ReadStats.h
rename to xAOD/xAODCore/xAODCore/tools/ReadStats.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/SafeDeepCopy.h b/xAOD/xAODCore/xAODCore/tools/SafeDeepCopy.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/SafeDeepCopy.h
rename to xAOD/xAODCore/xAODCore/tools/SafeDeepCopy.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/TDVCollectionProxy.h b/xAOD/xAODCore/xAODCore/tools/TDVCollectionProxy.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/TDVCollectionProxy.h
rename to xAOD/xAODCore/xAODCore/tools/TDVCollectionProxy.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/tools/Utils.h b/xAOD/xAODCore/xAODCore/tools/Utils.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/tools/Utils.h
rename to xAOD/xAODCore/xAODCore/tools/Utils.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/xAODCoreAthenaDict.h b/xAOD/xAODCore/xAODCore/xAODCoreAthenaDict.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/xAODCoreAthenaDict.h
rename to xAOD/xAODCore/xAODCore/xAODCoreAthenaDict.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/xAODCoreDict.h b/xAOD/xAODCore/xAODCore/xAODCoreDict.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/xAODCoreDict.h
rename to xAOD/xAODCore/xAODCore/xAODCoreDict.h
diff --git a/EDM/calypso/xAOD/xAODCore/xAODCore/xAODCoreRflxDict.h b/xAOD/xAODCore/xAODCore/xAODCoreRflxDict.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODCore/xAODCore/xAODCoreRflxDict.h
rename to xAOD/xAODCore/xAODCore/xAODCoreRflxDict.h
diff --git a/EDM/calypso/xAOD/xAODTracking/CMakeLists.txt b/xAOD/xAODTracking/CMakeLists.txt
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/CMakeLists.txt
rename to xAOD/xAODTracking/CMakeLists.txt
diff --git a/EDM/calypso/xAOD/xAODTracking/Root/StripCluster.cxx b/xAOD/xAODTracking/Root/StripCluster.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/Root/StripCluster.cxx
rename to xAOD/xAODTracking/Root/StripCluster.cxx
diff --git a/EDM/calypso/xAOD/xAODTracking/Root/StripClusterAuxContainer.cxx b/xAOD/xAODTracking/Root/StripClusterAuxContainer.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/Root/StripClusterAuxContainer.cxx
rename to xAOD/xAODTracking/Root/StripClusterAuxContainer.cxx
diff --git a/EDM/calypso/xAOD/xAODTracking/Root/dict/ContainerProxies.cxx b/xAOD/xAODTracking/Root/dict/ContainerProxies.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/Root/dict/ContainerProxies.cxx
rename to xAOD/xAODTracking/Root/dict/ContainerProxies.cxx
diff --git a/EDM/calypso/xAOD/xAODTracking/cmt/Makefile.RootCore b/xAOD/xAODTracking/cmt/Makefile.RootCore
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/cmt/Makefile.RootCore
rename to xAOD/xAODTracking/cmt/Makefile.RootCore
diff --git a/EDM/calypso/xAOD/xAODTracking/cmt/requirements b/xAOD/xAODTracking/cmt/requirements
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/cmt/requirements
rename to xAOD/xAODTracking/cmt/requirements
diff --git a/EDM/calypso/xAOD/xAODTracking/doc/mainpage.h b/xAOD/xAODTracking/doc/mainpage.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/doc/mainpage.h
rename to xAOD/xAODTracking/doc/mainpage.h
diff --git a/EDM/calypso/xAOD/xAODTracking/share/xAODTracking_TrackParticle_test.ref b/xAOD/xAODTracking/share/xAODTracking_TrackParticle_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/share/xAODTracking_TrackParticle_test.ref
rename to xAOD/xAODTracking/share/xAODTracking_TrackParticle_test.ref
diff --git a/EDM/calypso/xAOD/xAODTracking/share/xAODTracking_TrackParticlexAODHelpers_test.ref b/xAOD/xAODTracking/share/xAODTracking_TrackParticlexAODHelpers_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/share/xAODTracking_TrackParticlexAODHelpers_test.ref
rename to xAOD/xAODTracking/share/xAODTracking_TrackParticlexAODHelpers_test.ref
diff --git a/EDM/calypso/xAOD/xAODTracking/test/xAODTracking_StripCluster_test.cxx b/xAOD/xAODTracking/test/xAODTracking_StripCluster_test.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/test/xAODTracking_StripCluster_test.cxx
rename to xAOD/xAODTracking/test/xAODTracking_StripCluster_test.cxx
diff --git a/EDM/calypso/xAOD/xAODTracking/xAODTracking/StripCluster.h b/xAOD/xAODTracking/xAODTracking/StripCluster.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/xAODTracking/StripCluster.h
rename to xAOD/xAODTracking/xAODTracking/StripCluster.h
diff --git a/EDM/calypso/xAOD/xAODTracking/xAODTracking/StripClusterAuxContainer.h b/xAOD/xAODTracking/xAODTracking/StripClusterAuxContainer.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/xAODTracking/StripClusterAuxContainer.h
rename to xAOD/xAODTracking/xAODTracking/StripClusterAuxContainer.h
diff --git a/EDM/calypso/xAOD/xAODTracking/xAODTracking/StripClusterContainer.h b/xAOD/xAODTracking/xAODTracking/StripClusterContainer.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/xAODTracking/StripClusterContainer.h
rename to xAOD/xAODTracking/xAODTracking/StripClusterContainer.h
diff --git a/EDM/calypso/xAOD/xAODTracking/xAODTracking/selection.xml b/xAOD/xAODTracking/xAODTracking/selection.xml
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/xAODTracking/selection.xml
rename to xAOD/xAODTracking/xAODTracking/selection.xml
diff --git a/EDM/calypso/xAOD/xAODTracking/xAODTracking/xAODTrackingDict.h b/xAOD/xAODTracking/xAODTracking/xAODTrackingDict.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/xAODTracking/xAODTrackingDict.h
rename to xAOD/xAODTracking/xAODTracking/xAODTrackingDict.h