diff --git a/src/STEPCAFControl/FILES b/src/STEPCAFControl/FILES
index 067c89fb3b..82343b85de 100644
--- a/src/STEPCAFControl/FILES
+++ b/src/STEPCAFControl/FILES
@@ -27,3 +27,5 @@ STEPCAFControl_StackItemOfDictionaryOfExternFile.hxx
 STEPCAFControl_StackItemOfDictionaryOfExternFile_0.cxx
 STEPCAFControl_Writer.cxx
 STEPCAFControl_Writer.hxx
+STEPCAFControl_GDTProperty.hxx
+STEPCAFControl_GDTProperty.cxx
diff --git a/src/STEPConstruct/STEPConstruct_GDTProperty.cxx b/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx
similarity index 95%
rename from src/STEPConstruct/STEPConstruct_GDTProperty.cxx
rename to src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx
index 13f8576df4..e0087de036 100644
--- a/src/STEPConstruct/STEPConstruct_GDTProperty.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx
@@ -1,7 +1,6 @@
-// Created on: 1999-09-09
-// Created by: Andrey BETENEV
-// Copyright (c) 1999-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
+// Created on: 2015-09-10
+// Created by: Irina Krylova
+// Copyright (c) 1999-2015 OPEN CASCADE SAS
 //
 // This file is part of Open CASCADE Technology software library.
 //
@@ -14,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <STEPConstruct_GDTProperty.hxx>
+#include <STEPCAFControl_GDTProperty.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Direction.hxx>
@@ -30,11 +29,11 @@
 #include <XCAFDimTolObjects_DatumModifWithValue.hxx>
 
 //=======================================================================
-//function : STEPConstruct_GDTProperty
+//function : STEPCAFControl_GDTProperty
 //purpose  : 
 //=======================================================================
 
-STEPConstruct_GDTProperty::STEPConstruct_GDTProperty ()
+STEPCAFControl_GDTProperty::STEPCAFControl_GDTProperty ()
 {
 }
 
@@ -42,7 +41,7 @@ STEPConstruct_GDTProperty::STEPConstruct_GDTProperty ()
 //function : getDimModifiers
 //purpose  : 
 //=======================================================================
-void STEPConstruct_GDTProperty::GetDimModifiers(const Handle(StepRepr_CompoundRepresentationItem)& theCRI,
+void STEPCAFControl_GDTProperty::GetDimModifiers(const Handle(StepRepr_CompoundRepresentationItem)& theCRI,
                             XCAFDimTolObjects_DimensionModifiersSequence& theModifiers)
 {
   for (Standard_Integer l = 1; l <= theCRI->ItemElement()->Length(); l++)
@@ -177,7 +176,7 @@ void STEPConstruct_GDTProperty::GetDimModifiers(const Handle(StepRepr_CompoundRe
 //function : getClassOfTolerance
 //purpose  : 
 //=======================================================================
-void STEPConstruct_GDTProperty::GetDimClassOfTolerance(const Handle(StepShape_LimitsAndFits)& theLAF,
+void STEPCAFControl_GDTProperty::GetDimClassOfTolerance(const Handle(StepShape_LimitsAndFits)& theLAF,
                                    Standard_Boolean& theHolle,
                                    XCAFDimTolObjects_DimensionFormVariance& theFV,
                                    XCAFDimTolObjects_DimensionGrade& theG)
@@ -409,7 +408,7 @@ void STEPConstruct_GDTProperty::GetDimClassOfTolerance(const Handle(StepShape_Li
 //function : getDimType
 //purpose  : 
 //=======================================================================
-Standard_Boolean STEPConstruct_GDTProperty::GetDimType(const Handle(TCollection_HAsciiString)& theName,
+Standard_Boolean STEPCAFControl_GDTProperty::GetDimType(const Handle(TCollection_HAsciiString)& theName,
                        XCAFDimTolObjects_DimensionType& theType)
 {
     TCollection_AsciiString aName = theName->String();
@@ -524,7 +523,7 @@ Standard_Boolean STEPConstruct_GDTProperty::GetDimType(const Handle(TCollection_
 //function : DatumTargetType
 //purpose  : 
 //=======================================================================
-Standard_Boolean STEPConstruct_GDTProperty::GetDatumTargetType(const Handle(TCollection_HAsciiString)& theDescription,
+Standard_Boolean STEPCAFControl_GDTProperty::GetDatumTargetType(const Handle(TCollection_HAsciiString)& theDescription,
                        XCAFDimTolObjects_DatumTargetType& theType)
 {
     TCollection_AsciiString aName = theDescription->String();
@@ -561,7 +560,7 @@ Standard_Boolean STEPConstruct_GDTProperty::GetDatumTargetType(const Handle(TCol
 //function : GetDimQualifierType
 //purpose  : 
 //=======================================================================
-Standard_Boolean STEPConstruct_GDTProperty::GetDimQualifierType(const Handle(TCollection_HAsciiString)& theDescription,
+Standard_Boolean STEPCAFControl_GDTProperty::GetDimQualifierType(const Handle(TCollection_HAsciiString)& theDescription,
                        XCAFDimTolObjects_DimensionQualifier& theType)
 {
     TCollection_AsciiString aName = theDescription->String();
@@ -590,7 +589,7 @@ Standard_Boolean STEPConstruct_GDTProperty::GetDimQualifierType(const Handle(TCo
 //function : GetTolValueType
 //purpose  : 
 //=======================================================================
-Standard_Boolean STEPConstruct_GDTProperty::GetTolValueType(const Handle(TCollection_HAsciiString)& theDescription,
+Standard_Boolean STEPCAFControl_GDTProperty::GetTolValueType(const Handle(TCollection_HAsciiString)& theDescription,
                        XCAFDimTolObjects_GeomToleranceTypeValue& theType)
 {
     TCollection_AsciiString aName = theDescription->String();
@@ -616,7 +615,7 @@ Standard_Boolean STEPConstruct_GDTProperty::GetTolValueType(const Handle(TCollec
 //function : GetDimTypeName
 //purpose  : 
 //=======================================================================
-Handle(TCollection_HAsciiString) STEPConstruct_GDTProperty::GetDimTypeName(const XCAFDimTolObjects_DimensionType theType)
+Handle(TCollection_HAsciiString) STEPCAFControl_GDTProperty::GetDimTypeName(const XCAFDimTolObjects_DimensionType theType)
 {
   Handle(TCollection_HAsciiString) aName;
         switch (theType) {
@@ -705,7 +704,7 @@ Handle(TCollection_HAsciiString) STEPConstruct_GDTProperty::GetDimTypeName(const
 //function : GetDimQualifierName
 //purpose  : 
 //=======================================================================
-Handle(TCollection_HAsciiString) STEPConstruct_GDTProperty::GetDimQualifierName(const XCAFDimTolObjects_DimensionQualifier theQualifier)
+Handle(TCollection_HAsciiString) STEPCAFControl_GDTProperty::GetDimQualifierName(const XCAFDimTolObjects_DimensionQualifier theQualifier)
 {
   Handle(TCollection_HAsciiString) aName;
   switch (theQualifier) {
@@ -728,7 +727,7 @@ Handle(TCollection_HAsciiString) STEPConstruct_GDTProperty::GetDimQualifierName(
 //function : GetDimModifierName
 //purpose  : 
 //=======================================================================
-Handle(TCollection_HAsciiString) STEPConstruct_GDTProperty::GetDimModifierName(const XCAFDimTolObjects_DimensionModif theModifier)
+Handle(TCollection_HAsciiString) STEPCAFControl_GDTProperty::GetDimModifierName(const XCAFDimTolObjects_DimensionModif theModifier)
 {
   Handle(TCollection_HAsciiString) aName;
   switch (theModifier) {
@@ -810,7 +809,7 @@ Handle(TCollection_HAsciiString) STEPConstruct_GDTProperty::GetDimModifierName(c
 //function : GetLimitsAndFits
 //purpose  : 
 //=======================================================================
-Handle(StepShape_LimitsAndFits) STEPConstruct_GDTProperty::GetLimitsAndFits(Standard_Boolean theHole,
+Handle(StepShape_LimitsAndFits) STEPCAFControl_GDTProperty::GetLimitsAndFits(Standard_Boolean theHole,
                        XCAFDimTolObjects_DimensionFormVariance theFormVariance,
                        XCAFDimTolObjects_DimensionGrade theGrade)
 {
@@ -927,7 +926,7 @@ Handle(StepShape_LimitsAndFits) STEPConstruct_GDTProperty::GetLimitsAndFits(Stan
 //function : GetDatumTargetName
 //purpose  : 
 //=======================================================================
-Handle(TCollection_HAsciiString) STEPConstruct_GDTProperty::GetDatumTargetName(const XCAFDimTolObjects_DatumTargetType theDatumType)
+Handle(TCollection_HAsciiString) STEPCAFControl_GDTProperty::GetDatumTargetName(const XCAFDimTolObjects_DatumTargetType theDatumType)
 {
   Handle(TCollection_HAsciiString) aName;
   switch (theDatumType) {
@@ -955,7 +954,7 @@ Handle(TCollection_HAsciiString) STEPConstruct_GDTProperty::GetDatumTargetName(c
 //function : GetAxis2Placement3D
 //purpose  : 
 //=======================================================================
-Handle(StepGeom_Axis2Placement3d) STEPConstruct_GDTProperty::GetAxis2Placement3D(const gp_Ax2 theAxis)
+Handle(StepGeom_Axis2Placement3d) STEPCAFControl_GDTProperty::GetAxis2Placement3D(const gp_Ax2& theAxis)
 {
   Handle(StepGeom_Axis2Placement3d) anA2P3D = new StepGeom_Axis2Placement3d();
   Handle(StepGeom_CartesianPoint) aPoint = new StepGeom_CartesianPoint();
@@ -982,7 +981,7 @@ Handle(StepGeom_Axis2Placement3d) STEPConstruct_GDTProperty::GetAxis2Placement3D
 //function : IsDimensionalSize
 //purpose  : 
 //=======================================================================
-Standard_Boolean STEPConstruct_GDTProperty::IsDimensionalLocation(const XCAFDimTolObjects_DimensionType theType)
+Standard_Boolean STEPCAFControl_GDTProperty::IsDimensionalLocation(const XCAFDimTolObjects_DimensionType theType)
 {
   if (theType == XCAFDimTolObjects_DimensionType_Location_None ||
       theType == XCAFDimTolObjects_DimensionType_Location_CurvedDistance  ||
@@ -1004,7 +1003,7 @@ Standard_Boolean STEPConstruct_GDTProperty::IsDimensionalLocation(const XCAFDimT
 //function : IsDimensionalSize
 //purpose  : 
 //=======================================================================
-Standard_Boolean STEPConstruct_GDTProperty::IsDimensionalSize(const XCAFDimTolObjects_DimensionType theType)
+Standard_Boolean STEPCAFControl_GDTProperty::IsDimensionalSize(const XCAFDimTolObjects_DimensionType theType)
 {
   if (theType == XCAFDimTolObjects_DimensionType_Size_CurveLength ||
       theType == XCAFDimTolObjects_DimensionType_Size_Diameter ||
@@ -1028,7 +1027,7 @@ Standard_Boolean STEPConstruct_GDTProperty::IsDimensionalSize(const XCAFDimTolOb
 //function : GetGeomToleranceType
 //purpose  : 
 //=======================================================================
-StepDimTol_GeometricToleranceType STEPConstruct_GDTProperty::GetGeomToleranceType(const XCAFDimTolObjects_GeomToleranceType theType)
+StepDimTol_GeometricToleranceType STEPCAFControl_GDTProperty::GetGeomToleranceType(const XCAFDimTolObjects_GeomToleranceType theType)
 {
   switch (theType) {
     case XCAFDimTolObjects_GeomToleranceType_Angularity:
@@ -1070,7 +1069,7 @@ StepDimTol_GeometricToleranceType STEPConstruct_GDTProperty::GetGeomToleranceTyp
 //function : GetGeomToleranceType
 //purpose  : 
 //=======================================================================
-XCAFDimTolObjects_GeomToleranceType STEPConstruct_GDTProperty::GetGeomToleranceType(const StepDimTol_GeometricToleranceType theType)
+XCAFDimTolObjects_GeomToleranceType STEPCAFControl_GDTProperty::GetGeomToleranceType(const StepDimTol_GeometricToleranceType theType)
 {
   switch (theType) {
     case StepDimTol_GTTAngularityTolerance:
@@ -1112,7 +1111,7 @@ XCAFDimTolObjects_GeomToleranceType STEPConstruct_GDTProperty::GetGeomToleranceT
 //function : GetGeomTolerance
 //purpose  : 
 //=======================================================================
-Handle(StepDimTol_GeometricTolerance) STEPConstruct_GDTProperty::
+Handle(StepDimTol_GeometricTolerance) STEPCAFControl_GDTProperty::
   GetGeomTolerance(const XCAFDimTolObjects_GeomToleranceType theType)
 {
   switch (theType) {
@@ -1139,7 +1138,7 @@ Handle(StepDimTol_GeometricTolerance) STEPConstruct_GDTProperty::
 //function : GetGeomToleranceModifier
 //purpose  : 
 //=======================================================================
-StepDimTol_GeometricToleranceModifier STEPConstruct_GDTProperty::
+StepDimTol_GeometricToleranceModifier STEPCAFControl_GDTProperty::
   GetGeomToleranceModifier(const XCAFDimTolObjects_GeomToleranceModif theModifier)
 {
   switch (theModifier) {
@@ -1182,7 +1181,7 @@ StepDimTol_GeometricToleranceModifier STEPConstruct_GDTProperty::
 //function : GetDatumRefModifiers
 //purpose  : Note: this function does not add anything to model
 //=======================================================================
-Handle(StepDimTol_HArray1OfDatumReferenceModifier) STEPConstruct_GDTProperty::
+Handle(StepDimTol_HArray1OfDatumReferenceModifier) STEPCAFControl_GDTProperty::
   GetDatumRefModifiers(const XCAFDimTolObjects_DatumModifiersSequence theModifiers,
                        const XCAFDimTolObjects_DatumModifWithValue theModifWithVal,
                        const Standard_Real theValue,
@@ -1311,7 +1310,7 @@ Handle(StepDimTol_HArray1OfDatumReferenceModifier) STEPConstruct_GDTProperty::
 //function : GetTolValueType
 //purpose  : 
 //=======================================================================
-Handle(TCollection_HAsciiString) STEPConstruct_GDTProperty::GetTolValueType(const XCAFDimTolObjects_GeomToleranceTypeValue& theType)
+Handle(TCollection_HAsciiString) STEPCAFControl_GDTProperty::GetTolValueType(const XCAFDimTolObjects_GeomToleranceTypeValue& theType)
 {
   switch (theType) {
     case XCAFDimTolObjects_GeomToleranceTypeValue_Diameter:
diff --git a/src/STEPConstruct/STEPConstruct_GDTProperty.hxx b/src/STEPCAFControl/STEPCAFControl_GDTProperty.hxx
similarity index 93%
rename from src/STEPConstruct/STEPConstruct_GDTProperty.hxx
rename to src/STEPCAFControl/STEPCAFControl_GDTProperty.hxx
index 76b0741e0e..552b90f559 100644
--- a/src/STEPConstruct/STEPConstruct_GDTProperty.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_GDTProperty.hxx
@@ -1,7 +1,6 @@
-// Created on: 1999-09-08
-// Created by: Andrey BETENEV
-// Copyright (c) 1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
+// Created on: 2015-09-10
+// Created by: Irina Krylova
+// Copyright (c) 1999-2015 OPEN CASCADE SAS
 //
 // This file is part of Open CASCADE Technology software library.
 //
@@ -14,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef _STEPConstruct_GDTProperty_HeaderFile
-#define _STEPConstruct_GDTProperty_HeaderFile
+#ifndef _STEPCAFControl_GDTProperty_HeaderFile
+#define _STEPCAFControl_GDTProperty_HeaderFile
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
@@ -47,13 +46,13 @@
 
 //! This class provides tools for access (read)
 //! the GDT properties.
-class STEPConstruct_GDTProperty
+class STEPCAFControl_GDTProperty
 {
 public:
 
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT STEPConstruct_GDTProperty();
+  Standard_EXPORT STEPCAFControl_GDTProperty();
   Standard_EXPORT static void GetDimModifiers(const Handle(StepRepr_CompoundRepresentationItem)& theCRI,
                                               XCAFDimTolObjects_DimensionModifiersSequence& theModifiers);
 
@@ -88,7 +87,7 @@ public:
 
   Standard_EXPORT static Handle(TCollection_HAsciiString) GetDatumTargetName(const XCAFDimTolObjects_DatumTargetType theDatumType);
 
-  Standard_EXPORT static Handle(StepGeom_Axis2Placement3d) GetAxis2Placement3D(const gp_Ax2 theAxis);
+  Standard_EXPORT static Handle(StepGeom_Axis2Placement3d) GetAxis2Placement3D(const gp_Ax2& theAxis);
 
   Standard_EXPORT static Standard_Boolean IsDimensionalLocation(const XCAFDimTolObjects_DimensionType theType);
 
@@ -109,4 +108,4 @@ public:
 
 };
 
-#endif // _STEPConstruct_GDTProperty_HeaderFile
+#endif // _STEPCAFControl_GDTProperty_HeaderFile
diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
index dd6b9a2d92..82a10328b1 100644
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -221,7 +221,7 @@
 #include <XSControl_WorkSession.hxx>
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
 #include <StepGeom_CartesianPoint.hxx>
-#include <STEPConstruct_GDTProperty.hxx>
+#include <STEPCAFControl_GDTProperty.hxx>
 // skl 21.08.2003 for reading G&DT
 //#include <StepRepr_CompoundItemDefinition.hxx>
 //#include <StepRepr_CompoundItemDefinitionMember.hxx>
@@ -1878,7 +1878,7 @@ static Standard_Boolean setDatumToXCAF(const Handle(StepDimTol_Datum)& theDat,
           aDatObj->SetDatumTargetNumber(0);
         aDatObj->IsDatumTarget(Standard_True);
         XCAFDimTolObjects_DatumTargetType aType;
-        if(STEPConstruct_GDTProperty::GetDatumTargetType(aSA->Description(),aType))
+        if(STEPCAFControl_GDTProperty::GetDatumTargetType(aSA->Description(),aType))
         {
           aDatObj->SetDatumTargetType(aType);
           if(aType == XCAFDimTolObjects_DatumTargetType_Area)
@@ -2795,7 +2795,7 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
   if(!aTQ.IsNull()) 
   {
     XCAFDimTolObjects_DimensionQualifier aQ;
-    if (STEPConstruct_GDTProperty::GetDimQualifierType(aTQ->Name(), aQ))
+    if (STEPCAFControl_GDTProperty::GetDimQualifierType(aTQ->Name(), aQ))
     {
         aDimObj->SetQualifier(aQ);
     }
@@ -2817,7 +2817,7 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
     Standard_Boolean aHolle = Standard_False;
     XCAFDimTolObjects_DimensionFormVariance aFV = XCAFDimTolObjects_DimensionFormVariance_None;
     XCAFDimTolObjects_DimensionGrade aG = XCAFDimTolObjects_DimensionGrade_IT01;
-    STEPConstruct_GDTProperty::GetDimClassOfTolerance(aLAF, aHolle, aFV, aG);
+    STEPCAFControl_GDTProperty::GetDimClassOfTolerance(aLAF, aHolle, aFV, aG);
     aDimObj->SetClassOfTolerance(aHolle, aFV, aG);
   }
 
@@ -2825,7 +2825,7 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
   {
     //get modifiers
     XCAFDimTolObjects_DimensionModifiersSequence aModifiers;
-    STEPConstruct_GDTProperty::GetDimModifiers(aCRI, aModifiers);
+    STEPCAFControl_GDTProperty::GetDimModifiers(aCRI, aModifiers);
     if(aModifiers.Length() > 0)
       aDimObj->SetModifiers(aModifiers);
   }
@@ -2840,7 +2840,7 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
     aName = aDimLocation->Name();
   }
   XCAFDimTolObjects_DimensionType aType = XCAFDimTolObjects_DimensionType_Location_None;
-  if (!STEPConstruct_GDTProperty::GetDimType(aName, aType))
+  if (!STEPCAFControl_GDTProperty::GetDimType(aName, aType))
   {
     if(!aDimSize.IsNull())
     {
@@ -2972,37 +2972,37 @@ static Standard_Boolean getTolType(const Handle(Standard_Transient)& theEnt,
   if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeoTolAndGeoTolWthDatRef)))
   {
     Handle(StepDimTol_GeoTolAndGeoTolWthDatRef) anE = Handle(StepDimTol_GeoTolAndGeoTolWthDatRef)::DownCast(theEnt);
-    theType = STEPConstruct_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
+    theType = STEPCAFControl_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
   }
   else if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol)))
   {
     Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol) anE = 
       Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol)::DownCast(theEnt);
-    theType = STEPConstruct_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
+    theType = STEPCAFControl_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
   }
   else if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)))
   {
     Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod) anE = 
       Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)::DownCast(theEnt);
-    theType = STEPConstruct_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
+    theType = STEPCAFControl_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
   }
   else if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeoTolAndGeoTolWthMaxTol)))
   {
     Handle(StepDimTol_GeoTolAndGeoTolWthMaxTol) anE = 
       Handle(StepDimTol_GeoTolAndGeoTolWthMaxTol)::DownCast(theEnt);
-    theType = STEPConstruct_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
+    theType = STEPCAFControl_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
   }
   else if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeoTolAndGeoTolWthMod)))
   {
     Handle(StepDimTol_GeoTolAndGeoTolWthMod) anE = 
       Handle(StepDimTol_GeoTolAndGeoTolWthMod)::DownCast(theEnt);
-    theType = STEPConstruct_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
+    theType = STEPCAFControl_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
   }
   else if (theEnt->IsKind(STANDARD_TYPE(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol)))
   {
     Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol) anE = 
       Handle(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol)::DownCast(theEnt);
-    theType = STEPConstruct_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
+    theType = STEPCAFControl_GDTProperty::GetGeomToleranceType(anE->GetToleranceType());
   }
   else if(theEnt->IsKind(STANDARD_TYPE(StepDimTol_AngularityTolerance)))
   {
@@ -3111,7 +3111,7 @@ static void setGeomTolObjectToXCAF(const Handle(Standard_Transient)& theEnt,
     if(anIter.Value()->IsKind(STANDARD_TYPE(StepDimTol_ToleranceZone))){
       Handle(StepDimTol_ToleranceZoneForm) aForm 
                             = Handle(StepDimTol_ToleranceZone)::DownCast(anIter.Value())->Form();
-      STEPConstruct_GDTProperty::GetTolValueType(aForm->Name(), aTypeV);
+      STEPCAFControl_GDTProperty::GetTolValueType(aForm->Name(), aTypeV);
       Interface_EntityIterator anIt = aGraph.Sharings(anIter.Value());
       for(anIt.Start(); anIt.More(); anIt.Next()) {
         if(anIt.Value()->IsKind(STANDARD_TYPE(StepDimTol_ProjectedZoneDefinition))){
diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
index 625a368ebf..d4a72efac6 100644
--- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
@@ -52,7 +52,7 @@
 #include <STEPConstruct_DataMapOfAsciiStringTransient.hxx>
 #include <STEPConstruct_DataMapOfPointTransient.hxx>
 #include <STEPConstruct_ExternRefs.hxx>
-#include <STEPConstruct_GDTProperty.hxx>
+#include <STEPCAFControl_GDTProperty.hxx>
 #include <STEPConstruct_Styles.hxx>
 #include <STEPConstruct_ValidationProps.hxx>
 #include <STEPControl_StepModelType.hxx>
@@ -2404,7 +2404,7 @@ static Handle(StepDimTol_Datum) WriteDatumAP242(const Handle(XSControl_WorkSessi
   }
     else {
       Handle(StepDimTol_PlacedDatumTargetFeature) aPDTF = new StepDimTol_PlacedDatumTargetFeature();
-      aPDTF->Init(new TCollection_HAsciiString(), STEPConstruct_GDTProperty::GetDatumTargetName(aDatumType),
+      aPDTF->Init(new TCollection_HAsciiString(), STEPCAFControl_GDTProperty::GetDatumTargetName(aDatumType),
         aPDS, StepData_LTrue, aTargetId);
       Model->AddWithRefs(aPDTF);
       aDatumTarget = aPDTF;
@@ -2418,7 +2418,7 @@ static Handle(StepDimTol_Datum) WriteDatumAP242(const Handle(XSControl_WorkSessi
       StepBasic_Unit aUnit = GetUnit(aRC);
       gp_Ax2 aDTAxis = anObject->GetDatumTargetAxis();
       Handle(StepGeom_Axis2Placement3d) anA2P3D = 
-        STEPConstruct_GDTProperty::GetAxis2Placement3D(aDTAxis);
+        STEPCAFControl_GDTProperty::GetAxis2Placement3D(aDTAxis);
       Handle(StepRepr_HArray1OfRepresentationItem) anItems;
       // Process each datum target type
       if (aDatumType == XCAFDimTolObjects_DatumTargetType_Point) {
@@ -2558,7 +2558,7 @@ static void WriteDimValues(const Handle(XSControl_WorkSession) &WS,
       StepShape_ValueQualifier anItem;
       Handle(StepShape_TypeQualifier) aType = new StepShape_TypeQualifier();
       XCAFDimTolObjects_DimensionQualifier aQualifier = theObject->GetQualifier();
-      aType->Init(STEPConstruct_GDTProperty::GetDimQualifierName(aQualifier));
+      aType->Init(STEPCAFControl_GDTProperty::GetDimQualifierName(aQualifier));
       aModel->AddWithRefs(aType);
       anItem.SetValue(aType);
       aQualifiers->SetValue(1, anItem);
@@ -2607,7 +2607,7 @@ static void WriteDimValues(const Handle(XSControl_WorkSession) &WS,
       XCAFDimTolObjects_DimensionModif aModif = aModifiers.Value(i);
       Handle(StepRepr_DescriptiveRepresentationItem) aModifItem = 
         new StepRepr_DescriptiveRepresentationItem();
-      aModifItem->Init(new TCollection_HAsciiString(), STEPConstruct_GDTProperty::GetDimModifierName(aModif));
+      aModifItem->Init(new TCollection_HAsciiString(), STEPCAFControl_GDTProperty::GetDimModifierName(aModif));
       aModel->AddWithRefs(aModifItem);
       aModifItems->SetValue(i, aModifItem);
     }
@@ -2681,7 +2681,7 @@ static void WriteDimValues(const Handle(XSControl_WorkSession) &WS,
     XCAFDimTolObjects_DimensionGrade aGrade;
     if (!theObject->GetClassOfTolerance(isHole, aFormVariance, aGrade))
       return;
-    Handle(StepShape_LimitsAndFits) aLAF = STEPConstruct_GDTProperty::GetLimitsAndFits(isHole, aFormVariance, aGrade);
+    Handle(StepShape_LimitsAndFits) aLAF = STEPCAFControl_GDTProperty::GetLimitsAndFits(isHole, aFormVariance, aGrade);
     aModel->AddWithRefs(aLAF);
     StepShape_ToleranceMethodDefinition aMethod;
     aMethod.SetValue(aLAF);
@@ -2760,7 +2760,7 @@ static Handle(StepDimTol_HArray1OfDatumSystemOrReference) WriteDatumSystem(const
       XCAFDimTolObjects_DatumModifWithValue aModifWithVal;
       Standard_Real aValue = 0;
       aDatumSeqPos.Value(1)->GetModifierWithValue(aModifWithVal, aValue);
-      aModifiers = STEPConstruct_GDTProperty::GetDatumRefModifiers(aSimpleModifiers, aModifWithVal, aValue, aUnit);
+      aModifiers = STEPCAFControl_GDTProperty::GetDatumRefModifiers(aSimpleModifiers, aModifWithVal, aValue, aUnit);
       // Add Datum_Reference_Modifier_With_Value
       if (!aModifiers.IsNull()) {
         Handle(StepDimTol_DatumReferenceModifierWithValue) aDRMWV = 
@@ -2786,7 +2786,7 @@ static Handle(StepDimTol_HArray1OfDatumSystemOrReference) WriteDatumSystem(const
         Standard_Real aValue = 0;
         aDatumSeqPos.Value(j)->GetModifierWithValue(aModifWithVal, aValue);
         Handle(StepDimTol_HArray1OfDatumReferenceModifier) anElemModifiers =
-          STEPConstruct_GDTProperty::GetDatumRefModifiers(aSimpleModifiers, aModifWithVal, aValue, aUnit);
+          STEPCAFControl_GDTProperty::GetDatumRefModifiers(aSimpleModifiers, aModifWithVal, aValue, aUnit);
         // Add Datum_Reference_Modifier_With_Value
         if (!anElemModifiers.IsNull()) {
           Handle(StepDimTol_DatumReferenceModifierWithValue) aDRMWV = 
@@ -2836,7 +2836,7 @@ static Handle(StepDimTol_HArray1OfDatumSystemOrReference) WriteDatumSystem(const
   // Axis
   if (anObject->HasAxis()) {
     Handle(StepGeom_Axis2Placement3d) anAxis =
-      STEPConstruct_GDTProperty::GetAxis2Placement3D(anObject->GetAxis());
+      STEPCAFControl_GDTProperty::GetAxis2Placement3D(anObject->GetAxis());
     Handle(StepAP242_GeometricItemSpecificUsage) aGISU = new StepAP242_GeometricItemSpecificUsage();
     StepAP242_ItemIdentifiedRepresentationUsageDefinition aDefinition;
     aDefinition.SetValue(aDS);
@@ -2883,7 +2883,7 @@ static void WriteToleranceZone (const Handle(XSControl_WorkSession) &WS,
   // Create Tolerance_Zone
   Handle(StepDimTol_ToleranceZoneForm) aForm = new StepDimTol_ToleranceZoneForm();
   Model->AddWithRefs(aForm);
-  aForm->Init(STEPConstruct_GDTProperty::GetTolValueType(theObject->GetTypeOfValue()));
+  aForm->Init(STEPCAFControl_GDTProperty::GetTolValueType(theObject->GetTypeOfValue()));
   Handle(StepDimTol_HArray1OfToleranceZoneTarget) aZoneTargetArray = new StepDimTol_HArray1OfToleranceZoneTarget(1, 1);
   StepDimTol_ToleranceZoneTarget aTarget;
   aTarget.SetValue(theEntity);
@@ -2992,7 +2992,7 @@ static void WriteGeomTolerance (const Handle(XSControl_WorkSession) &WS,
         aModifiers.Value(i) == XCAFDimTolObjects_GeomToleranceModif_All_Over)
         continue;
       StepDimTol_GeometricToleranceModifier aModif = 
-        STEPConstruct_GDTProperty::GetGeomToleranceModifier(aModifiers.Value(i));
+        STEPCAFControl_GDTProperty::GetGeomToleranceModifier(aModifiers.Value(i));
       aModifArray->SetValue(k, aModif);
       k++;
     }
@@ -3027,7 +3027,7 @@ static void WriteGeomTolerance (const Handle(XSControl_WorkSession) &WS,
     new StepDimTol_GeometricToleranceWithModifiers();
   aGTWM->SetModifiers(aModifArray);
   StepDimTol_GeometricToleranceType aType = 
-    STEPConstruct_GDTProperty::GetGeomToleranceType(anObject->GetType());
+    STEPCAFControl_GDTProperty::GetGeomToleranceType(anObject->GetType());
 
   // Init and write necessary subtype of Geometric_Tolerance entity
   Handle(StepDimTol_GeometricTolerance) aGeomTol;
@@ -3077,7 +3077,7 @@ static void WriteGeomTolerance (const Handle(XSControl_WorkSession) &WS,
     else {
       // Geometric_Tolerance
       Handle(StepDimTol_GeometricTolerance) aResult = 
-        STEPConstruct_GDTProperty::GetGeomTolerance(anObject->GetType());
+        STEPCAFControl_GDTProperty::GetGeomTolerance(anObject->GetType());
       if (!aResult.IsNull()) {
         aResult->Init(aName, aDescription, aLMWU, aGTTarget);
         aGeomTol = aResult;
@@ -3577,10 +3577,10 @@ Standard_Boolean STEPCAFControl_Writer::WriteDGTsAP242 (const Handle(XSControl_W
     // Write dimensions
     StepShape_DimensionalCharacteristic aDimension;
     XCAFDimTolObjects_DimensionType aDimType = anObject->GetType();
-    if (STEPConstruct_GDTProperty::IsDimensionalLocation(aDimType)) {
+    if (STEPCAFControl_GDTProperty::IsDimensionalLocation(aDimType)) {
       // Dimensional_Location
       Handle(StepShape_DimensionalLocation) aDim = new StepShape_DimensionalLocation();
-      aDim->Init(STEPConstruct_GDTProperty::GetDimTypeName(aDimType), Standard_False, NULL, aFirstSA, aSecondSA);
+      aDim->Init(STEPCAFControl_GDTProperty::GetDimTypeName(aDimType), Standard_False, NULL, aFirstSA, aSecondSA);
       aDimension.SetValue(aDim);
     }
     else if (aDimType == XCAFDimTolObjects_DimensionType_Location_Angular) {
@@ -3607,10 +3607,10 @@ Standard_Boolean STEPCAFControl_Writer::WriteDGTsAP242 (const Handle(XSControl_W
       aDim->Init(new TCollection_HAsciiString(), Standard_False, NULL, aFirstSA, aSecondSA, aPathSA);
       aDimension.SetValue(aDim);
     }
-    else if (STEPConstruct_GDTProperty::IsDimensionalSize(aDimType)) {
+    else if (STEPCAFControl_GDTProperty::IsDimensionalSize(aDimType)) {
       // Dimensional_Size
       Handle(StepShape_DimensionalSize) aDim = new StepShape_DimensionalSize();
-      aDim->Init(aFirstSA, STEPConstruct_GDTProperty::GetDimTypeName(aDimType));
+      aDim->Init(aFirstSA, STEPCAFControl_GDTProperty::GetDimTypeName(aDimType));
       aDimension.SetValue(aDim);
     }
     else if (aDimType == XCAFDimTolObjects_DimensionType_Size_Angular) {
diff --git a/src/STEPConstruct/FILES b/src/STEPConstruct/FILES
index 1ef37dd949..95b83dc3f4 100755
--- a/src/STEPConstruct/FILES
+++ b/src/STEPConstruct/FILES
@@ -12,8 +12,6 @@ STEPConstruct_DataMapOfAsciiStringTransient.hxx
 STEPConstruct_DataMapOfPointTransient.hxx
 STEPConstruct_ExternRefs.cxx
 STEPConstruct_ExternRefs.hxx
-STEPConstruct_GDTProperty.cxx
-STEPConstruct_GDTProperty.hxx
 STEPConstruct_Part.cxx
 STEPConstruct_Part.hxx
 STEPConstruct_PointHasher.cxx
diff --git a/src/StepDimTol/FILES b/src/StepDimTol/FILES
index ce9c88a15d..c0c58d55fb 100644
--- a/src/StepDimTol/FILES
+++ b/src/StepDimTol/FILES
@@ -129,4 +129,4 @@ StepDimTol_ToleranceZoneTarget.hxx
 StepDimTol_TotalRunoutTolerance.cxx
 StepDimTol_TotalRunoutTolerance.hxx
 StepDimTol_UnequallyDisposedGeometricTolerance.cxx
-StepDimTol_UnequallyDisposedGeometricTolerance.hxx
\ No newline at end of file
+StepDimTol_UnequallyDisposedGeometricTolerance.hxx
diff --git a/src/XDEDRAW/XDEDRAW_GDTs.cxx b/src/XDEDRAW/XDEDRAW_GDTs.cxx
index 65b4599cb1..d0fc4edf1f 100644
--- a/src/XDEDRAW/XDEDRAW_GDTs.cxx
+++ b/src/XDEDRAW/XDEDRAW_GDTs.cxx
@@ -19,7 +19,7 @@
 #include <DBRep.hxx>
 #include <DDocStd.hxx>
 
-#include <STEPConstruct_GDTProperty.hxx>
+#include <STEPCAFControl_GDTProperty.hxx>
 
 #include <TDF_Tool.hxx>
 #include <TDF_Label.hxx>
@@ -380,7 +380,7 @@ static Standard_Integer DumpNbDGTs (Draw_Interpretor& di, Standard_Integer argc,
       if (anObject.IsNull())
         continue;
       XCAFDimTolObjects_DimensionType aDimType = anObject->GetType();
-      if (STEPConstruct_GDTProperty::IsDimensionalLocation(aDimType)) {
+      if (STEPCAFControl_GDTProperty::IsDimensionalLocation(aDimType)) {
         nbLocation++;
       }
       else if (aDimType == XCAFDimTolObjects_DimensionType_Location_Angular) {
@@ -391,7 +391,7 @@ static Standard_Integer DumpNbDGTs (Draw_Interpretor& di, Standard_Integer argc,
         nbLocation++;
         nbWithPath++;
       }
-      else if (STEPConstruct_GDTProperty::IsDimensionalSize(aDimType)) {
+      else if (STEPCAFControl_GDTProperty::IsDimensionalSize(aDimType)) {
         nbSize++;
       }
       else if (aDimType == XCAFDimTolObjects_DimensionType_Size_Angular) {