diff --git a/EDM/calypso/xAOD/xAODTracking/Root/StripRawData.cxx b/xAOD/xAODTracking/Root/StripRawData.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/Root/StripRawData.cxx
rename to xAOD/xAODTracking/Root/StripRawData.cxx
diff --git a/EDM/calypso/xAOD/xAODTracking/Root/StripRawDataAuxContainer.cxx b/xAOD/xAODTracking/Root/StripRawDataAuxContainer.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/Root/StripRawDataAuxContainer.cxx
rename to xAOD/xAODTracking/Root/StripRawDataAuxContainer.cxx
diff --git a/EDM/calypso/xAOD/xAODTracking/Root/xAODTrackingCLIDs.cxx b/xAOD/xAODTracking/Root/xAODTrackingCLIDs.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/Root/xAODTrackingCLIDs.cxx
rename to xAOD/xAODTracking/Root/xAODTrackingCLIDs.cxx
diff --git a/EDM/calypso/xAOD/xAODTracking/share/xAODTracking_StripCluster_test.ref b/xAOD/xAODTracking/share/xAODTracking_StripCluster_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/share/xAODTracking_StripCluster_test.ref
rename to xAOD/xAODTracking/share/xAODTracking_StripCluster_test.ref
diff --git a/EDM/calypso/xAOD/xAODTracking/share/xAODTracking_StripRawData_test.ref b/xAOD/xAODTracking/share/xAODTracking_StripRawData_test.ref
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/share/xAODTracking_StripRawData_test.ref
rename to xAOD/xAODTracking/share/xAODTracking_StripRawData_test.ref
diff --git a/EDM/calypso/xAOD/xAODTracking/test/xAODTracking_StripRawData_test.cxx b/xAOD/xAODTracking/test/xAODTracking_StripRawData_test.cxx
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/test/xAODTracking_StripRawData_test.cxx
rename to xAOD/xAODTracking/test/xAODTracking_StripRawData_test.cxx
diff --git a/EDM/calypso/xAOD/xAODTracking/xAODTracking/StripRawData.h b/xAOD/xAODTracking/xAODTracking/StripRawData.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/xAODTracking/StripRawData.h
rename to xAOD/xAODTracking/xAODTracking/StripRawData.h
diff --git a/EDM/calypso/xAOD/xAODTracking/xAODTracking/StripRawDataAuxContainer.h b/xAOD/xAODTracking/xAODTracking/StripRawDataAuxContainer.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/xAODTracking/StripRawDataAuxContainer.h
rename to xAOD/xAODTracking/xAODTracking/StripRawDataAuxContainer.h
diff --git a/EDM/calypso/xAOD/xAODTracking/xAODTracking/StripRawDataContainer.h b/xAOD/xAODTracking/xAODTracking/StripRawDataContainer.h
similarity index 100%
rename from EDM/calypso/xAOD/xAODTracking/xAODTracking/StripRawDataContainer.h
rename to xAOD/xAODTracking/xAODTracking/StripRawDataContainer.h