diff --git a/Alignment/CocoaFit/src/CocoaDBMgr.cc b/Alignment/CocoaFit/src/CocoaDBMgr.cc
index 29421a0f8fc62..97dbaa14eab35 100644
--- a/Alignment/CocoaFit/src/CocoaDBMgr.cc
+++ b/Alignment/CocoaFit/src/CocoaDBMgr.cc
@@ -12,8 +12,6 @@
#include "CondFormats/OptAlignObjects/interface/OpticalAlignMeasurementInfo.h"
#include "CondFormats/DataRecord/interface/OpticalAlignmentsRcd.h"
#include "CondFormats/AlignmentRecord/interface/DTAlignmentRcd.h"
-#include "DetectorDescription/Core/interface/DDFilteredView.h"
-#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
diff --git a/DetectorDescription/Algorithm/BuildFile.xml b/DetectorDescription/Algorithm/BuildFile.xml
index 58bf4cab3b4cf..876774de99bc6 100644
--- a/DetectorDescription/Algorithm/BuildFile.xml
+++ b/DetectorDescription/Algorithm/BuildFile.xml
@@ -1,4 +1,3 @@
-
diff --git a/DetectorDescription/Algorithm/interface/DDAlgorithm.h b/DetectorDescription/Algorithm/interface/DDAlgorithm.h
index 5c51fb0dc023e..4260c2d65bca0 100644
--- a/DetectorDescription/Algorithm/interface/DDAlgorithm.h
+++ b/DetectorDescription/Algorithm/interface/DDAlgorithm.h
@@ -1,7 +1,7 @@
#ifndef DD_ALGO_PLUGIN_DD_ALGORITHM_H
#define DD_ALGO_PLUGIN_DD_ALGORITHM_H
-#include "DetectorDescription/Base/interface/DDTypes.h"
+#include "DetectorDescription/Core/interface/DDTypes.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"
#include
diff --git a/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h b/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h
index 5d45553f43aa8..862aee07d6ec8 100644
--- a/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h
+++ b/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h
@@ -4,7 +4,7 @@
#include
#include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
-#include "DetectorDescription/Base/interface/DDTypes.h"
+#include "DetectorDescription/Core/interface/DDTypes.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"
class DDAlgorithm;
diff --git a/DetectorDescription/Algorithm/plugins/DDAngular.cc b/DetectorDescription/Algorithm/plugins/DDAngular.cc
index 4332999cec647..957778e60267f 100644
--- a/DetectorDescription/Algorithm/plugins/DDAngular.cc
+++ b/DetectorDescription/Algorithm/plugins/DDAngular.cc
@@ -4,7 +4,7 @@
#include "CLHEP/Units/GlobalSystemOfUnits.h"
#include "CLHEP/Units/SystemOfUnits.h"
-#include "DetectorDescription/Base/interface/DDAlgoPar.h"
+#include "DetectorDescription/Core/interface/DDAlgoPar.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"
diff --git a/DetectorDescription/Algorithm/plugins/DDAngular.h b/DetectorDescription/Algorithm/plugins/DDAngular.h
index 895ccc1e7955d..f38cd8dfaf2c2 100644
--- a/DetectorDescription/Algorithm/plugins/DDAngular.h
+++ b/DetectorDescription/Algorithm/plugins/DDAngular.h
@@ -6,9 +6,9 @@
#include
# include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
-# include "DetectorDescription/Base/interface/DDRotationMatrix.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
-# include "DetectorDescription/Base/interface/DDTypes.h"
+# include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
+# include "DetectorDescription/Core/interface/DDTypes.h"
class DDCompactView;
diff --git a/DetectorDescription/Algorithm/plugins/DDLinear.cc b/DetectorDescription/Algorithm/plugins/DDLinear.cc
index dde6c99af83e3..bd410ac3f4add 100644
--- a/DetectorDescription/Algorithm/plugins/DDLinear.cc
+++ b/DetectorDescription/Algorithm/plugins/DDLinear.cc
@@ -4,8 +4,8 @@
#include "CLHEP/Units/GlobalSystemOfUnits.h"
#include "CLHEP/Units/SystemOfUnits.h"
-#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"
diff --git a/DetectorDescription/Algorithm/plugins/DDLinear.h b/DetectorDescription/Algorithm/plugins/DDLinear.h
index aff95746cc7b5..60bcfafa46977 100644
--- a/DetectorDescription/Algorithm/plugins/DDLinear.h
+++ b/DetectorDescription/Algorithm/plugins/DDLinear.h
@@ -6,7 +6,7 @@
#include
# include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
-# include "DetectorDescription/Base/interface/DDTypes.h"
+# include "DetectorDescription/Core/interface/DDTypes.h"
class DDCompactView;
diff --git a/DetectorDescription/Base/BuildFile.xml b/DetectorDescription/Base/BuildFile.xml
deleted file mode 100644
index ef1ffc33270ef..0000000000000
--- a/DetectorDescription/Base/BuildFile.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/DetectorDescription/Base/test/BuildFile.xml b/DetectorDescription/Base/test/BuildFile.xml
deleted file mode 100644
index 25c3ea6fc4b37..0000000000000
--- a/DetectorDescription/Base/test/BuildFile.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/DetectorDescription/Core/BuildFile.xml b/DetectorDescription/Core/BuildFile.xml
index 1b9f38991bc15..f3f5a6f236813 100644
--- a/DetectorDescription/Core/BuildFile.xml
+++ b/DetectorDescription/Core/BuildFile.xml
@@ -1,4 +1,3 @@
-
diff --git a/DetectorDescription/Base/interface/DDAlgoPar.h b/DetectorDescription/Core/interface/DDAlgoPar.h
similarity index 100%
rename from DetectorDescription/Base/interface/DDAlgoPar.h
rename to DetectorDescription/Core/interface/DDAlgoPar.h
diff --git a/DetectorDescription/Core/interface/DDAxes.h b/DetectorDescription/Core/interface/DDAxes.h
index 911c0b4feb8c1..f973d66fbeb68 100644
--- a/DetectorDescription/Core/interface/DDAxes.h
+++ b/DetectorDescription/Core/interface/DDAxes.h
@@ -1,7 +1,7 @@
#ifndef DDAxes_h
#define DDAxes_h
-#include "DetectorDescription/Base/interface/Singleton.h"
+#include "DetectorDescription/Core/interface/Singleton.h"
#include
#include